From teiid-commits at lists.jboss.org Thu Feb 12 15:51:19 2009 Content-Type: multipart/mixed; boundary="===============6898532691376992442==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r464 - trunk/documentation/quick-start-example/src/main/docbook/en-US/content. Date: Thu, 12 Feb 2009 15:51:18 -0500 Message-ID: --===============6898532691376992442== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-12 15:51:18 -0500 (Thu, 12 Feb 2009) New Revision: 464 Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/content/b= uildvdb.xml Log: TEIID-342 Modified: trunk/documentation/quick-start-example/src/main/docbook/en-US/co= ntent/buildvdb.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/quick-start-example/src/main/docbook/en-US/content/= buildvdb.xml 2009-02-12 18:50:06 UTC (rev 463) +++ trunk/documentation/quick-start-example/src/main/docbook/en-US/content/= buildvdb.xml 2009-02-12 20:51:18 UTC (rev 464) @@ -4,6 +4,15 @@ Using Teiid Designer to build a VDB Download Teiid Designer + = + + + If you would like to skip building your own VDB, you can safely go= to next page and continue with the = + exercise as there is a pre-built VDB available for your convenienc= e in the = + examples/portfolio/PortfolioModel directory of the download. + + + = The Teiid Designer project provides a Eclipse based designer tool fo= r this purpose of building a VDB. You can download Teiid Designer --===============6898532691376992442==-- From teiid-commits at lists.jboss.org Thu Feb 12 16:41:09 2009 Content-Type: multipart/mixed; boundary="===============5546555522139355840==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r465 - in trunk: adminshell/src/main/java/com/metamatrix/script/shell and 723 other directories. Date: Thu, 12 Feb 2009 16:41:07 -0500 Message-ID: --===============5546555522139355840== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-12 16:40:56 -0500 (Thu, 12 Feb 2009) New Revision: 465 Modified: trunk/adminshell/src/main/java/com/metamatrix/script/junit/BshTestCase.j= ava trunk/adminshell/src/main/java/com/metamatrix/script/junit/BshTestSuite.= java trunk/adminshell/src/main/java/com/metamatrix/script/shell/CustomParser.= java trunk/adminshell/src/main/java/com/metamatrix/script/shell/FilePrintStre= am.java trunk/adminshell/src/main/java/com/metamatrix/script/shell/JConsole.java trunk/adminshell/src/main/java/com/metamatrix/script/shell/MMAdmin.java trunk/adminshell/src/main/java/com/metamatrix/script/shell/ReaderInterce= ptor.java trunk/adminshell/src/main/java/com/metamatrix/script/shell/SimpleParser.= java trunk/build/kit-embedded/examples/portfolio/java/JDBCClient.java trunk/build/kit-server/config/install/setup_server.xml trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCac= he.java trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCac= heFactory.java trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCac= heListener.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/AbstractMetadataProv= ider.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/AnnotationImpl.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDataSource.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDriver.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BatchFetcher.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BatchResults.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ConnectionListener.j= ava trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DataTypeTransformer.= java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DeferredMetadataProv= ider.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DriverManagerLogger.= java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFa= ctory.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionTr= acker.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDataSource.j= ava trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedSQLException= .java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/FilteredResultsMetad= ata.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCColumnNames.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCColumnPositions.= java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCLogger.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCPlugin.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/LobSearchUtil.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMBlob.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMCallableStatement.= java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMClob.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDatabaseMetaData.j= ava trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement.= java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMResultSet.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMSQLException.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMSQLXML.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMServerConnection.j= ava trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMStatement.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAConnection.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAResource.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/PlanNodeImpl.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ResultsMetadataProvi= der.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ResultsMetadataWithP= rovider.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/StaticMetadataProvid= er.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/WarningUtil.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/WrapperImpl.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/Connection.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/DatabaseMetaData= .java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/PartialResultsWa= rning.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/ResultSet.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/ResultSetMetaDat= a.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/SQLException.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/SQLStates.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/Statement.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/tools/QueryPlanD= isplayHelper.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/util/MMJDBCURL.java trunk/client-jdbc/src/main/java/com/metamatrix/script/io/MetadataReader.= java trunk/client-jdbc/src/main/java/com/metamatrix/script/io/ResultSetReader= .java trunk/client-jdbc/src/main/java/com/metamatrix/script/io/StringArrayRead= er.java trunk/client-jdbc/src/main/java/com/metamatrix/script/io/StringLineReade= r.java trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/basic_i18n.prop= erties trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.properties trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestAllResultsImpl.j= ava trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestBatchResults.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestDataTypeTransfor= mer.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMConnection.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDataSource.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDriver.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMResultSet.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMSQLException.j= ava trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMXAConnection.j= ava trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestWrapperImpl.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQueryT= estCase.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/FakeDisplayHelpe= r.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/FakePlanNode.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/TestQueryPlanDis= playHelper.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/TestTextOutputVi= sitor.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/TestXMLOutputVis= itor.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/util/ResultSetUtil.j= ava trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/util/TestMMJDBCURL.j= ava trunk/client/src/main/java/com/metamatrix/admin/AdminPlugin.java trunk/client/src/main/java/com/metamatrix/admin/api/core/Admin.java trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreConfigAdmin= .java trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreMonitoringA= dmin.java trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreRuntimeStat= eAdmin.java trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreSecurityAdm= in.java trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedAdm= in.java trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedCon= figAdmin.java trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedLog= ger.java trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedMon= itoringAdmin.java trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedRun= timeStateAdmin.java trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedSec= urityAdmin.java trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminCompo= nentException.java trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminExcep= tion.java trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminProce= ssingException.java trunk/client/src/main/java/com/metamatrix/admin/api/exception/security/I= nvalidSessionException.java trunk/client/src/main/java/com/metamatrix/admin/api/exception/security/M= etaMatrixSecurityException.java trunk/client/src/main/java/com/metamatrix/admin/api/exception/security/S= essionException.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/AdminObject.= java trunk/client/src/main/java/com/metamatrix/admin/api/objects/AdminOptions= .java trunk/client/src/main/java/com/metamatrix/admin/api/objects/AdminStatus.= java trunk/client/src/main/java/com/metamatrix/admin/api/objects/Cache.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/ConnectorBin= ding.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/ConnectorTyp= e.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/DQP.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/Entitlement.= java trunk/client/src/main/java/com/metamatrix/admin/api/objects/ExtensionMod= ule.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/Group.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/LogConfigura= tion.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/Model.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/Principal.ja= va trunk/client/src/main/java/com/metamatrix/admin/api/objects/ProcessObjec= t.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/PropertyDefi= nition.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/QueueWorkerP= ool.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/Request.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/Resource.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/Role.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/ScriptsConta= iner.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/Session.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/SourceReques= t.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/SystemObject= .java trunk/client/src/main/java/com/metamatrix/admin/api/objects/User.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/VDB.java trunk/client/src/main/java/com/metamatrix/admin/api/server/AdminRoles.ja= va trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerAdmin.j= ava trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerConfigA= dmin.java trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerMonitor= ingAdmin.java trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerRuntime= StateAdmin.java trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerSecurit= yAdmin.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminObject.ja= va trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.ja= va trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorBindi= ng.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorType.= java trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMExtensionModul= e.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMGroup.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfigurati= on.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMModel.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincipal.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMProcess.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMPropertyDefini= tion.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMQueueWorkerPoo= l.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMRequest.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMResource.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMRole.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMScriptsContain= er.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMSession.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMSourceRequest.= java trunk/client/src/main/java/com/metamatrix/admin/objects/MMSystem.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMUser.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMVDB.java trunk/client/src/main/java/com/metamatrix/api/exception/query/CriteriaEv= aluationException.java trunk/client/src/main/java/com/metamatrix/api/exception/query/Expression= EvaluationException.java trunk/client/src/main/java/com/metamatrix/api/exception/query/FunctionEx= ecutionException.java trunk/client/src/main/java/com/metamatrix/api/exception/query/FunctionMe= tadataException.java trunk/client/src/main/java/com/metamatrix/api/exception/query/InvalidFun= ctionException.java trunk/client/src/main/java/com/metamatrix/api/exception/query/ProcedureE= rrorInstructionException.java trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryMetad= ataException.java trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryParse= rException.java trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryPlann= erException.java trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryProce= ssingException.java trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryResol= verException.java trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryValid= atorException.java trunk/client/src/main/java/com/metamatrix/api/exception/query/Unresolved= SymbolDescription.java trunk/client/src/main/java/com/metamatrix/api/exception/security/LogonEx= ception.java trunk/client/src/main/java/com/metamatrix/client/ExceptionUtil.java trunk/client/src/main/java/com/metamatrix/common/api/HostInfo.java trunk/client/src/main/java/com/metamatrix/common/api/MMURL.java trunk/client/src/main/java/com/metamatrix/common/batch/BatchSerializer.j= ava trunk/client/src/main/java/com/metamatrix/common/comm/CommonCommPlugin.j= ava trunk/client/src/main/java/com/metamatrix/common/comm/api/Message.java trunk/client/src/main/java/com/metamatrix/common/comm/api/MessageListene= r.java trunk/client/src/main/java/com/metamatrix/common/comm/api/ResultsReceive= r.java trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnecti= on.java trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnecti= onFactory.java trunk/client/src/main/java/com/metamatrix/common/comm/exception/Communic= ationException.java trunk/client/src/main/java/com/metamatrix/common/comm/exception/Connecti= onException.java trunk/client/src/main/java/com/metamatrix/common/comm/exception/Exceptio= nHolder.java trunk/client/src/main/java/com/metamatrix/common/comm/exception/SingleIn= stanceCommunicationException.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/CommPlatf= ormPlugin.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/client/Se= rverAdminFactory.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/Ha= ndshake.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/Ob= jectChannel.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/Pr= intStreamSocketLog.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/SS= LAwareChannelHandler.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/So= cketLog.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/So= cketUtil.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/AdminApiServerDiscovery.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/NioObjectChannelFactory.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/ObjectChannelFactory.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/ServerDiscovery.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/ServiceInvocationStruct.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/SocketServerConnection.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/SocketServerConnectionFactory.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/SocketServerInstance.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/SocketServerInstanceFactory.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/SocketServerInstanceImpl.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/UrlServerDiscovery.java trunk/client/src/main/java/com/metamatrix/common/lob/ByteLobChunkStream.= java trunk/client/src/main/java/com/metamatrix/common/lob/LobChunk.java trunk/client/src/main/java/com/metamatrix/common/lob/LobChunkInputStream= .java trunk/client/src/main/java/com/metamatrix/common/lob/LobChunkProducer.ja= va trunk/client/src/main/java/com/metamatrix/common/lob/ReaderInputStream.j= ava trunk/client/src/main/java/com/metamatrix/common/xa/MMXid.java trunk/client/src/main/java/com/metamatrix/common/xa/XATransactionExcepti= on.java trunk/client/src/main/java/com/metamatrix/dqp/client/ClientSideDQP.java trunk/client/src/main/java/com/metamatrix/dqp/client/MetadataResult.java trunk/client/src/main/java/com/metamatrix/dqp/client/ResultsFuture.java trunk/client/src/main/java/com/metamatrix/dqp/client/impl/StreamingLobCh= unckProducer.java trunk/client/src/main/java/com/metamatrix/dqp/exception/PartialResultsEx= ception.java trunk/client/src/main/java/com/metamatrix/dqp/exception/SourceFailureDet= ails.java trunk/client/src/main/java/com/metamatrix/dqp/internal/datamgr/Connector= ID.java trunk/client/src/main/java/com/metamatrix/dqp/message/ParameterInfo.java trunk/client/src/main/java/com/metamatrix/dqp/message/RequestID.java trunk/client/src/main/java/com/metamatrix/dqp/message/RequestMessage.java trunk/client/src/main/java/com/metamatrix/dqp/message/ResultsMessage.java trunk/client/src/main/java/com/metamatrix/dqp/metadata/ResultsMetadataCo= nstants.java trunk/client/src/main/java/com/metamatrix/dqp/metadata/ResultsMetadataDe= faults.java trunk/client/src/main/java/com/metamatrix/jdbc/api/Annotation.java trunk/client/src/main/java/com/metamatrix/jdbc/api/ConnectionProperties.= java trunk/client/src/main/java/com/metamatrix/jdbc/api/DefaultDisplayHelper.= java trunk/client/src/main/java/com/metamatrix/jdbc/api/DisplayHelper.java trunk/client/src/main/java/com/metamatrix/jdbc/api/ExecutionProperties.j= ava trunk/client/src/main/java/com/metamatrix/jdbc/api/PlanNode.java trunk/client/src/main/java/com/metamatrix/jdbc/api/PlanVisitor.java trunk/client/src/main/java/com/metamatrix/jdbc/api/TextOutputVisitor.java trunk/client/src/main/java/com/metamatrix/jdbc/api/XMLOutputVisitor.java trunk/client/src/main/java/com/metamatrix/platform/security/api/BasicMet= aMatrixPrincipal.java trunk/client/src/main/java/com/metamatrix/platform/security/api/ILogon.j= ava trunk/client/src/main/java/com/metamatrix/platform/security/api/LogonRes= ult.java trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMatr= ixPrincipal.java trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMatr= ixPrincipalName.java trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMatr= ixPrincipalNames.java trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMatr= ixSessionID.java trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMatr= ixSessionInfo.java trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMatr= ixSessionState.java trunk/client/src/main/java/com/metamatrix/platform/security/api/SessionT= oken.java trunk/client/src/main/java/com/metamatrix/platform/util/ProductInfoConst= ants.java trunk/client/src/main/java/com/metamatrix/server/serverapi/RequestInfo.j= ava trunk/client/src/main/resources/com/metamatrix/admin/i18n.properties trunk/client/src/main/resources/com/metamatrix/common/comm/i18n.properti= es trunk/client/src/main/resources/com/metamatrix/common/comm/platform/i18n= .properties trunk/client/src/test/java/com/metamatrix/admin/api/objects/TestAdminOpt= ions.java trunk/client/src/test/java/com/metamatrix/common/batch/TestBatchSerializ= er.java trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/Te= stSocketUtil.java trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/cl= ient/TestAdminApiServerDiscovery.java trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/cl= ient/TestServiceInvocationStruct.java trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/cl= ient/TestSocketServerConnection.java trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/cl= ient/TestSocketServerInstanceImpl.java trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/cl= ient/TestSocketServiceRegistry.java trunk/client/src/test/java/com/metamatrix/common/lob/TestByteLobChunk.ja= va trunk/client/src/test/java/com/metamatrix/common/lob/TestByteLobChunkStr= eam.java trunk/client/src/test/java/com/metamatrix/common/lob/TestLobChunkInputSt= ream.java trunk/client/src/test/java/com/metamatrix/common/lob/TestReaderInputStre= am.java trunk/client/src/test/java/com/metamatrix/common/util/TestMMURL.java trunk/client/src/test/java/com/metamatrix/common/xa/TestMMXid.java trunk/client/src/test/java/com/metamatrix/dqp/client/TestResultsFuture.j= ava trunk/common-core/src/main/java/com/metamatrix/api/exception/ComponentCo= mmunicationException.java trunk/common-core/src/main/java/com/metamatrix/api/exception/ComponentNo= tFoundException.java trunk/common-core/src/main/java/com/metamatrix/api/exception/MetaMatrixC= omponentException.java trunk/common-core/src/main/java/com/metamatrix/api/exception/MetaMatrixE= xception.java trunk/common-core/src/main/java/com/metamatrix/api/exception/MetaMatrixP= rocessingException.java trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleExc= eption.java trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleRun= timeException.java trunk/common-core/src/main/java/com/metamatrix/common/classloader/NonDel= egatingClassLoader.java trunk/common-core/src/main/java/com/metamatrix/common/classloader/URLFil= teringClassLoader.java trunk/common-core/src/main/java/com/metamatrix/common/jdbc/JDBCUtil.java trunk/common-core/src/main/java/com/metamatrix/common/jdbc/SimplePooledC= onnectionSource.java trunk/common-core/src/main/java/com/metamatrix/common/properties/Unmodif= iableProperties.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/MMURLConn= ection.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/MetaMatri= xURLStreamHandlerFactory.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/URLHelper= .java trunk/common-core/src/main/java/com/metamatrix/common/protocol/classpath= /ClasspathURLConnection.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/classpath= /Handler.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/Handl= er.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/JarUR= LConnection.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmfile/Ha= ndler.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmfile/MM= FileURLConnection.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmrofile/= Handler.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmrofile/= MMROFileURLConnection.java trunk/common-core/src/main/java/com/metamatrix/common/types/AbstractTran= sform.java trunk/common-core/src/main/java/com/metamatrix/common/types/BaseXMLTrans= lator.java trunk/common-core/src/main/java/com/metamatrix/common/types/BlobImpl.java trunk/common-core/src/main/java/com/metamatrix/common/types/BlobType.java trunk/common-core/src/main/java/com/metamatrix/common/types/ClobImpl.java trunk/common-core/src/main/java/com/metamatrix/common/types/ClobType.java trunk/common-core/src/main/java/com/metamatrix/common/types/DataTypeMana= ger.java trunk/common-core/src/main/java/com/metamatrix/common/types/InvalidRefer= enceException.java trunk/common-core/src/main/java/com/metamatrix/common/types/MMJDBCSQLTyp= eInfo.java trunk/common-core/src/main/java/com/metamatrix/common/types/NullType.java trunk/common-core/src/main/java/com/metamatrix/common/types/SQLXMLImpl.j= ava trunk/common-core/src/main/java/com/metamatrix/common/types/Sequencable.= java trunk/common-core/src/main/java/com/metamatrix/common/types/Streamable.j= ava trunk/common-core/src/main/java/com/metamatrix/common/types/Transform.ja= va trunk/common-core/src/main/java/com/metamatrix/common/types/Transformati= onException.java trunk/common-core/src/main/java/com/metamatrix/common/types/XMLDomSource= Translator.java trunk/common-core/src/main/java/com/metamatrix/common/types/XMLReaderFac= tory.java trunk/common-core/src/main/java/com/metamatrix/common/types/XMLSAXSource= Translator.java trunk/common-core/src/main/java/com/metamatrix/common/types/XMLStreamSou= rceTranslator.java trunk/common-core/src/main/java/com/metamatrix/common/types/XMLTranslato= r.java trunk/common-core/src/main/java/com/metamatrix/common/types/XMLType.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/AnyToO= bjectTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/AnyToS= tringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDec= imalToBigIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDec= imalToBooleanTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDec= imalToByteTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDec= imalToDoubleTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDec= imalToFloatTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDec= imalToIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDec= imalToLongTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDec= imalToShortTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDec= imalToStringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigInt= egerToBigDecimalTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigInt= egerToBooleanTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigInt= egerToByteTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigInt= egerToDoubleTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigInt= egerToFloatTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigInt= egerToIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigInt= egerToLongTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigInt= egerToShortTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigInt= egerToStringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boolea= nToBigDecimalTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boolea= nToBigIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boolea= nToByteTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boolea= nToDoubleTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boolea= nToFloatTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boolea= nToIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boolea= nToLongTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boolea= nToShortTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boolea= nToStringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteTo= BigDecimalTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteTo= BigIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteTo= BooleanTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteTo= DoubleTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteTo= FloatTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteTo= IntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteTo= LongTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteTo= ShortTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteTo= StringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Charac= terToStringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ClobTo= StringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/DateTo= StringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/DateTo= TimestampTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Double= ToBigDecimalTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Double= ToBigIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Double= ToBooleanTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Double= ToByteTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Double= ToFloatTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Double= ToIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Double= ToLongTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Double= ToShortTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Double= ToStringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/FloatT= oBigDecimalTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/FloatT= oBigIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/FloatT= oBooleanTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/FloatT= oByteTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/FloatT= oDoubleTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/FloatT= oIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/FloatT= oLongTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/FloatT= oShortTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/FloatT= oStringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Intege= rToBigDecimalTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Intege= rToBigIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Intege= rToBooleanTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Intege= rToByteTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Intege= rToDoubleTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Intege= rToFloatTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Intege= rToLongTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Intege= rToShortTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Intege= rToStringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongTo= BigDecimalTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongTo= BigIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongTo= BooleanTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongTo= ByteTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongTo= DoubleTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongTo= FloatTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongTo= IntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongTo= ShortTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongTo= StringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/NullTo= AnyTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Object= ToAnyTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/SQLXML= ToStringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ShortT= oBigDecimalTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ShortT= oBigIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ShortT= oBooleanTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ShortT= oByteTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ShortT= oDoubleTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ShortT= oFloatTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ShortT= oIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ShortT= oLongTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ShortT= oStringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToBigDecimalTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToBigIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToBooleanTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToByteTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToCharacterTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToClobTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToDateTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToDoubleTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToFloatTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToIntegerTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToLongTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToSQLXMLTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToShortTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToTimeTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/String= ToTimestampTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/TimeTo= StringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/TimeTo= TimestampTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Timest= ampToDateTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Timest= ampToStringTransform.java trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Timest= ampToTimeTransform.java trunk/common-core/src/main/java/com/metamatrix/common/util/ApplicationIn= fo.java trunk/common-core/src/main/java/com/metamatrix/common/util/ByteArrayHelp= er.java trunk/common-core/src/main/java/com/metamatrix/common/util/MetaMatrixPro= ductNames.java trunk/common-core/src/main/java/com/metamatrix/common/util/NetUtils.java trunk/common-core/src/main/java/com/metamatrix/common/util/PasswordMaskU= til.java trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUti= ls.java trunk/common-core/src/main/java/com/metamatrix/common/util/SqlUtil.java trunk/common-core/src/main/java/com/metamatrix/common/util/TimestampWith= Timezone.java trunk/common-core/src/main/java/com/metamatrix/common/util/WSDLServletUt= il.java trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Crypto= Exception.java trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Crypto= Util.java trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Crypto= r.java trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Decryp= tor.java trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/DhKeyG= enerator.java trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Encryp= tor.java trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/NullCr= yptor.java trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Passwo= rdChangeUtility.java trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/cipher= /BasicCryptor.java trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/cipher= /SymmetricCryptor.java trunk/common-core/src/main/java/com/metamatrix/common/util/exception/SQL= ExceptionUnroller.java trunk/common-core/src/main/java/com/metamatrix/core/BundleUtil.java trunk/common-core/src/main/java/com/metamatrix/core/CoreConstants.java trunk/common-core/src/main/java/com/metamatrix/core/CorePlugin.java trunk/common-core/src/main/java/com/metamatrix/core/MetaMatrixCoreExcept= ion.java trunk/common-core/src/main/java/com/metamatrix/core/MetaMatrixRuntimeExc= eption.java trunk/common-core/src/main/java/com/metamatrix/core/id/IDGenerator.java trunk/common-core/src/main/java/com/metamatrix/core/id/IntegerID.java trunk/common-core/src/main/java/com/metamatrix/core/id/IntegerIDFactory.= java trunk/common-core/src/main/java/com/metamatrix/core/id/InvalidIDExceptio= n.java trunk/common-core/src/main/java/com/metamatrix/core/id/LongID.java trunk/common-core/src/main/java/com/metamatrix/core/id/LongIDFactory.java trunk/common-core/src/main/java/com/metamatrix/core/id/ObjectID.java trunk/common-core/src/main/java/com/metamatrix/core/id/ObjectIDFactory.j= ava trunk/common-core/src/main/java/com/metamatrix/core/id/ParsedObjectID.ja= va trunk/common-core/src/main/java/com/metamatrix/core/id/StringID.java trunk/common-core/src/main/java/com/metamatrix/core/id/StringIDFactory.j= ava trunk/common-core/src/main/java/com/metamatrix/core/id/UUID.java trunk/common-core/src/main/java/com/metamatrix/core/id/UUIDFactory.java trunk/common-core/src/main/java/com/metamatrix/core/io/FileUrl.java trunk/common-core/src/main/java/com/metamatrix/core/log/FileLimitSizeLog= Writer.java trunk/common-core/src/main/java/com/metamatrix/core/log/FileLogWriter.ja= va trunk/common-core/src/main/java/com/metamatrix/core/log/LogListener.java trunk/common-core/src/main/java/com/metamatrix/core/log/LogMessage.java trunk/common-core/src/main/java/com/metamatrix/core/log/Logger.java trunk/common-core/src/main/java/com/metamatrix/core/log/MessageLevel.java trunk/common-core/src/main/java/com/metamatrix/core/log/NullLogWriter.ja= va trunk/common-core/src/main/java/com/metamatrix/core/log/NullLogger.java trunk/common-core/src/main/java/com/metamatrix/core/log/SystemLogWriter.= java trunk/common-core/src/main/java/com/metamatrix/core/util/ArgCheck.java trunk/common-core/src/main/java/com/metamatrix/core/util/Assertion.java trunk/common-core/src/main/java/com/metamatrix/core/util/Base64.java trunk/common-core/src/main/java/com/metamatrix/core/util/ChecksumUtil.ja= va trunk/common-core/src/main/java/com/metamatrix/core/util/DateUtil.java trunk/common-core/src/main/java/com/metamatrix/core/util/EquivalenceUtil= .java trunk/common-core/src/main/java/com/metamatrix/core/util/ExternalizeUtil= .java trunk/common-core/src/main/java/com/metamatrix/core/util/FileUtil.java trunk/common-core/src/main/java/com/metamatrix/core/util/FileUtils.java trunk/common-core/src/main/java/com/metamatrix/core/util/HashCodeUtil.ja= va trunk/common-core/src/main/java/com/metamatrix/core/util/LRUCache.java trunk/common-core/src/main/java/com/metamatrix/core/util/MetaMatrixExcep= tionUtil.java trunk/common-core/src/main/java/com/metamatrix/core/util/MetaMatrixProdu= ctVersion.java trunk/common-core/src/main/java/com/metamatrix/core/util/MixinProxy.java trunk/common-core/src/main/java/com/metamatrix/core/util/ObjectConverter= Util.java trunk/common-core/src/main/java/com/metamatrix/core/util/ReflectionHelpe= r.java trunk/common-core/src/main/java/com/metamatrix/core/util/ResourceNameUti= l.java trunk/common-core/src/main/java/com/metamatrix/core/util/Stopwatch.java trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtil.java trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtilities= .java trunk/common-core/src/main/java/com/metamatrix/core/util/ZipFileUtil.java trunk/common-core/src/main/java/com/metamatrix/core/vdb/ModelType.java trunk/common-core/src/main/java/com/metamatrix/core/vdb/VDBStatus.java trunk/common-core/src/main/java/com/metamatrix/core/vdb/VdbConstants.java trunk/common-core/src/main/java/com/metamatrix/internal/core/log/BasePla= tformLogWriter.java trunk/common-core/src/main/java/com/metamatrix/internal/core/log/Platfor= mLimitSizeLogWriter.java trunk/common-core/src/main/java/com/metamatrix/internal/core/log/Platfor= mLog.java trunk/common-core/src/main/java/com/metamatrix/internal/core/log/Platfor= mLogWriter.java trunk/common-core/src/main/resources/com/metamatrix/common/util/crypto/d= h.properties trunk/common-core/src/main/resources/com/metamatrix/core/i18n.properties trunk/common-core/src/test/java/com/metamatrix/api/exception/TestMetaMat= rixException.java trunk/common-core/src/test/java/com/metamatrix/api/exception/TestMetaMat= rixRuntimeException.java trunk/common-core/src/test/java/com/metamatrix/common/classloader/TestNo= nDelegatingClassLoader.java trunk/common-core/src/test/java/com/metamatrix/common/classloader/TestUR= LFilteringClassLoader.java trunk/common-core/src/test/java/com/metamatrix/common/jdbc/TestSimplePoo= ledConnectionSource.java trunk/common-core/src/test/java/com/metamatrix/common/protocol/FakeVersi= on.java trunk/common-core/src/test/java/com/metamatrix/common/protocol/TestClass= pathURLHandler.java trunk/common-core/src/test/java/com/metamatrix/common/protocol/TestMMFil= eURLHandler.java trunk/common-core/src/test/java/com/metamatrix/common/protocol/TestURLHe= lper.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobImpl= .java trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobValu= e.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobImpl= .java trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobValu= e.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestDataType= Manager.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestSQLXMLIm= pl.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestXMLStrea= mSourceTranslator.java trunk/common-core/src/test/java/com/metamatrix/common/types/TestXMLValue= .java trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestSt= ringToXmlTransform.java trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestTr= ansforms.java trunk/common-core/src/test/java/com/metamatrix/common/util/FakeInputStre= am.java trunk/common-core/src/test/java/com/metamatrix/common/util/TestByteArray= Helper.java trunk/common-core/src/test/java/com/metamatrix/common/util/TestNetUtils.= java trunk/common-core/src/test/java/com/metamatrix/common/util/TestPropertie= sUtils.java trunk/common-core/src/test/java/com/metamatrix/common/util/TestSqlUtil.j= ava trunk/common-core/src/test/java/com/metamatrix/common/util/TestTimestamp= WithTimezone.java trunk/common-core/src/test/java/com/metamatrix/common/util/TestWSDLServl= etUtil.java trunk/common-core/src/test/java/com/metamatrix/common/util/crypto/FakeCr= yptor.java trunk/common-core/src/test/java/com/metamatrix/common/util/crypto/TestDh= KeyGenerator.java trunk/common-core/src/test/java/com/metamatrix/common/util/crypto/TestEn= cryptDecrypt.java trunk/common-core/src/test/java/com/metamatrix/common/util/crypto/TestPa= sswordChangeUtility.java trunk/common-core/src/test/java/com/metamatrix/common/util/exception/Tes= tSQLExceptionUnroller.java trunk/common-core/src/test/java/com/metamatrix/core/id/TestIDGenerator.j= ava trunk/common-core/src/test/java/com/metamatrix/core/id/TestParsedObjectI= D.java trunk/common-core/src/test/java/com/metamatrix/core/id/TestParsingObject= IDs.java trunk/common-core/src/test/java/com/metamatrix/core/id/TestUUID.java trunk/common-core/src/test/java/com/metamatrix/core/id/TestUUIDFactory.j= ava trunk/common-core/src/test/java/com/metamatrix/core/id/TestUUIDFactoryWi= thoutCreation.java trunk/common-core/src/test/java/com/metamatrix/core/log/SysOutLogger.java trunk/common-core/src/test/java/com/metamatrix/core/util/SimpleMock.java trunk/common-core/src/test/java/com/metamatrix/core/util/TestAssertion.j= ava trunk/common-core/src/test/java/com/metamatrix/core/util/TestEquivalence= Util.java trunk/common-core/src/test/java/com/metamatrix/core/util/TestExternalize= Util.java trunk/common-core/src/test/java/com/metamatrix/core/util/TestFileUtil.ja= va trunk/common-core/src/test/java/com/metamatrix/core/util/TestFileUtils.j= ava trunk/common-core/src/test/java/com/metamatrix/core/util/TestMetaMatrixE= xceptionUtil.java trunk/common-core/src/test/java/com/metamatrix/core/util/TestReflectionH= elper.java trunk/common-core/src/test/java/com/metamatrix/core/util/TestResourceNam= eUtil.java trunk/common-core/src/test/java/com/metamatrix/core/util/TestStringUtil.= java trunk/common-core/src/test/java/com/metamatrix/core/util/TestStringUtili= ties.java trunk/common-core/src/test/java/com/metamatrix/core/util/TestZipFileUtil= .java trunk/common-core/src/test/java/com/metamatrix/core/util/UnitTestUtil.ja= va trunk/common-internal/src/main/java/com/metamatrix/admin/AdminMessages.j= ava trunk/common-internal/src/main/java/com/metamatrix/api/core/message/Defa= ultMessage.java trunk/common-internal/src/main/java/com/metamatrix/api/core/message/Mess= age.java trunk/common-internal/src/main/java/com/metamatrix/api/core/message/Mess= ageList.java trunk/common-internal/src/main/java/com/metamatrix/api/core/message/Mess= ageTypes.java trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/EntityIn= fo.java trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/FeatureI= nfo.java trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/XMIConst= ants.java trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/XMIHeade= r.java trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/XMIReade= rAdapter.java trunk/common-internal/src/main/java/com/metamatrix/api/exception/securit= y/AuthorizationException.java trunk/common-internal/src/main/java/com/metamatrix/api/exception/securit= y/AuthorizationMgmtException.java trunk/common-internal/src/main/java/com/metamatrix/api/exception/securit= y/InvalidPrincipalException.java trunk/common-internal/src/main/java/com/metamatrix/api/exception/securit= y/InvalidUserException.java trunk/common-internal/src/main/java/com/metamatrix/api/exception/securit= y/InvalidVDBException.java trunk/common-internal/src/main/java/com/metamatrix/api/exception/securit= y/MembershipServiceException.java trunk/common-internal/src/main/java/com/metamatrix/api/exception/securit= y/MetaMatrixAuthenticationException.java trunk/common-internal/src/main/java/com/metamatrix/api/exception/securit= y/SessionServiceException.java trunk/common-internal/src/main/java/com/metamatrix/api/exception/securit= y/UnsupportedCredentialException.java trunk/common-internal/src/main/java/com/metamatrix/api/exception/server/= InvalidRequestIDException.java trunk/common-internal/src/main/java/com/metamatrix/common/CommonPlugin.j= ava trunk/common-internal/src/main/java/com/metamatrix/common/actions/Abstra= ctObjectEditor.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Action= Definition.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/AddNam= edObject.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/AddObj= ect.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Attrib= uteDefinition.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/BasicM= odificationActionQueue.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/ClassD= efinition.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Create= Object.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Destro= yObject.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Exchan= geBoolean.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Exchan= geDouble.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Exchan= geFloat.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Exchan= geInt.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Exchan= geLong.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Exchan= geNamedObject.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Exchan= geObject.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Exchan= gePrimitive.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Exchan= geShort.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Modifi= cationActionQueue.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Modifi= cationException.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/NamedO= bjectActionDefinition.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Object= Editor.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Remove= NamedObject.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Remove= Object.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/String= LengthExceededException.java trunk/common-internal/src/main/java/com/metamatrix/common/actions/Target= edActionDefinition.java trunk/common-internal/src/main/java/com/metamatrix/common/config/Current= Configuration.java trunk/common-internal/src/main/java/com/metamatrix/common/config/Resourc= eNames.java trunk/common-internal/src/main/java/com/metamatrix/common/config/Startup= StateController.java trunk/common-internal/src/main/java/com/metamatrix/common/config/Startup= StateException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Aut= henticationProvider.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Aut= henticationProviderID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Aut= henticationProviderType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Com= ponentDefn.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Com= ponentDefnID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Com= ponentObject.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Com= ponentObjectID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Com= ponentType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Com= ponentTypeDefn.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Com= ponentTypeDefnID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Com= ponentTypeID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Com= ponentTypePropDefn.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Con= figuration.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Con= figurationID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Con= figurationInfo.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Con= figurationModelContainer.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Con= figurationObjectEditor.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Con= nectorArchive.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Con= nectorBinding.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Con= nectorBindingID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Con= nectorBindingType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Dep= loyedComponent.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Dep= loyedComponentID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ext= ensionModule.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Hos= t.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Hos= tID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Hos= tType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ind= exingServiceComponentType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Loc= kedConfigurationID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pro= ductServiceConfig.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pro= ductServiceConfigComponentType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pro= ductServiceConfigID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pro= ductType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pro= ductTypeID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pro= pDefnAllowedValue.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pro= pDefnAllowedValueID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Rel= easeInfo.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Res= ourceComponentType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Res= ourceDescriptor.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Res= ourceDescriptorID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Res= ourceModel.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Run= timeMetadataServiceComponentType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Sea= rchbaseConnectorComponentType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ser= viceComponentDefn.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ser= viceComponentDefnID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ser= viceComponentType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Sha= redResource.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Sha= redResourceID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VMC= omponentDefn.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VMC= omponentDefnID.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VMC= omponentDefnType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/ConfigurationConnectionException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/ConfigurationException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/ConfigurationLockException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/DuplicateComponentException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/InvalidArgumentException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/InvalidComponentException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/InvalidComponentIDCharacterException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/InvalidComponentIDFormatException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/InvalidConfigurationException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/InvalidDeployedComponentException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/InvalidNameException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/InvalidPropertyValueException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/InvalidStringValueException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/InvalidVersionException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/exc= eptions/ZeroLengthComponentIDException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicAuthenticationProvider.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicAuthenticationProviderType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicComponentDefn.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicComponentObject.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicComponentType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicComponentTypeDefn.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicConfiguration.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicConfigurationInfo.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicConfigurationObjectEditor.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicConnectorArchive.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicConnectorBinding.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicConnectorBindingType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicDeployedComponent.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicExtensionModule.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicHost.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicHostType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicProductServiceConfig.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicProductServiceConfigType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicProductType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicPropDefnAllowedValue.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicResourceComponentType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicResourceDescriptor.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicServiceComponentDefn.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicServiceComponentType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicSharedResource.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicUtil.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicVMComponentDefn.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicVMComponentDefnType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/C= omponentCryptoUtil.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/C= onfigurationModel.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/C= onfigurationModelContainerAdapter.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/C= onfigurationModelContainerImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/C= onfigurationObjectEditorHelper.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/C= onfigurationVisitor.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/P= ropertyValidations.java trunk/common-internal/src/main/java/com/metamatrix/common/config/reader/= CurrentConfigurationReader.java trunk/common-internal/src/main/java/com/metamatrix/common/config/reader/= PropertiesConfigurationReader.java trunk/common-internal/src/main/java/com/metamatrix/common/config/util/Co= nfigObjectsNotResolvableException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/util/Co= nfigUtil.java trunk/common-internal/src/main/java/com/metamatrix/common/config/util/Co= nfigurationImportExportUtility.java trunk/common-internal/src/main/java/com/metamatrix/common/config/util/Co= nfigurationPropertyNames.java trunk/common-internal/src/main/java/com/metamatrix/common/config/util/In= validConfigurationElementException.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/Con= nectorArchiveImportExportUtility.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XML= Config_42_ElementNames.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XML= Config_42_HelperImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XML= Config_42_ImportExportUtility.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XML= Config_42_Visitor.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XML= Config_Base_ImportExportUtility.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XML= ConfigurationImportExportUtility.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XML= ElementNames.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XML= Helper.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XML= HelperImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XML= HelperUtil.java trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodul= e/ExtensionModuleDescriptor.java trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodul= e/exception/DuplicateExtensionModuleException.java trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodul= e/exception/ExtensionModuleException.java trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodul= e/exception/ExtensionModuleNotFoundException.java trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodul= e/exception/ExtensionModuleOrderingException.java trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodul= e/exception/ExtensionModuleRuntimeException.java trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodul= e/exception/InvalidExtensionModuleTypeException.java trunk/common-internal/src/main/java/com/metamatrix/common/id/Transaction= ID.java trunk/common-internal/src/main/java/com/metamatrix/common/id/Transaction= IDFactory.java trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigu= ration.java trunk/common-internal/src/main/java/com/metamatrix/common/log/LogManager= .java trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Bas= icLogConfiguration.java trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Def= aultLogConfigurationFactory.java trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Log= ConfigurationException.java trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Log= ConfigurationFactory.java trunk/common-internal/src/main/java/com/metamatrix/common/log/format/Del= imitedLogMessageFormat.java trunk/common-internal/src/main/java/com/metamatrix/common/log/format/Log= MessageFormat.java trunk/common-internal/src/main/java/com/metamatrix/common/log/reader/Log= Entry.java trunk/common-internal/src/main/java/com/metamatrix/common/log/reader/Log= EntryPropertyNames.java trunk/common-internal/src/main/java/com/metamatrix/common/log/reader/Log= Reader.java trunk/common-internal/src/main/java/com/metamatrix/common/namedobject/Ba= seID.java trunk/common-internal/src/main/java/com/metamatrix/common/namedobject/Ba= seObject.java trunk/common-internal/src/main/java/com/metamatrix/common/namedobject/Ba= sicObject.java trunk/common-internal/src/main/java/com/metamatrix/common/namedobject/ID= Verifier.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Configu= rationPropertyObjDisplayComparator.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Default= PropertyAccessPolicy.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Default= PropertyDefinitionFilter.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Multipl= icity.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Multipl= icityExpressionException.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Multipl= icityPool.java trunk/common-internal/src/main/java/com/metamatrix/common/object/ObjectD= efinition.java trunk/common-internal/src/main/java/com/metamatrix/common/object/ObjectD= efinitionDisplayNameComparator.java trunk/common-internal/src/main/java/com/metamatrix/common/object/ObjectD= efinitionFactory.java trunk/common-internal/src/main/java/com/metamatrix/common/object/ObjectD= efinitionImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/object/ObjectD= efinitionImplFactory.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= iedObject.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= iedObjectEditor.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= iedObjectEditorImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= iedObjectImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= iedObjectView.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= iedObjectsEditor.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= iedObjectsEditorImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= yAccessPolicy.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= yAccessPolicyImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= yDefinition.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= yDefinitionFilter.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= yDefinitionGroup.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= yDefinitionImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= yDefinitionImplFactory.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= yType.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Propert= yTypeValidator.java trunk/common-internal/src/main/java/com/metamatrix/common/object/Standar= dPropertyTypeValidator.java trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerPo= ol.java trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerPo= olFactory.java trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerPo= olStats.java trunk/common-internal/src/main/java/com/metamatrix/common/transaction/Tr= ansactionException.java trunk/common-internal/src/main/java/com/metamatrix/common/transaction/Tr= ansactionNotSupportedException.java trunk/common-internal/src/main/java/com/metamatrix/common/transaction/Tr= ansactionStatus.java trunk/common-internal/src/main/java/com/metamatrix/common/transaction/Us= erTransaction.java trunk/common-internal/src/main/java/com/metamatrix/common/transaction/Us= erTransactionFactory.java trunk/common-internal/src/main/java/com/metamatrix/common/transaction/ma= nager/SimpleUserTransaction.java trunk/common-internal/src/main/java/com/metamatrix/common/transaction/ma= nager/SimpleUserTransactionFactory.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/AbstractT= reeView.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/ChildRule= s.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/DefaultCh= ildRules.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/PassThrou= ghTreeNodeFilter.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/RuledTree= ViewImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode.= java trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNodeC= omparator.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNodeE= ditor.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNodeE= xception.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNodeF= ilter.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNodeI= terator.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNodeI= teratorWithStack.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNodeN= ameComparator.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNodeP= athComparator.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNodeP= ropertyComparator.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNodeS= ource.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeView.= java trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Bas= icTreeNode.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Bas= icTreeNodeEditor.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Bas= icTreeNodeIterator.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Bas= icTreeNodeSource.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Bas= icTreeView.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /DirectoryEntry.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /DirectoryEntryEditor.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /DirectoryEntryFilter.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /DirectoryEntryNameAndTypeComparator.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /DirectoryEntryView.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /FileDefinition.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /FileDefinitionImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /FileSystemEntry.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /FileSystemEntryEditor.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /FileSystemFilter.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /FileSystemView.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /FolderDefinition.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /FolderDefinitionImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /FolderOnlyFilter.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /PassThroughDirectoryEntryFilter.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /PlatformAwareFilePermission.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /PreviewableDirectoryEntry.java trunk/common-internal/src/main/java/com/metamatrix/common/tree/directory= /RuledDirectoryEntryViewImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/util/CommonPro= pertyNames.java trunk/common-internal/src/main/java/com/metamatrix/common/util/ErrorMess= ageKeys.java trunk/common-internal/src/main/java/com/metamatrix/common/util/Intervals= .java trunk/common-internal/src/main/java/com/metamatrix/common/util/LogCommon= Constants.java trunk/common-internal/src/main/java/com/metamatrix/common/util/LogContex= tsUtil.java trunk/common-internal/src/main/java/com/metamatrix/common/util/MultipleR= equestConfirmation.java trunk/common-internal/src/main/java/com/metamatrix/common/util/OSPlatfor= mUtil.java trunk/common-internal/src/main/java/com/metamatrix/common/util/Permutati= on.java trunk/common-internal/src/main/java/com/metamatrix/common/util/VDBNameVa= lidator.java trunk/common-internal/src/main/java/com/metamatrix/common/util/VMNaming.= java trunk/common-internal/src/main/java/com/metamatrix/common/util/crypto/ke= ymanage/FilePasswordConverter.java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/DEFRea= derWriter.java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/Manife= st.java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/ModelI= nfo.java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/System= VdbUtility.java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBArc= hive.java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBDef= n.java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBFil= e.java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBInf= o.java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBStr= eam.java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBStr= eamImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/xa/Transaction= ID.java trunk/common-internal/src/main/java/com/metamatrix/common/xml/XMLReaderW= riter.java trunk/common-internal/src/main/java/com/metamatrix/common/xml/XMLReaderW= riterImpl.java trunk/common-internal/src/main/java/com/metamatrix/common/xml/XPathUtil.= java trunk/common-internal/src/main/java/com/metamatrix/common/xml/XmlUtil.ja= va trunk/common-internal/src/main/java/com/metamatrix/common/xml/xmi/XMICon= tentHandler.java trunk/common-internal/src/main/java/com/metamatrix/common/xml/xmi/XMIHea= derContentHandler.java trunk/common-internal/src/main/java/com/metamatrix/core/event/AbstractEv= entBroker.java trunk/common-internal/src/main/java/com/metamatrix/core/event/AbstractEv= entSource.java trunk/common-internal/src/main/java/com/metamatrix/core/event/AsynchEven= tBroker.java trunk/common-internal/src/main/java/com/metamatrix/core/event/EventBroke= r.java trunk/common-internal/src/main/java/com/metamatrix/core/event/EventBroke= rException.java trunk/common-internal/src/main/java/com/metamatrix/core/event/EventManag= er.java trunk/common-internal/src/main/java/com/metamatrix/core/event/EventObjec= tListener.java trunk/common-internal/src/main/java/com/metamatrix/core/event/EventSourc= e.java trunk/common-internal/src/main/java/com/metamatrix/core/event/EventSourc= eException.java trunk/common-internal/src/main/java/com/metamatrix/core/event/Targetable= Event.java trunk/common-internal/src/main/java/com/metamatrix/core/util/TempDirecto= ry.java trunk/common-internal/src/main/java/com/metamatrix/core/util/TempDirecto= ryMonitor.java trunk/common-internal/src/main/java/com/metamatrix/core/xml/CoreXmlPlugi= n.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/Jdo= mHelper.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/SAX= BuilderHelper.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/XPa= thHelper.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vdb= /TerminatingVdbHeaderContentHandler.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vdb= /VdbHeader.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vdb= /VdbHeaderReader.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vdb= /VdbModelInfo.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vdb= /VdbNonModelInfo.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xmi= /ModelImportInfo.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xmi= /TerminatingXMIHeaderContentHandler.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xmi= /XMIHeader.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xmi= /XMIHeaderReader.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xsd= /TerminatingXsdHeaderContentHandler.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xsd= /XsdHeader.java trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xsd= /XsdHeaderReader.java trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/api/= MetadataID.java trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/api/= MetadataObject.java trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/api/= VirtualDatabase.java trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/api/= VirtualDatabaseID.java trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/exce= ption/VirtualDatabaseException.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Au= thorizationAdminAPI.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Au= thorizationEditor.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Co= nfigurationAdminAPI.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/En= titlementMigrationReport.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Ex= tensionSourceAdminAPI.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Me= mbershipAdminAPI.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Pe= rmissionDataNode.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Pe= rmissionDataNodeDefinition.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Pe= rmissionDataNodeTreeView.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Pe= rmissionNode.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Pe= rmissionTreeView.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Pl= atformAdminLogConstants.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Ru= ntimeStateAdminAPI.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Ru= ntimeStateChangeEvent.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Se= ssionAdminAPI.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/Su= bSystemAdminAPI.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ex= ception/MetaMatrixAdminException.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ex= ception/PermissionNodeException.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ex= ception/PermissionNodeNotActionableException.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ex= ception/PermissionNodeNotFoundException.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ex= ception/ProductNotRegisteredException.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ex= ception/UnknownProductOrSubsystemException.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ru= ntime/ComponentData.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ru= ntime/HostData.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ru= ntime/PSCData.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ru= ntime/ProcessData.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ru= ntime/PscID.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ru= ntime/ServiceData.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ru= ntime/SystemState.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiimp= l/PermissionDataNodeDefinitionImpl.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiimp= l/PermissionDataNodeImpl.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiimp= l/PermissionDataNodeTreeViewImpl.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AbstractAuthorizationObjectEditor.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AuthorizationActions.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AuthorizationModel.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AuthorizationObjectEditor.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AuthorizationPermission.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AuthorizationPermissionFactory.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AuthorizationPermissions.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AuthorizationPermissionsImpl.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AuthorizationPolicy.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AuthorizationPolicyFactory.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AuthorizationPolicyID.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AuthorizationRealm.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /AuthorizationResource.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /BasicAuthorizationPermission.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /BasicAuthorizationPermissionFactory.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /Credentials.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /DataAccessResource.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /GranteeEntitlementEntry.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /SecurityMessagesKeys.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /SecurityPlugin.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/api= /StandardAuthorizationActions.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/uti= l/LogSecurityConstants.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/uti= l/RolePermission.java trunk/common-internal/src/main/java/com/metamatrix/platform/security/uti= l/RolePermissionFactory.java trunk/common-internal/src/main/java/com/metamatrix/platform/service/api/= ServiceID.java trunk/common-internal/src/main/java/com/metamatrix/platform/service/api/= ServiceState.java trunk/common-internal/src/main/java/com/metamatrix/platform/vm/controlle= r/SocketListenerStats.java trunk/common-internal/src/main/java/com/metamatrix/platform/vm/controlle= r/VMControllerID.java trunk/common-internal/src/main/java/com/metamatrix/platform/vm/controlle= r/VMStatistics.java trunk/common-internal/src/main/java/com/metamatrix/server/admin/api/Mate= rializationLoadScripts.java trunk/common-internal/src/main/java/com/metamatrix/server/admin/api/Quer= yAdminAPI.java trunk/common-internal/src/main/java/com/metamatrix/server/admin/api/Runt= imeMetadataAdminAPI.java trunk/common-internal/src/main/java/com/metamatrix/server/admin/api/Tran= sactionAdminAPI.java trunk/common-internal/src/main/java/com/metamatrix/server/admin/apiimpl/= MaterializationLoadScriptsImpl.java trunk/common-internal/src/main/java/com/metamatrix/vdb/edit/loader/VdbPr= ocessingException.java trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/D= atabaseDialect.java trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/M= aterializedViewScriptGenerator.java trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/M= aterializedViewScriptGeneratorImpl.java trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/S= criptDecorator.java trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/S= criptType.java trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/t= emplate/ExpandedTemplate.java trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/t= emplate/MaterializedViewConnectionData.java trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/t= emplate/MaterializedViewData.java trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/t= emplate/Template.java trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/t= emplate/TemplateData.java trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/t= emplate/TemplateExpander.java trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicMode= lInfo.java trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicURIM= odelResource.java trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicVDBD= efn.java trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicVDBI= nfo.java trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/URIModelR= esource.java trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/URIResour= ce.java trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/URIResour= ceReader.java trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/VDBKey.ja= va trunk/common-internal/src/main/resources/com/metamatrix/common/config/ap= i/resourcetypemodel.xml trunk/common-internal/src/main/resources/com/metamatrix/common/i18n.prop= erties trunk/common-internal/src/main/resources/com/metamatrix/common/propertie= s/text.properties trunk/common-internal/src/main/resources/com/metamatrix/core/xml/i18n.pr= operties trunk/common-internal/src/main/resources/com/metamatrix/platform/securit= y/api/authorizations.xsd trunk/common-internal/src/main/resources/com/metamatrix/platform/securit= y/api/i18n.properties trunk/common-internal/src/main/resources/com/metamatrix/vdb/runtime/urip= rimarymodeltypes.xml trunk/common-internal/src/test/java/com/metamatrix/common/config/connect= or/ConnectorBindingCreationTest.java trunk/common-internal/src/test/java/com/metamatrix/common/config/model/T= estComponentCryptoUtil.java trunk/common-internal/src/test/java/com/metamatrix/common/config/model/T= estPropertyValidation.java trunk/common-internal/src/test/java/com/metamatrix/common/config/xml/Tes= tXMLConfigurationImportExportUtility.java trunk/common-internal/src/test/java/com/metamatrix/common/log/TestLogMan= ager.java trunk/common-internal/src/test/java/com/metamatrix/common/log/format/Tes= tLogMessageFormat.java trunk/common-internal/src/test/java/com/metamatrix/common/queue/FakeWork= Item.java trunk/common-internal/src/test/java/com/metamatrix/common/queue/TestQueu= eWorkerPool.java trunk/common-internal/src/test/java/com/metamatrix/common/tree/directory= /FileSystemTestUtil.java trunk/common-internal/src/test/java/com/metamatrix/common/tree/directory= /TestFileSystemEntry.java trunk/common-internal/src/test/java/com/metamatrix/common/tree/directory= /TestFileSystemEntryEditor.java trunk/common-internal/src/test/java/com/metamatrix/common/tree/directory= /TestFileSystemView.java trunk/common-internal/src/test/java/com/metamatrix/common/util/TestInter= vals.java trunk/common-internal/src/test/java/com/metamatrix/common/util/TestPermu= tation.java trunk/common-internal/src/test/java/com/metamatrix/common/util/TestVDBNa= meValidator.java trunk/common-internal/src/test/java/com/metamatrix/common/util/crypto/ke= ymanage/TestFilePasswordConverter.java trunk/common-internal/src/test/java/com/metamatrix/common/vdb/api/TestDE= FReaderWriter.java trunk/common-internal/src/test/java/com/metamatrix/common/vdb/api/TestMa= nifest.java trunk/common-internal/src/test/java/com/metamatrix/common/vdb/api/TestVD= BArchive.java trunk/common-internal/src/test/java/com/metamatrix/common/xml/TestXmlUti= l.java trunk/common-internal/src/test/java/com/metamatrix/core/util/TestTempDir= ectory.java trunk/common-internal/src/test/java/com/metamatrix/internal/core/xml/Tes= tJdomHelper.java trunk/common-internal/src/test/java/com/metamatrix/internal/core/xml/Tes= tXPathHelper.java trunk/common-internal/src/test/java/com/metamatrix/internal/core/xml/vdb= /TestVdbHeaderReader.java trunk/common-internal/src/test/java/com/metamatrix/internal/core/xml/xmi= /TestXMIHeaderReader.java trunk/common-internal/src/test/java/com/metamatrix/internal/core/xml/xsd= /TestXsdHeaderReader.java trunk/common-internal/src/test/java/com/metamatrix/vdb/edit/materializat= ion/TestGenerateScripts.java trunk/common-internal/src/test/java/com/metamatrix/vdb/edit/materializat= ion/TestMaterializedViewScriptGenerator.java trunk/common-internal/src/test/java/com/metamatrix/vdb/edit/materializat= ion/TestScriptDecorator.java trunk/common-internal/src/test/java/com/metamatrix/vdb/runtime/TestVDBKe= y.java trunk/common-internal/src/test/resources/Books.xsd trunk/common-internal/src/test/resources/VirtualNorthwind.xml trunk/common-internal/src/test/resources/config.xml trunk/common-internal/src/test/resources/keymanage/config.xml trunk/common-internal/src/test/resources/keymanage/convert.properties trunk/common-internal/src/test/resources/materializedView/expected/Matvi= ewSSLTheFirst_1_Connection.properties trunk/common-internal/src/test/resources/materializedView/expected/Matvi= ewTheFirst_1_Connection.properties trunk/common-internal/src/test/resources/materializedView/expected/Matvi= ewTheFirst_2_Connection.properties trunk/common-internal/src/test/resources/materializedView/expected/Matvi= ewTheSequelink_1_Connection.properties trunk/common-internal/src/test/resources/partsSupplierOracle_v0200.xml trunk/connector-api/src/main/java/com/metamatrix/connector/DataPlugin.ja= va trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connectio= n.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connector= .java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connector= Annotations.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connector= Capabilities.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connector= Environment.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connector= Logger.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Execution= .java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Execution= Context.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Procedure= Execution.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/ResultSet= Execution.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/TypeFacil= ity.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/UpdateExe= cution.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/ValueTran= slator.java trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicCo= nnectorCapabilities.java trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicVa= lueTranslator.java trunk/connector-api/src/main/java/com/metamatrix/connector/exception/Con= nectorException.java trunk/connector-api/src/main/java/com/metamatrix/connector/internal/Conn= ectorPropertyNames.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IAgg= regate.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IBas= eInCriteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IBat= chedUpdates.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IBul= kInsert.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICas= eExpression.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICom= mand.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICom= pareCriteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICom= poundCriteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICri= teria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IDel= ete.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IEle= ment.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IExi= stsCriteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IExp= ression.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFro= m.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFro= mItem.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFun= ction.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IGro= up.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IGro= upBy.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IInC= riteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IInl= ineView.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IIns= ert.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IIsN= ullCriteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IJoi= n.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILan= guageFactory.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILan= guageObject.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILik= eCriteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILim= it.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILit= eral.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILog= icalCriteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IMet= adataReference.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/INot= Criteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IOrd= erBy.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IOrd= erByItem.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPar= ameter.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPre= dicateCriteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPro= cedure.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IQue= ry.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IQue= ryCommand.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISca= larSubquery.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISea= rchedCaseExpression.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISel= ect.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISel= ectSymbol.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISet= Clause.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISet= ClauseList.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISet= Query.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISub= queryCompareCriteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISub= queryContainer.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISub= queryInCriteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IUpd= ate.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/Lang= uageUtil.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/Element.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/Group.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/MetadataID.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/MetadataObject.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/Parameter.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/Procedure.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/RuntimeMetadata.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/TypeModel.java trunk/connector-api/src/main/java/com/metamatrix/connector/monitor/Alive= Status.java trunk/connector-api/src/main/java/com/metamatrix/connector/monitor/Conne= ctionStatus.java trunk/connector-api/src/main/java/com/metamatrix/connector/monitor/Monit= oredConnector.java trunk/connector-api/src/main/java/com/metamatrix/connector/pool/Connecto= rIdentity.java trunk/connector-api/src/main/java/com/metamatrix/connector/pool/Connecto= rIdentityFactory.java trunk/connector-api/src/main/java/com/metamatrix/connector/pool/Credenti= alMap.java trunk/connector-api/src/main/java/com/metamatrix/connector/pool/PoolAwar= eConnection.java trunk/connector-api/src/main/java/com/metamatrix/connector/pool/SingleId= entity.java trunk/connector-api/src/main/java/com/metamatrix/connector/pool/SingleId= entityFactory.java trunk/connector-api/src/main/java/com/metamatrix/connector/pool/UserIden= tity.java trunk/connector-api/src/main/java/com/metamatrix/connector/pool/UserIden= tityFactory.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/frame= work/AbstractLanguageVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/frame= work/DelegatingHierarchyVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/frame= work/HierarchyVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/frame= work/LanguageObjectVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/= CollectorVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/= SQLReservedWords.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/= SQLStringVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/Transa= ctionContext.java trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XAConn= ection.java trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XAConn= ector.java trunk/connector-api/src/main/resources/com/metamatrix/data/i18n.properti= es trunk/connector-api/src/test/java/com/metamatrix/data/pool/TestCredentia= lMap.java trunk/connector-api/src/test/java/com/metamatrix/data/transform/TestBasi= cValueTranslator.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /IndexConnector.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /MetadataConnectorPlugin.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /MetadataProcedureExecution.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /adapter/ObjectConnection.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /adapter/ObjectConnector.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /adapter/ObjectConnectorCapabilities.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /adapter/ObjectSynchExecution.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /internal/MetadataSearchCriteriaBuilder.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /internal/ObjectProcedure.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /internal/ObjectProcedureProcessor.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /internal/ObjectQuery.java trunk/connector-metadata/src/main/resources/com/metamatrix/connector/met= adata/i18n.properties trunk/connector-metadata/src/main/resources/com/metamatrix/connector/sys= admin/i18n.properties trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /TestIndexConnector.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /adapter/FakeObject.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /adapter/FakeObjectConnector.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /adapter/FakeObjectWithNonScalarMethod.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /adapter/TestObjectConnector.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /index/TestMetadataInCriteria.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /index/TestMetadataLiteralCriteria.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/FakeProcessorDataManager.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/FakeRuntimeMetadata.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/TestConnectorHost.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/TestMetadataSearchCriteriaBuilder.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/TestObjectProcedure.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/TestObjectQuery.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/TestObjectQueryProcessor.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CdkPlugin.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuilder.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShell.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShellComma= ndTarget.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/IConnectorHost.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/QueryCommandTarget.= java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.j= ava trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtil= ity.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/SysLogger.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUtil= ity.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/file/ConfigReaderWr= iter.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/file/XMLConfigReade= rWriter.java trunk/connector-sdk/src/main/java/com/metamatrix/common/classloader/Clas= sLoaderUtil.java trunk/connector-sdk/src/main/java/com/metamatrix/common/classloader/Nest= edException.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Argum= entConversionException.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Comma= nd.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Comma= ndLineParser.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Comma= ndShell.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Comma= ndTarget.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Conne= ctorResultUtility.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/NoScr= iptFileException.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Scrip= tCommandTarget.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Scrip= tFileNameStack.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Scrip= tReader.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Scrip= tResultListener.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Wrong= NumberOfArgumentsException.java trunk/connector-sdk/src/main/java/com/metamatrix/core/factory/ComponentL= oader.java trunk/connector-sdk/src/main/resources/com/metamatrix/cdk/i18n.properties trunk/connector-sdk/src/test/java/com/metamatrix/cdk/unittest/FakeTransl= ationFactory.java trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/Comma= ndShellTest.java trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/FakeC= ommandTarget.java trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/TestC= ommand.java trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/TestC= ommandLineParser.java trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/TestS= criptFileNameStack.java trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/TestS= criptReader.java trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/TestS= hell.java trunk/connector-sdk/src/test/java/com/metamatrix/core/factory/TestCompon= entLoader.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/ConnectionListener.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/ConnectionQueryStrategy.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/ConnectionStrategy.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/DefaultConnectionListener.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCBaseExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCConnector.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCPlugin.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCProcedureExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCPropertyNames.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCQueryExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCSourceConnection.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCSourceConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCUpdateExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/SimpleCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/access/AccessCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/access/AccessSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/access/AccessSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2Capabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2ConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2ResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2SQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2SQLModificationVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2SQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2SingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2UserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbySQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbySingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyTimestampFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/BindValueVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/FunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/ResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/SQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/SQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/TranslatedCommand.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/ValueRetriever.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/impl/AliasModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/impl/BasicFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/impl/BasicResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/impl/BasicSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/impl/BasicValueRetriever.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/impl/DropFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/impl/EscapeSyntaxModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/impl/SubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/informix/InformixCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/informix/InformixResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/informix/InformixSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/informix/InformixSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/informix/InformixUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mm/MMCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mm/MMSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/ConcatFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/DayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/ExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/FormatFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/HourFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/LeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/LocateFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/Log10FunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/MonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/ParseFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/DatePartFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/ModifiedDatePartFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/SubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerModModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/ssl/JDBCSequeLinkSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/ssl/SequeLinkOracleCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/FormatTimestampModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/ModFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/teradata/TeradataCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/util/FunctionReplacementVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/util/JDBCExecutionHelper.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/JDBCSingleIdentityDSConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/JDBCSourceXAConnection.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/JDBCXAConnector.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/XAJDBCPropertyNames.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/db2/DB2SingleIdentityDSConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/db2/DB2XACapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/informix/InformixSingleIdentityDSConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/informix/InformixXACapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/oracle/OracleSingleIdentityDSConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/oracle/OracleXACapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/sqlserver/SqlServerSingleIdentityDSConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/sqlserver/SqlServerXACapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/sybase/SybaseSingleIdentityDSConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/sybase/SybaseXACapabilities.java trunk/connectors/connector-jdbc/src/main/resources/com/metamatrix/connec= tor/jdbc/i18n.properties trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/FakeConnection.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/MetadataFactory.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/TestConnectionQueryStrategy.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/TestJDBCSourceConnection.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/access/TestAccessSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/db2/TestDB2ConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/db2/TestDB2SqlTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/derby/TestDerbyConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/extension/impl/TestDropFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/extension/impl/TestEscapeSyntaxModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/mysql/TestMySQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestDayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestFormatFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestHourFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestLeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestLocateFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestLog10FunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestMonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestOracleConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestParseFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestSubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/postgresql/TestPostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sqlserver/TestSqlServerConversionVisitor.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sqlserver/TestSqlServerConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sybase/TestFormatTimestampModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sybase/TestModFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sybase/TestSybaseConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sybase/TestSybaseSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/userpool/MockExampleConnectionFactory.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/userpool/MockSourceConnection.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/userpool/TestPerUserPool.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/util/TestFunctionReplacementVisitor.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/IQueryToLdapSearchParser.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPConnection.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPConnector.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPConnectorCapabilities.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPConnectorConstants.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPConnectorPropertyNames.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPPlugin.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPSearchDetails.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPSyncQueryExecution.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPUpdateExecution.java trunk/connectors/connector-ldap/src/main/resources/com/metamatrix/connec= tor/ldap/i18n.properties trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/l= dap/TestIQueryToLdapSearchParser.java trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connect= or/loopback/LoopbackCapabilities.java trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connect= or/loopback/LoopbackConnection.java trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connect= or/loopback/LoopbackConnector.java trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connect= or/loopback/LoopbackExecution.java trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connect= or/loopback/LoopbackProperties.java trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connect= or/loopback/TestLoobackAsynch.java trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connect= or/loopback/TestLoopbackExecution.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/Connector.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/ConnectorState.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/Messages.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/SalesForcePlugin.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/SalesforceCapabilities.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/Util.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/connection/SalesforceConnection.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/connection/impl/ConnectionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/DataPayload.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/DeleteExecutionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/InsertExecutionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/QueryExecutionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/UpdateExecutionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/UpdateExecutionParent.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/CriteriaVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/DeleteVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/ICriteriaVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/IQueryProvidingVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/InsertVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/SelectVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/UpdateVisitor.java trunk/connectors/connector-salesforce/src/main/resources/com/metamatrix/= connector/salesforce/i18n.properties trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/conne= ctor/salesforce/TestConnector.java trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/conne= ctor/salesforce/test/util/ObjectFactory.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/StringToDateTranslator.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextCapabilities.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextConnection.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextConnector.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextPlugin.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextPropertyNames.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextSynchExecution.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextUtil.java trunk/connectors/connector-text/src/main/resources/com/metamatrix/connec= tor/text/i18n.properties trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestHelper.java trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestMultiFileTextSynchExecution.java trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestRowHeaderTextSynchExecution.java trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestTextConnection.java trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestTextConnector.java trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestTextSynchExecution.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/AbstractCachingConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/AsynchronousDocumentProducer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/BaseXMLConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/CachingConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/DocumentProducer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/IQueryPreprocessor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/NamedDocumentExecutor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/SAXFilterProvider.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/SOAPConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/SecureConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/TrustedPayloadHandler.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/XMLConnection.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/XMLConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/XMLExecution.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/BaseBatchProducer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/BaseResultsProducer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/CountingInputStream.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/CriteriaDesc.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/DocumentBuilder.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/DocumentInfo.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/ExecutionInfo.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/FileBackedValueReference.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/FileLifeManager.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/IDGeneratingXmlFilter.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/IQueryPreprocessor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/LargeOrSmallString.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/LargeTextExtractingXmlFilter.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/LargeTextValueReference.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/LoggingConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/LoggingInputStreamFilter.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/Messages.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/NoExtendedFilters.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/NoQueryPreprocessing.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/OutputXPathDesc.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/ParameterDescriptor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/PluggableInputStreamFilterImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/QueryAnalyzer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/RequestGenerator.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/RequestResponseDocumentProducer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/Response.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/SecureConnectorStateImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/StatefulConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/StringBackedValueReference.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/TrustedPayloadBridge.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/ValueConvertor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLCapabilities.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLConnectionImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLConnectorStateImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLDocument.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLExecutionImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLExtractor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/cache/CachedObjectRecord.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/cache/DocumentCache.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/cache/ExecutionRecord.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/cache/IDocumentCache.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/cache/RequestPartRecord.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/cache/RequestRecord.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/file/FileConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/file/FileExecutor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/file/Messages.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/http/DefaultTrustDeserializer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/http/HTTPConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/http/HTTPExecutor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/http/HTTPRequestor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/http/HTTPTrustDeserializer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/http/HttpInfo.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/http/Messages.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/JMSCapabilities.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/JMSConnection.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/JMSConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/JMSExecution.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/JMSRequestExecutor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/JMSSOAPConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/JMSXMLConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/Messages.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/DefaultSoapTrustDeserializer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/Messages.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/SOAPConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/SOAPConnectorStateImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/SOAPDocBuilder.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/SOAPExecutor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLConnectionFacory.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLSourceCapabilities.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLSourceConnection.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLSourceConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLSourceExecution.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLSourcePlugin.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/file/FileConnection.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/file/FileExecution.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/soap/SecurityToken.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/soap/ServiceOperation.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/soap/SoapConnection.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/soap/SoapConnectorProperties.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/soap/SoapExecution.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/soap/SoapService.java trunk/connectors/connector-xml/src/main/resources/com/metamatrix/connect= or/xml/base/I18N.properties trunk/connectors/connector-xml/src/main/resources/com/metamatrix/connect= or/xml/file/I18N.properties trunk/connectors/connector-xml/src/main/resources/com/metamatrix/connect= or/xml/http/I18N.properties trunk/connectors/connector-xml/src/main/resources/com/metamatrix/connect= or/xml/jms/I18N.properties trunk/connectors/connector-xml/src/main/resources/com/metamatrix/connect= or/xml/soap/I18N.properties trunk/connectors/connector-xml/src/test/java/com/imacination/webservices= /distance/Distance_jws/Distance.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/MockCachingConnector.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/MockHostnameVerifier.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/MockQueryPreprocessor.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/MockXMLExecution.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/ProxyObjectFactory.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestBaseBatchProducer.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestCountingInputStream.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestCriteriaDesc.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestExecutionInfo.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestFileBackedValueReference.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestFileLifeManager.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestLargeOrSmallString.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestLargeTextExtractingXmlFilter.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestLoggingInputStreamFilter.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestOutputXPathDesc.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestParameterDescriptor.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestQueryAnalyzer.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestStringBackedValueReference.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLCapabilities.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLConnection.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLConnector.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLConnectorState.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLDocument.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLExecution.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLExtractor.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/cache/MockDocumentCache.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/cache/TestCache.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/cache/TestPerformanceCache.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/cache/TestRequestRecord.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/file/TestFileConnectorState.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/file/TestFileExecutor.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/http/TestHTTPConnectorState.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/jms/TestJMSConnectorState.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/jms/TestJMSSOAPConnectorState.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/soap/SOAPDocBuilderTest.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/soap/SOAPTestSuite.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/FakeRuntimeMetadata.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/file/TestFileConnection.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/file/TestFileExecution.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/soap/TestSoapConnection.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/soap/TestSoapExecution.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/soap/service/StockQuotes.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/soap/service/WebServiceServer.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/test/servlet= /DocNameValueServlet.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/test/servlet= /DocPostBodyServlet.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/test/servlet= /EchoServlet.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/test/servlet= /LoggingServlet.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/test/servlet= /MockResponseServlet.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/test/servlet= /NameValueServlet.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/www/BooksVie= w_Input/AuthorBooks_Input_Type.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/www/BooksVie= w_Output/Books_Output_Type.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/www/Currency= ExchangeService/CurrencyExchange.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/www/Currency= ExchangeService/PWCallback.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/www/Currency= ExchangeService/PWCallbackDigest.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/www/whatssho= wing/Movie.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/www/whatssho= wing/MovieInformation.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/www/whatssho= wing/Theater.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/www/whatssho= wing/UpcomingMovie.java trunk/connectors/connector-xml/src/test/java/metamatrix/com/Books/BooksV= iewBooks.java trunk/connectors/connector-xml/src/test/resources/BookCollection.xml trunk/connectors/connector-xml/src/test/resources/com/metamatrix/connect= or/xmlsource/soap/client_crypto.properties trunk/connectors/connector-xml/src/test/resources/com/metamatrix/connect= or/xmlsource/soap/client_trusted_crypto.properties trunk/connectors/connector-xml/src/test/resources/com/metamatrix/connect= or/xmlsource/soap/saml_signed_keyholder.properties trunk/connectors/connector-xml/src/test/resources/com/metamatrix/connect= or/xmlsource/soap/saml_signed_sendervouches.properties trunk/connectors/connector-xml/src/test/resources/com/metamatrix/connect= or/xmlsource/soap/saml_unsigned_keyholder.properties trunk/connectors/connector-xml/src/test/resources/com/metamatrix/connect= or/xmlsource/soap/saml_unsigned_prop.properties trunk/connectors/connector-xml/src/test/resources/com/metamatrix/connect= or/xmlsource/soap/server_crypto.properties trunk/connectors/connector-xml/src/test/resources/com/metamatrix/connect= or/xmlsource/soap/server_trusted_crypto.properties trunk/connectors/connector-xml/src/test/resources/com/metamatrix/test/se= rvlet/MockResponseServletProps.properties trunk/connectors/connector-xml/src/test/resources/documents/NameValueTes= t.xsd trunk/connectors/connector-xml/src/test/resources/documents/jmsTest.xsd trunk/connectors/connector-xml/src/test/resources/service/books/BooksVie= w_Input.xsd trunk/connectors/connector-xml/src/test/resources/service/books/BooksVie= w_Output.xsd trunk/connectors/connector-xml/src/test/resources/service/distance/Dista= nce.xml trunk/connectors/connector-xml/src/test/resources/stockquotes.xml trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecAntExecution.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecCapabilities.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecConnection.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecConnector.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecPlugin.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecVisitor.java trunk/connectors/sandbox/connector-exec/src/main/resources/com/metamatri= x/connector/exec/i18n.properties trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/con= nector/exec/FakeExecConnector.java trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/con= nector/exec/TestsExec.java trunk/connectors/sandbox/connector-exec/src/test/resources/exclusionFile= .properties trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectConnection.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectConnector.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectConnectorCapabilities.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectPlugin.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectProcedureExecution.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectPropertyNames.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectSourceMethodManager.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/IObjectCommand.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/IObjectSource.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/ISourceTranslator.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/IValueRetriever.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/command/ObjectCommand.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/command/ProcedureCommand.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/source/BaseObjectSource.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/source/BaseSourceConnectionFactory.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/source/BasicSourceTranslator.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/value/BasicValueRetriever.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/value/JavaUtilDateValueTranslator.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/util/ObjectConnectorUtil.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/util/ObjectExecutionHelper.java trunk/connectors/sandbox/connector-object/src/main/resources/com/metamat= rix/connector/object/i18n.properties trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/Messages.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialCapabilities.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialConversionVisitor.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialFunctions.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialResultsTranslator.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/SpatialHint.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/SpatialSelectProxy.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/resources/com= /metamatrix/connector/jdbc/oracle/spatial/messages.properties trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/TickerCollectorVisitor.java trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/YahooCapabilities.java trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/YahooConnection.java trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/YahooConnector.java trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/YahooExecution.java trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/YahooPlugin.java trunk/connectors/sandbox/connector-yahoo/src/main/resources/com/metamatr= ix/connector/yahoo/i18n.properties trunk/connectors/sandbox/connector-yahoo/src/test/java/com/metamatrix/co= nnector/yahoo/TestYahooTranslation.java trunk/console/src/main/java/com/metamatrix/common/callback/Callback.java trunk/console/src/main/java/com/metamatrix/common/callback/CallbackChoic= es.java trunk/console/src/main/java/com/metamatrix/common/callback/CallbackHandl= er.java trunk/console/src/main/java/com/metamatrix/common/callback/CallbackImpl.= java trunk/console/src/main/java/com/metamatrix/common/callback/UnsupportedCa= llbackException.java trunk/console/src/main/java/com/metamatrix/common/properties/ObjectPrope= rtyManager.java trunk/console/src/main/java/com/metamatrix/common/properties/PropertyMan= ager.java trunk/console/src/main/java/com/metamatrix/common/properties/TextManager= .java trunk/console/src/main/java/com/metamatrix/console/ConsolePlugin.java trunk/console/src/main/java/com/metamatrix/console/connections/Connectio= nAndPanel.java trunk/console/src/main/java/com/metamatrix/console/connections/Connectio= nInfo.java trunk/console/src/main/java/com/metamatrix/console/connections/Connectio= nProcessor.java trunk/console/src/main/java/com/metamatrix/console/connections/RemoveCon= nectionDialog.java trunk/console/src/main/java/com/metamatrix/console/main/AdminConsoleMain= .java trunk/console/src/main/java/com/metamatrix/console/models/Authentication= ProviderManager.java trunk/console/src/main/java/com/metamatrix/console/models/ConfigurationM= anager.java trunk/console/src/main/java/com/metamatrix/console/models/ConfigurationP= ropertiedObjectEditor.java trunk/console/src/main/java/com/metamatrix/console/models/ConnectorManag= er.java trunk/console/src/main/java/com/metamatrix/console/models/EntitlementMan= ager.java trunk/console/src/main/java/com/metamatrix/console/models/ExtensionSourc= eManager.java trunk/console/src/main/java/com/metamatrix/console/models/GroupsManager.= java trunk/console/src/main/java/com/metamatrix/console/models/Manager.java trunk/console/src/main/java/com/metamatrix/console/models/ManagerListene= r.java trunk/console/src/main/java/com/metamatrix/console/models/Managers.java trunk/console/src/main/java/com/metamatrix/console/models/ModelChangedEv= ent.java trunk/console/src/main/java/com/metamatrix/console/models/ModelManager.j= ava trunk/console/src/main/java/com/metamatrix/console/models/PropertiesMana= ger.java trunk/console/src/main/java/com/metamatrix/console/models/PropertyDetail= .java trunk/console/src/main/java/com/metamatrix/console/models/QueryManager.j= ava trunk/console/src/main/java/com/metamatrix/console/models/ResourceManage= r.java trunk/console/src/main/java/com/metamatrix/console/models/ResourceProper= tiedObjectEditor.java trunk/console/src/main/java/com/metamatrix/console/models/RuntimeMgmtMan= ager.java trunk/console/src/main/java/com/metamatrix/console/models/ServerLogManag= er.java trunk/console/src/main/java/com/metamatrix/console/models/SessionManager= .java trunk/console/src/main/java/com/metamatrix/console/models/SummaryManager= .java trunk/console/src/main/java/com/metamatrix/console/models/TimedManager.j= ava trunk/console/src/main/java/com/metamatrix/console/models/TransactionMan= ager.java trunk/console/src/main/java/com/metamatrix/console/models/VdbManager.java trunk/console/src/main/java/com/metamatrix/console/notification/AddedCon= nectorBindingNotification.java trunk/console/src/main/java/com/metamatrix/console/notification/DataEnti= tlementChangeNotification.java trunk/console/src/main/java/com/metamatrix/console/notification/RuntimeU= pdateNotification.java trunk/console/src/main/java/com/metamatrix/console/security/Roles.java trunk/console/src/main/java/com/metamatrix/console/security/UserCapabili= ties.java trunk/console/src/main/java/com/metamatrix/console/ui/NotifyOnExitConsol= e.java trunk/console/src/main/java/com/metamatrix/console/ui/StatusPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/ViewManager.java trunk/console/src/main/java/com/metamatrix/console/ui/dialog/ConsoleLogi= n.java trunk/console/src/main/java/com/metamatrix/console/ui/dialog/ConsoleLogi= nDialog.java trunk/console/src/main/java/com/metamatrix/console/ui/dialog/ConsoleLogi= nPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/dialog/ConsoleLogi= nWindow.java trunk/console/src/main/java/com/metamatrix/console/ui/dialog/DetailsDial= og.java trunk/console/src/main/java/com/metamatrix/console/ui/dialog/ErrorDialog= .java trunk/console/src/main/java/com/metamatrix/console/ui/dialog/PendingChan= gesDialog.java trunk/console/src/main/java/com/metamatrix/console/ui/dialog/RefreshRate= sDialog.java trunk/console/src/main/java/com/metamatrix/console/ui/dialog/ResetPasswo= rdPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/dialog/ServerURLsD= ialog.java trunk/console/src/main/java/com/metamatrix/console/ui/layout/BasePanel.j= ava trunk/console/src/main/java/com/metamatrix/console/ui/layout/CDKCallback= Handler.java trunk/console/src/main/java/com/metamatrix/console/ui/layout/ConsoleAbou= tPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/layout/ConsoleMain= Frame.java trunk/console/src/main/java/com/metamatrix/console/ui/layout/ConsoleMenu= Bar.java trunk/console/src/main/java/com/metamatrix/console/ui/layout/ConsoleMenu= BarListener.java trunk/console/src/main/java/com/metamatrix/console/ui/layout/MenuEntry.j= ava trunk/console/src/main/java/com/metamatrix/console/ui/layout/PanelsTree.= java trunk/console/src/main/java/com/metamatrix/console/ui/layout/PanelsTreeM= odel.java trunk/console/src/main/java/com/metamatrix/console/ui/layout/PanelsTreeN= ode.java trunk/console/src/main/java/com/metamatrix/console/ui/layout/TreeAndCont= rollerCoordinator.java trunk/console/src/main/java/com/metamatrix/console/ui/layout/UserPrefere= nceCallback.java trunk/console/src/main/java/com/metamatrix/console/ui/layout/Workspace.j= ava trunk/console/src/main/java/com/metamatrix/console/ui/layout/WorkspaceCo= ntroller.java trunk/console/src/main/java/com/metamatrix/console/ui/layout/WorkspaceCo= ntrollerWorkItem.java trunk/console/src/main/java/com/metamatrix/console/ui/layout/WorkspacePa= nel.java trunk/console/src/main/java/com/metamatrix/console/ui/tree/ChildSortingT= reeNode.java trunk/console/src/main/java/com/metamatrix/console/ui/tree/SavesExpansio= nState.java trunk/console/src/main/java/com/metamatrix/console/ui/tree/SortReadyJTre= e.java trunk/console/src/main/java/com/metamatrix/console/ui/tree/SortableChild= renNode.java trunk/console/src/main/java/com/metamatrix/console/ui/tree/SortsChildren= .java trunk/console/src/main/java/com/metamatrix/console/ui/tree/TreePathExpan= sion.java trunk/console/src/main/java/com/metamatrix/console/ui/treetable/TreeTabl= eModel.java trunk/console/src/main/java/com/metamatrix/console/ui/util/AbstractPanel= Action.java trunk/console/src/main/java/com/metamatrix/console/ui/util/AbstractPrope= rtiedObjectPanelHolder.java trunk/console/src/main/java/com/metamatrix/console/ui/util/ActionFireabl= eButtonWidget.java trunk/console/src/main/java/com/metamatrix/console/ui/util/BasicWizardSu= bpanelContainer.java trunk/console/src/main/java/com/metamatrix/console/ui/util/CenteredOptio= nPane.java trunk/console/src/main/java/com/metamatrix/console/ui/util/ChooserPanel.= java trunk/console/src/main/java/com/metamatrix/console/ui/util/ColumnSortInf= o.java trunk/console/src/main/java/com/metamatrix/console/ui/util/ConsoleCellRe= nderer.java trunk/console/src/main/java/com/metamatrix/console/ui/util/ConsoleConsta= nts.java trunk/console/src/main/java/com/metamatrix/console/ui/util/ExpertPropert= iedObjectPanelHolder.java trunk/console/src/main/java/com/metamatrix/console/ui/util/IconComponent= .java trunk/console/src/main/java/com/metamatrix/console/ui/util/IconLabel.java trunk/console/src/main/java/com/metamatrix/console/ui/util/InitialAndCur= rentValues.java trunk/console/src/main/java/com/metamatrix/console/ui/util/ItemsBlockedC= allback.java trunk/console/src/main/java/com/metamatrix/console/ui/util/ItemsBlockedL= istSelectionListener.java trunk/console/src/main/java/com/metamatrix/console/ui/util/ItemsBlockedT= reeSelectionListener.java trunk/console/src/main/java/com/metamatrix/console/ui/util/JEnterButton.= java trunk/console/src/main/java/com/metamatrix/console/ui/util/LazyBranchLis= tener.java trunk/console/src/main/java/com/metamatrix/console/ui/util/LazyBranchNod= e.java trunk/console/src/main/java/com/metamatrix/console/ui/util/MDCPOpenState= Listener.java trunk/console/src/main/java/com/metamatrix/console/ui/util/ModifiedDirec= toryChooserPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/util/NoFocusUnless= SelectedListCellRenderer.java trunk/console/src/main/java/com/metamatrix/console/ui/util/NoMinTextFiel= dWidget.java trunk/console/src/main/java/com/metamatrix/console/ui/util/NoSelectionLi= stCellRenderer.java trunk/console/src/main/java/com/metamatrix/console/ui/util/POPWithButton= s.java trunk/console/src/main/java/com/metamatrix/console/ui/util/POPWithButton= sController.java trunk/console/src/main/java/com/metamatrix/console/ui/util/PropertiedObj= ectPanelHolder.java trunk/console/src/main/java/com/metamatrix/console/ui/util/ReadOnlyListW= idget.java trunk/console/src/main/java/com/metamatrix/console/ui/util/RepaintContro= ller.java trunk/console/src/main/java/com/metamatrix/console/ui/util/SelectAllOrNo= neMessageReceiver.java trunk/console/src/main/java/com/metamatrix/console/ui/util/SelectAllOrNo= nePopupController.java trunk/console/src/main/java/com/metamatrix/console/ui/util/StringListBas= edListModel.java trunk/console/src/main/java/com/metamatrix/console/ui/util/TableCellRend= ererFactory.java trunk/console/src/main/java/com/metamatrix/console/ui/util/WizardInterfa= ce.java trunk/console/src/main/java/com/metamatrix/console/ui/util/WizardInterfa= ceImpl.java trunk/console/src/main/java/com/metamatrix/console/ui/util/WizardStepTex= tPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/util/property/GuiC= omponentFactory.java trunk/console/src/main/java/com/metamatrix/console/ui/util/property/Icon= s.java trunk/console/src/main/java/com/metamatrix/console/ui/util/property/Prop= ertyProvider.java trunk/console/src/main/java/com/metamatrix/console/ui/util/property/Type= Constants.java trunk/console/src/main/java/com/metamatrix/console/ui/util/wizard/Abstra= ctWizardClient.java trunk/console/src/main/java/com/metamatrix/console/ui/util/wizard/Defaul= tWizardClientPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/util/wizard/Wizard= Client.java trunk/console/src/main/java/com/metamatrix/console/ui/util/wizard/Wizard= ClientPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/util/wizard/Wizard= Pane.java trunk/console/src/main/java/com/metamatrix/console/ui/util/wizard/Wizard= PaneDialog.java trunk/console/src/main/java/com/metamatrix/console/ui/views/DefaultConso= leTableComparator.java trunk/console/src/main/java/com/metamatrix/console/ui/views/DefaultConso= leTableSorter.java trunk/console/src/main/java/com/metamatrix/console/ui/views/authorizatio= n/AuthenticationProviderDetailsPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/authorizatio= n/AuthenticationProviderPropertiesPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/authorizatio= n/NewAuthenticationProviderSelectPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/authorizatio= n/NewAuthenticationProviderSpecificationPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/authorizatio= n/NewAuthenticationProviderWizardController.java trunk/console/src/main/java/com/metamatrix/console/ui/views/authorizatio= n/ProvidersChangedEvent.java trunk/console/src/main/java/com/metamatrix/console/ui/views/authorizatio= n/ProvidersChangedListener.java trunk/console/src/main/java/com/metamatrix/console/ui/views/authorizatio= n/ProvidersMain.java trunk/console/src/main/java/com/metamatrix/console/ui/views/authorizatio= n/SummaryMain.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/Co= nnectorBasicInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/Co= nnectorDetailInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/Co= nnectorPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/Im= portWizardConfirmationPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/Im= portWizardConnectorIDPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/Im= portWizardController.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/Im= portWizardControllerInterface.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/Im= portWizardDuplicatesPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connector/Im= portWizardFileSelectorPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/BindingBasics.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/BindingDataInterface.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/BindingDetails.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/BindingDetailsPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/BindingPropertiesPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/BindingVDBInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/BindingVDBsPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/ConnectorAndBinding.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/ConnectorBindingDisplayer.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/ConnectorBindingPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/ConnectorBindingRenameDialog.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/ImportBindingWizardController.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/ImportBindingWizardPSCEnablePanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/ImportBindingWizardRenamePanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/NewBindingWizardConnectorSelectPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/NewBindingWizardController.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/NewBindingWizardCreateConfirmPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/NewBindingWizardPSCEnablePanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/connectorbin= ding/NewBindingWizardSpecificationPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Confi= gSummaryPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Confi= gurationImportWizard.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Confi= gurationTreeCellRenderer.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Confi= rmationPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Creat= ePSCPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Creat= ePanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Deplo= yMainPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Deplo= yedHostPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Deplo= yedProcessPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Deplo= yedPscPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Deplo= yedServicePanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Deplo= ymentsSummaryPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Detai= lPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Produ= ctDefinitionPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/PscDe= finitionPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/PscSu= mmaryPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Servi= ceDefinitionPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Updat= ePSCPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/event= /ConfigurationChangeEvent.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/event= /ConfigurationChangeListener.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/event= /ConfigurationModifier.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/event= /ConfigurationTreeModelEvent.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/event= /ConfigurationTreeModelListener.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/model= /ConfigurationTreeModel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/= DeployPkgUtils.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/= DeployTableSorter.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/= PropertyConstants.java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/= TextValidator.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /AuthorizationPropagationListener.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /AuthorizationsCheckBox.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /AuthorizationsCheckBoxListener.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /AuthorizationsModel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /AuthorizationsTreeCellRenderer.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /AuthorizationsTreeTable.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /ButtonsStateController.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /DataNodeAuthorizationsControl.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /DataNodeInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /DataNodePermissionChange.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /DataNodePermissions.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /DataNodePermissionsWithNodeName.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /DataNodesTreeModel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /DataNodesTreeModelGenerator.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /DataNodesTreeNode.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /EntitlementDetailPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /EntitlementInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /EntitlementMembershipController.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /EntitlementSelector.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /EntitlementsDataInterface.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /EntitlementsPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /EntitlementsTable.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /EntitlementsTableModel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /EntitlementsTableRowData.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /NewEntitlementBasedOnPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /NewEntitlementConfirmationPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /NewEntitlementController.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /NewEntitlementNamePanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /NewEntitlementWizardPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /PermissionsUpdater.java trunk/console/src/main/java/com/metamatrix/console/ui/views/entitlements= /PrincipalChangeListener.java trunk/console/src/main/java/com/metamatrix/console/ui/views/extensionsou= rce/ExtensionSourceAdder.java trunk/console/src/main/java/com/metamatrix/console/ui/views/extensionsou= rce/ExtensionSourceDetailInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/extensionsou= rce/ExtensionSourceDetailListener.java trunk/console/src/main/java/com/metamatrix/console/ui/views/extensionsou= rce/ExtensionSourceDetailPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/extensionsou= rce/ExtensionSourceExporter.java trunk/console/src/main/java/com/metamatrix/console/ui/views/extensionsou= rce/ExtensionSourceReplacer.java trunk/console/src/main/java/com/metamatrix/console/ui/views/extensionsou= rce/ExtensionSourcesPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/extensionsou= rce/ExtensionSourcesTableModel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/extensionsou= rce/NewExtensionSourceInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/logsetup/Con= figurationLogSetUpPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/logsetup/Con= figurationLogSetUpPanelController.java trunk/console/src/main/java/com/metamatrix/console/ui/views/logsetup/Con= textsAccumulatorListener.java trunk/console/src/main/java/com/metamatrix/console/ui/views/logsetup/Con= textsAccumulatorPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/logsetup/Mes= sageLevelChangeNotifyee.java trunk/console/src/main/java/com/metamatrix/console/ui/views/logsetup/Mes= sageLevelCheckBoxes.java trunk/console/src/main/java/com/metamatrix/console/ui/views/logsetup/Mes= sageLevelPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/logsetup/Sys= temLogSetUpPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/pools/PoolCo= nfigTableRowData.java trunk/console/src/main/java/com/metamatrix/console/ui/views/pools/PoolNa= meAndType.java trunk/console/src/main/java/com/metamatrix/console/ui/views/pools/PoolPr= opertiedObjectAndEditor.java trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/C= onsolePropertiedEditor.java trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/C= onsolePropertyObjectId.java trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/D= efaultComponentSelector.java trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/F= akeUserTransaction.java trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/N= extStartupPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/P= ropertiesMasterPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/P= ropertiesTreeModelFactory.java trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/P= ropertyDetailPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/P= ropertyFilter.java trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/P= ropertyFilterPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/properties/P= ropertyHeaderPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/queries/Quer= yPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/queries/Quer= yRequestPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/queries/Quer= yTableModel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/resources/Re= sourceData.java trunk/console/src/main/java/com/metamatrix/console/ui/views/resources/Re= sourcesMainPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/Conf= irmationPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/Oper= ationsDelegate.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/Oper= ationsPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/Proc= essMgmtPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/Queu= eStatistics.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/Queu= eStatisticsDisplayHandler.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/Queu= eStatisticsPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/Queu= eStatisticsRefreshRequestHandler.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/Queu= eStatisticsRefreshRequestHandlerImp.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/Runt= imeMgmtPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/Runt= imeStateCellRenderer.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/Serv= iceMgmtPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/VMSt= atisticsDisplayHandler.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/VMSt= atisticsPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/mode= l/HostStatistics.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/mode= l/RuntimeMgmtModel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/mode= l/StatisticsConstants.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/util= /RuntimeMgmtUtils.java trunk/console/src/main/java/com/metamatrix/console/ui/views/runtime/util= /ServiceStateConstants.java trunk/console/src/main/java/com/metamatrix/console/ui/views/sessions/Ses= sionPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/sessions/Ses= sionTableCellRenderer.java trunk/console/src/main/java/com/metamatrix/console/ui/views/sessions/Ses= sionTableModel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/Summ= aryConnectionInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/Summ= aryHostInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/Summ= aryInfoProvider.java trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/Summ= aryPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/MaxRe= cordsPerQueryListener.java trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/MaxRe= cordsPerQueryPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/RowsN= otSelectedPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/SysLo= gPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/SysLo= gUtils.java trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/TimeS= panButtonSelectionListener.java trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/TimeS= panEndingPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/TimeS= panPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/TimeS= panPanelValidityListener.java trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/TimeS= panStartingOrEndingPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/syslog/TimeS= panStartingPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/transactions= /TransactionTableModel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/transactions= /TransactionsPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/AddDia= log.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/AdminR= olesMain.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/GroupA= ccumulatorController.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/GroupT= abSelectionHandler.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/Groups= AccumulatorListener.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/Groups= AccumulatorPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/Groups= TabMainPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/Inheri= tedRole.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/NewGro= upsWizardController.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/NewGro= upsWizardSelectionPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/Notify= OnSelectionChange.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/RoleDe= tail.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/RoleDi= splay.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/RoleMe= mbershipPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/users/RolesL= ist.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/AllMater= ializationFilesDisplayInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/Bindings= AlreadyExistDlg.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/Connecto= rBindingNameAndUUID.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/CreateVD= BPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/CreateVD= BPanelParent.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/DataNode= sTreeModel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/Entitlem= entMigrationDetailInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/Entitlem= entMigrationDetailPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/Entitlem= entMigrationInfoSource.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/Entitlem= entMigrationReportSummaryPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/Entitlem= entMigrationSummaryInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/ImportVd= bRolesPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/ImportVd= bRolesWizardDlg.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/ImportVd= bVersionWizardDlg.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/Material= izationPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/Material= izationWizard.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/Material= izationWizardDialog.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/ModelVis= ibilityInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/ModelWra= pper.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/MultiSou= rceModelBindingEditRequestHandler.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/NewVDBWi= zardModelVisibilityTable.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/SingleMa= terializationFileDisplayInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/UDDIConf= igurationsDialog.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/UDDIConf= igurationsHandler.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/UDDIInit= ialAccessErrorDialog.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/UDDIRegi= stryInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VDBConne= ctorBindingAssignmentModelTable.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VDBConne= ctorBindingNames.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VDBExpor= ter.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VDBMetad= ataTreeNode.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VDBMetad= ataTreePanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VDBMulti= ConnectorBindingAssignmentDlg.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VDBRoles= Exporter.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VDBWizar= dModelVisibilityPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbAssig= nConnBindPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbConnB= indPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbDetai= lPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbDispl= ayer.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbEditC= onnBindDlg.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbEntit= lementsPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbMainP= anel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbModel= sPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbRoleO= ptionsPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbSetSt= atusDlg.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizar= dConfirmPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizar= dEditConnBindPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizar= dEntitlementsPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizar= dEntitlementsSelectPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizar= dIdPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizar= dSaveMaterializationFilesPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizar= dUserAndPasswordPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/VdbWizar= dWrittenMaterializationFilesPanel.java trunk/console/src/main/java/com/metamatrix/console/ui/views/vdb/WSDLOper= ationsDescription.java trunk/console/src/main/java/com/metamatrix/console/util/ApplicationConst= ants.java trunk/console/src/main/java/com/metamatrix/console/util/AutoRefreshable.= java trunk/console/src/main/java/com/metamatrix/console/util/AutoRefresher.ja= va trunk/console/src/main/java/com/metamatrix/console/util/Compares.java trunk/console/src/main/java/com/metamatrix/console/util/DaysHoursMinutes= Seconds.java trunk/console/src/main/java/com/metamatrix/console/util/DialogUtility.ja= va trunk/console/src/main/java/com/metamatrix/console/util/ExceptionUtility= .java trunk/console/src/main/java/com/metamatrix/console/util/ExternalExceptio= n.java trunk/console/src/main/java/com/metamatrix/console/util/HashedList.java trunk/console/src/main/java/com/metamatrix/console/util/HashedListEntry.= java trunk/console/src/main/java/com/metamatrix/console/util/HashedListEntryW= rapper.java trunk/console/src/main/java/com/metamatrix/console/util/InvalidRequestEx= ception.java trunk/console/src/main/java/com/metamatrix/console/util/LogContexts.java trunk/console/src/main/java/com/metamatrix/console/util/QCDate.java trunk/console/src/main/java/com/metamatrix/console/util/QCDateTime.java trunk/console/src/main/java/com/metamatrix/console/util/QCGregorianCalen= dar.java trunk/console/src/main/java/com/metamatrix/console/util/QCTime.java trunk/console/src/main/java/com/metamatrix/console/util/Refreshable.java trunk/console/src/main/java/com/metamatrix/console/util/RuntimeExternalE= xception.java trunk/console/src/main/java/com/metamatrix/console/util/SavedUDDIRegistr= yInfo.java trunk/console/src/main/java/com/metamatrix/console/util/StaticProperties= .java trunk/console/src/main/java/com/metamatrix/console/util/StaticQuickSorte= r.java trunk/console/src/main/java/com/metamatrix/console/util/StaticTableUtili= ties.java trunk/console/src/main/java/com/metamatrix/console/util/StaticTreeSortUt= ilities.java trunk/console/src/main/java/com/metamatrix/console/util/StaticTreeUtilit= ies.java trunk/console/src/main/java/com/metamatrix/console/util/StaticUtilities.= java trunk/console/src/main/java/com/metamatrix/console/util/StringComparator= .java trunk/console/src/main/java/com/metamatrix/toolbox/ToolboxPlugin.java trunk/console/src/main/java/com/metamatrix/toolbox/event/UserPreferences= Event.java trunk/console/src/main/java/com/metamatrix/toolbox/preference/UserPrefer= ences.java trunk/console/src/main/java/com/metamatrix/toolbox/property/VetoedChange= Event.java trunk/console/src/main/java/com/metamatrix/toolbox/property/VetoedChange= Listener.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/EmptyObject.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/IconConstants.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/IconFactory.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/MessageStandards.j= ava trunk/console/src/main/java/com/metamatrix/toolbox/ui/TextUtilities.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/UIConstants.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/UIDefaults.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/UiTextManager.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/Validator.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/callback/CallbackC= hoicesDialogPanel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/callback/DialogFac= toryCallbackHandler.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/callback/ParentFra= meSupplier.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/AboutDialog= .java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/AboutPanel.= java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/Accumulator= Panel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/ArrowIcon.j= ava trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/ButtonConst= ants.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/ButtonWidge= t.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/CalendarPan= el.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/CheckBox.ja= va trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/ComboButton= Widget.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/Configurati= onPanel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/DialogPanel= .java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/DialogWindo= w.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/DirectoryCh= ooserPanel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/DirectoryEn= tryTable.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/ErrorDialog= .java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/IntegerSpin= ner.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/LabelWidget= .java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/ListWidget.= java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/LoggingPane= l.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/LoginPanel.= java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/MessagePane= l.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/MultiLineTo= olTip.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/PasswordBut= ton.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/PopupMenu.j= ava trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/PopupMenuFa= ctory.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/PropertiedO= bjectArrayTable.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/ScrollWidge= t.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/SeparatorWi= dget.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/SpacerWidge= t.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/SplashPanel= .java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/SplashWindo= w.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/Splitter.ja= va trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/SplitterSha= dowBorder.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/TableWidget= .java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/TextFieldWi= dget.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/TextPane.ja= va trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/TitledBorde= r.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/ToolBar.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/TreeNodeTab= leWidget.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/TreeWidget.= java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/URLLabelWid= get.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/URLTextFiel= dWidget.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/WidgetFacto= ry.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/WizardPanel= .java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/button/Butt= onBorderPainter.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/button/Chec= kBoxModel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/button/Togg= leButtonBorder.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/event/Widge= tActionEvent.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/laf/ButtonL= ookAndFeel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/laf/CheckBo= xLookAndFeel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/laf/LabelLo= okAndFeel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/laf/LookAnd= FeelUtilities.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/laf/MultiLi= neToolTipUI.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/laf/Passwor= dLookAndFeel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/laf/TableHe= aderButtonLookAndFeel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/laf/ToolBar= LookAndFeel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/laf/TreeLoo= kAndFeel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/list/Defaul= tListCellRenderer.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/list/URLLis= tCellRenderer.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/menu/Defaul= tPopupMenuFactory.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Di= rectoryEntryPropertyComponent.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Mu= ltivaluedPropertyComponent.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Ob= jectReferenceHandler.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Ob= jectReferencePropertyComponent.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Pr= opertiedObjectPanel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Pr= opertiedObjectTableCellRenderer.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Pr= opertyChangeAdapter.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Pr= opertyComponent.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Pr= opertyComponentFactory.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Pr= opertyDefinitionLabel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Pr= opertySelectionEvent.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Pr= opertySelectionListener.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/property/Pr= opertyValidationListener.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Abstr= actTableFilterOptionPanel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Abstr= actTableOptionPanel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Defau= ltTableCellEditor.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Defau= ltTableCellRenderer.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Defau= ltTableColumnModel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Defau= ltTableComparator.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Defau= ltTableHeader.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Defau= ltTableHeaderRenderer.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Defau= ltTableModel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Defau= ltTableSorter.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Direc= toryEntryTableComparator.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Enhan= cedTableColumn.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Enhan= cedTableColumnModel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Enhan= cedTableModel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Table= ColumnSortListener.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Table= Comparator.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Table= Constants.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Table= Filter.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Table= Header.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Table= HeaderButton.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Table= HideOptionPanel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Table= OptionPanel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Table= ReorderOptionPanel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Table= SortOptionPanel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/table/Table= Sorter.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/text/Defaul= tTextFieldModel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/text/TextCo= nstants.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/text/TextCo= ntainer.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/Ab= stractDragAndDropController.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/Ab= stractTreeNodeDragAndDropController.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/Dr= agAndDropController.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/Fl= avor.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/Tr= ansferableTreeNode.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/transfer/Tr= eeNodeDragAndDropController.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/tree/Defaul= tTreeCellEditor.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/tree/Defaul= tTreeCellRenderer.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/tree/Defaul= tTreeModel.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/tree/Defaul= tTreeNode.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/tree/Defaul= tTreeNodeEditor.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/tree/Defaul= tTreeView.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/tree/TreeCo= nstants.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/Browse= rControl.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/FileRe= sourceConstants.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/IconFa= ctory.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/Proper= tyLoader.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/Proper= tyLoaderException.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/String= Filter.java trunk/console/src/main/java/com/metamatrix/toolbox/ui/widget/util/Widget= Utilities.java trunk/console/src/main/java/com/metamatrix/uddi/UddiPlugin.java trunk/console/src/main/java/com/metamatrix/uddi/exception/MMUddiExceptio= n.java trunk/console/src/main/java/com/metamatrix/uddi/publish/PublishWSDL.java trunk/console/src/main/java/com/metamatrix/uddi/publish/UnPublishWSDL.ja= va trunk/console/src/main/java/com/metamatrix/uddi/query/FindBusiness.java trunk/console/src/main/java/com/metamatrix/uddi/query/GetWSDL.java trunk/console/src/main/java/com/metamatrix/uddi/util/MMUddiHelper.java trunk/console/src/main/java/com/metamatrix/uddi/util/MMUddiUtil.java trunk/console/src/main/java/com/metamatrix/uddi/util/UddiHelper.java trunk/console/src/main/resources/com/metamatrix/console/data/runtime_mgr= .properties trunk/console/src/main/resources/com/metamatrix/console/i18n.properties trunk/console/src/main/resources/com/metamatrix/console/ui/data/common_u= i.properties trunk/console/src/main/resources/com/metamatrix/console/ui/data/type_def= s.properties trunk/console/src/main/resources/com/metamatrix/console/ui/views/deploy/= data/ui.properties trunk/console/src/main/resources/com/metamatrix/console/ui/views/runtime= /data/ui.properties trunk/console/src/main/resources/com/metamatrix/console/ui/views/syslog/= data/ui.properties trunk/console/src/main/resources/com/metamatrix/console/ui/views/users/d= ata/ui.properties trunk/console/src/main/resources/com/metamatrix/toolbox/i18n.properties trunk/console/src/main/resources/com/metamatrix/toolbox/ui/message.prope= rties trunk/console/src/main/resources/com/metamatrix/toolbox/ui/uiDefaults.pr= operties trunk/console/src/main/resources/com/metamatrix/toolbox/ui/uiTextDefault= s.properties trunk/console/src/test/java/com/metamatrix/console/util/TestStaticProper= ties.java trunk/console/src/test/resources/console_config.properties trunk/console/src/test/resources/console_prefs.properties trunk/console/src/test/resources/metamatrix.properties trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedMana= ger.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedPlug= in.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedProp= erties.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPListener.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/EmbeddedConfigS= ource.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/EmbeddedConfigU= til.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin= .java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfig= AdminImpl.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPLogLis= tener.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonito= ringAdminImpl.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntim= eStateAdminImpl.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPSecuri= tyAdminImpl.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/C= onnectorConfigurationReader.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/C= onnectorConfigurationWriter.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/E= xtensionModuleReader.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/E= xtensionModuleWriter.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/S= erverConfigFileReader.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/S= erverConfigFileWriter.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/V= DBConfigurationReader.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/configuration/V= DBConfigurationWriter.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Defaul= tIndexConnectorBinding.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embedd= edBaseDQPService.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embedd= edBufferService.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embedd= edConfigurationService.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embedd= edDataService.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embedd= edMetadataService.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embedd= edTrackingService.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embedd= edTransactionService.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embedd= edVDBService.java trunk/embedded/src/main/java/com/metamatrix/jdbc/CacheProvider.java trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnection.java trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFacto= ryImpl.java trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalTranspor= tHandler.java trunk/embedded/src/main/resources/com/metamatrix/dqp/embedded/i18n.prope= rties trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/EmbeddedTestUti= l.java trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/TestEmbeddedCon= figSource.java trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/admin/TestBaseA= dmin.java trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEm= beddedConfigurationService.java trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEm= beddedDataService.java trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEm= beddedVDBService.java trunk/embedded/src/test/java/com/metamatrix/dqp/service/buffer/TestLocal= BufferService.java trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java trunk/embedded/src/test/resources/admin/ServerConfig.xml trunk/embedded/src/test/resources/admin/buffertest1.properties trunk/embedded/src/test/resources/admin/buffertest2.properties trunk/embedded/src/test/resources/admin/buffertest3.properties trunk/embedded/src/test/resources/dqp/config/ServerConfig.xml trunk/embedded/src/test/resources/dqp/dqp.properties trunk/engine/src/main/java/com/metamatrix/cache/Cache.java trunk/engine/src/main/java/com/metamatrix/cache/CacheConfiguration.java trunk/engine/src/main/java/com/metamatrix/cache/CacheFactory.java trunk/engine/src/main/java/com/metamatrix/cache/CacheListener.java trunk/engine/src/main/java/com/metamatrix/common/application/Application= .java trunk/engine/src/main/java/com/metamatrix/common/application/Application= Environment.java trunk/engine/src/main/java/com/metamatrix/common/application/Application= Service.java trunk/engine/src/main/java/com/metamatrix/common/application/DQPConfigSo= urce.java trunk/engine/src/main/java/com/metamatrix/common/application/DQPGuiceMod= ule.java trunk/engine/src/main/java/com/metamatrix/common/application/exception/A= pplicationInitializationException.java trunk/engine/src/main/java/com/metamatrix/common/application/exception/A= pplicationLifecycleException.java trunk/engine/src/main/java/com/metamatrix/common/buffer/BlockedException= .java trunk/engine/src/main/java/com/metamatrix/common/buffer/BlockedOnMemoryE= xception.java trunk/engine/src/main/java/com/metamatrix/common/buffer/BufferManager.ja= va trunk/engine/src/main/java/com/metamatrix/common/buffer/BufferManagerFac= tory.java trunk/engine/src/main/java/com/metamatrix/common/buffer/BufferManagerPro= pertyNames.java trunk/engine/src/main/java/com/metamatrix/common/buffer/IndexedTupleSour= ce.java trunk/engine/src/main/java/com/metamatrix/common/buffer/LobTupleBatch.ja= va trunk/engine/src/main/java/com/metamatrix/common/buffer/MemoryNotAvailab= leException.java trunk/engine/src/main/java/com/metamatrix/common/buffer/StorageManager.j= ava trunk/engine/src/main/java/com/metamatrix/common/buffer/TupleBatch.java trunk/engine/src/main/java/com/metamatrix/common/buffer/TupleSource.java trunk/engine/src/main/java/com/metamatrix/common/buffer/TupleSourceID.ja= va trunk/engine/src/main/java/com/metamatrix/common/buffer/TupleSourceNotFo= undException.java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BatchCompar= ator.java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BatchMap.ja= va trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BatchMapVal= ueTranslator.java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferConfi= g.java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferManag= erImpl.java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/BufferStats= .java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/ManagedBatc= h.java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/MemoryState= .java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/SizeUtility= .java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/TupleGroupI= nfo.java trunk/engine/src/main/java/com/metamatrix/common/buffer/impl/TupleSource= Info.java trunk/engine/src/main/java/com/metamatrix/common/buffer/storage/file/Fil= eStorageManager.java trunk/engine/src/main/java/com/metamatrix/common/buffer/storage/memory/M= emoryStorageManager.java trunk/engine/src/main/java/com/metamatrix/common/comm/ClientServiceRegis= try.java trunk/engine/src/main/java/com/metamatrix/common/lob/BufferManagerLobChu= nkStream.java trunk/engine/src/main/java/com/metamatrix/dqp/DQPPlugin.java trunk/engine/src/main/java/com/metamatrix/dqp/ResourceFinder.java trunk/engine/src/main/java/com/metamatrix/dqp/application/ClientConnecti= onListener.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/cache/CacheID.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/cache/CacheResult= s.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/cache/CursorRecei= verWindowBuffer.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/cache/ResultSetCa= che.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/cache/ResultSetCa= cheUtil.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/Capabilit= iesConverter.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Asyn= chConnectorWorkItem.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorEnvironmentImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorManager.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorWorkItem.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorWrapper.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Defa= ultConnectorLogger.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Exec= utionContextImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Proc= edureBatchHandler.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Sync= hConnectorWorkItem.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Type= FacilityImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= AggregateImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= BaseLanguageObject.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= BatchedUpdatesImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= BulkInsertImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= CaseExpressionImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= CompareCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= CompoundCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= DeleteImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ElementImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ExistsCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= FromImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= FunctionImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= GroupByImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= GroupImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= InCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= InlineViewImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= InsertImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= IsNullCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= JoinImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LanguageBridgeFactory.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LanguageFactoryImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LikeCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LimitImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LiteralImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= NotCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= OrderByImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= OrderByItemImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ParameterImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ProcedureImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= QueryCommandImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= QueryImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ScalarSubqueryImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SearchedCaseExpressionImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SelectImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SelectSymbolImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SetClauseImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SetClauseListImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SetQueryImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SubqueryCompareCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SubqueryInCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= UpdateImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ElementImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= GroupImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= MetadataFactory.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= MetadataIDImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= MetadataObjectImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ParameterIDImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ParameterImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ProcedureIDImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ProcedureImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= RuntimeMetadataImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= TypeModelImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector= /ConnectionPool.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector= /ConnectionPoolException.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector= /ConnectionWrapper.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector= /PooledConnector.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/AbstractW= orkItem.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/CachedReq= uestWorkItem.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/CodeTable= Cache.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/DQPCore.j= ava trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/DQPWorkCo= ntext.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/DataTierM= anager.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/DataTierM= anagerImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/DataTierT= upleSource.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/LobChunkS= tream.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/LobWorkIt= em.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/MetaDataP= rocessor.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/PreparedP= lanCache.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/PreparedS= tatementRequest.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/QueryMeta= dataWrapper.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.j= ava trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestWo= rkItem.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/TempTable= StoresHolder.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/capabilit= ies/ConnectorCapabilitiesFinder.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/capabilit= ies/SharedCachedFinder.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/multisour= ce/MultiSourceCapabilitiesFinder.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/multisour= ce/MultiSourceElement.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/multisour= ce/MultiSourceElementReplacementVisitor.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/multisour= ce/MultiSourceMetadataWrapper.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/multisour= ce/MultiSourcePlanToProcessConverter.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/validator= /AuthorizationValidationVisitor.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/validator= /ModelVisibilityValidationVisitor.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Trans= actionContextImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Trans= actionProvider.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Trans= actionServerImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestID.ja= va trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestMessa= ge.java trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMessa= ge.java trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationServi= ce.java trunk/engine/src/main/java/com/metamatrix/dqp/service/BufferService.java trunk/engine/src/main/java/com/metamatrix/dqp/service/ConfigurationServi= ce.java trunk/engine/src/main/java/com/metamatrix/dqp/service/ConnectorBindingLi= feCycleListener.java trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTracki= ngMessage.java trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTracki= ngService.java trunk/engine/src/main/java/com/metamatrix/dqp/service/DQPServiceNames.ja= va trunk/engine/src/main/java/com/metamatrix/dqp/service/DataService.java trunk/engine/src/main/java/com/metamatrix/dqp/service/MetadataService.ja= va trunk/engine/src/main/java/com/metamatrix/dqp/service/TrackingService.ja= va trunk/engine/src/main/java/com/metamatrix/dqp/service/TransactionService= .java trunk/engine/src/main/java/com/metamatrix/dqp/service/VDBLifeCycleListen= er.java trunk/engine/src/main/java/com/metamatrix/dqp/service/VDBService.java trunk/engine/src/main/java/com/metamatrix/dqp/spi/CommandLoggerSPI.java trunk/engine/src/main/java/com/metamatrix/dqp/spi/TrackerLogConstants.ja= va trunk/engine/src/main/java/com/metamatrix/dqp/spi/basic/FileCommandLogge= r.java trunk/engine/src/main/java/com/metamatrix/dqp/transaction/TransactionSer= ver.java trunk/engine/src/main/java/com/metamatrix/dqp/transaction/XAServer.java trunk/engine/src/main/java/com/metamatrix/dqp/util/LogConstants.java trunk/engine/src/main/java/com/metamatrix/query/QueryPlugin.java trunk/engine/src/main/java/com/metamatrix/query/analysis/AnalysisRecord.= java trunk/engine/src/main/java/com/metamatrix/query/analysis/QueryAnnotation= .java trunk/engine/src/main/java/com/metamatrix/query/eval/Evaluator.java trunk/engine/src/main/java/com/metamatrix/query/eval/LookupEvaluator.java trunk/engine/src/main/java/com/metamatrix/query/eval/SecurityFunctionEva= luator.java trunk/engine/src/main/java/com/metamatrix/query/execution/QueryExecPlugi= n.java trunk/engine/src/main/java/com/metamatrix/query/function/FunctionDescrip= tor.java trunk/engine/src/main/java/com/metamatrix/query/function/FunctionForm.ja= va trunk/engine/src/main/java/com/metamatrix/query/function/FunctionLibrary= .java trunk/engine/src/main/java/com/metamatrix/query/function/FunctionLibrary= Manager.java trunk/engine/src/main/java/com/metamatrix/query/function/FunctionMetadat= aSource.java trunk/engine/src/main/java/com/metamatrix/query/function/FunctionMethods= .java trunk/engine/src/main/java/com/metamatrix/query/function/FunctionTree.ja= va trunk/engine/src/main/java/com/metamatrix/query/function/UDFSource.java trunk/engine/src/main/java/com/metamatrix/query/function/aggregate/Aggre= gateFunction.java trunk/engine/src/main/java/com/metamatrix/query/function/aggregate/Avg.j= ava trunk/engine/src/main/java/com/metamatrix/query/function/aggregate/Const= antFunction.java trunk/engine/src/main/java/com/metamatrix/query/function/aggregate/Count= .java trunk/engine/src/main/java/com/metamatrix/query/function/aggregate/Max.j= ava trunk/engine/src/main/java/com/metamatrix/query/function/aggregate/Min.j= ava trunk/engine/src/main/java/com/metamatrix/query/function/aggregate/NullF= ilter.java trunk/engine/src/main/java/com/metamatrix/query/function/aggregate/Sum.j= ava trunk/engine/src/main/java/com/metamatrix/query/function/metadata/Functi= onCategoryConstants.java trunk/engine/src/main/java/com/metamatrix/query/function/metadata/Functi= onMetadataReader.java trunk/engine/src/main/java/com/metamatrix/query/function/metadata/Functi= onMetadataValidator.java trunk/engine/src/main/java/com/metamatrix/query/function/metadata/Functi= onMethod.java trunk/engine/src/main/java/com/metamatrix/query/function/metadata/Functi= onParameter.java trunk/engine/src/main/java/com/metamatrix/query/function/metadata/Invali= dFunctionItem.java trunk/engine/src/main/java/com/metamatrix/query/function/source/Security= SystemFunctions.java trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemSo= urce.java trunk/engine/src/main/java/com/metamatrix/query/function/source/XMLSyste= mFunctions.java trunk/engine/src/main/java/com/metamatrix/query/mapping/relational/Query= Node.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/Intercepting= Visitor.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingAllNo= de.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingAttri= bute.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingBaseN= ode.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingChoic= eNode.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingComme= ntNode.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingCrite= riaNode.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingDocum= ent.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingEleme= nt.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingExcep= tion.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingInter= ceptor.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingLoade= r.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingNode.= java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingNodeC= onstants.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingNodeL= ogger.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingOutpu= tter.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingRecur= siveElement.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingSeque= nceNode.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingSourc= eNode.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/MappingVisit= or.java trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/Namespace.ja= va trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/Navigator.ja= va trunk/engine/src/main/java/com/metamatrix/query/mapping/xml/ResultSetInf= o.java trunk/engine/src/main/java/com/metamatrix/query/metadata/BasicQueryMetad= ata.java trunk/engine/src/main/java/com/metamatrix/query/metadata/BasicQueryMetad= ataWrapper.java trunk/engine/src/main/java/com/metamatrix/query/metadata/GroupInfo.java trunk/engine/src/main/java/com/metamatrix/query/metadata/QueryMetadataIn= terface.java trunk/engine/src/main/java/com/metamatrix/query/metadata/StoredProcedure= Info.java trunk/engine/src/main/java/com/metamatrix/query/metadata/SupportConstant= s.java trunk/engine/src/main/java/com/metamatrix/query/metadata/TempMetadataAda= pter.java trunk/engine/src/main/java/com/metamatrix/query/metadata/TempMetadataID.= java trunk/engine/src/main/java/com/metamatrix/query/metadata/TempMetadataSto= re.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/CommandPlanner= .java trunk/engine/src/main/java/com/metamatrix/query/optimizer/CommandTreeNod= e.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/CommandTreePro= cessor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/OptimizerConte= xt.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/QueryOptimizer= .java trunk/engine/src/main/java/com/metamatrix/query/optimizer/batch/BatchedU= pdatePlanner.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/batch/Prepared= BatchUpdatePlanner.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/capabilities/B= asicSourceCapabilities.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/capabilities/C= apabilitiesFinder.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/capabilities/D= efaultCapabilitiesFinder.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/capabilities/S= ourceCapabilities.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/proc/Procedure= Planner.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/Ali= asGenerator.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/Gen= erateCanonical.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/Mer= geTreeNodeProcessor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/Opt= imizerRule.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/Pla= nHints.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/Pla= nToProcessConverter.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/Rel= ationalPlanner.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/Rul= eStack.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/pla= ntree/JoinStrategyType.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/pla= ntree/NodeConstants.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/pla= ntree/NodeEditor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/pla= ntree/NodeFactory.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/pla= ntree/PlanNode.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/CapabilitiesUtil.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/CriteriaCapabilityValidatorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/FrameUtil.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/JoinRegion.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/JoinUtil.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/NewCalculateCostUtil.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleAccessPatternValidation.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleAssignOutputElements.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleCalculateCost.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleChooseDependent.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleChooseJoinStrategy.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleCleanCriteria.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleCollapseSource.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleConstants.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleCopyCriteria.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleImplementJoinStrategy.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleMergeCriteria.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleMergeVirtual.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RulePlaceAccess.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RulePlanJoins.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RulePlanProcedures.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RulePlanUnions.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RulePushAggregates.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RulePushLimit.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RulePushNonJoinCriteria.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RulePushSelectCriteria.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleRaiseAccess.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleRaiseNull.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleRemoveOptionalJoins.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleRemoveSorts.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RuleValidateWhereAll.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/ContextRep= lacerVisitor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/CriteriaPl= anner.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/HandleNill= ableVisitor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/MarkExclud= eVisitor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/NameInSour= ceResolverVisitor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/QueryUtil.= java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/ReferenceB= indingReplacerVisitor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/SourceNode= GenaratorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/SourceNode= PlannerVisitor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/TagBuilder= Visitor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/ValidateMa= ppedCriteriaVisitor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/XMLNodeMap= pingVisitor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/XMLPlanToP= rocessVisitor.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/XMLPlanner= .java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/XMLPlanner= Environment.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/XMLQueryPl= anner.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xml/XMLStagain= gQueryPlanner.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/xquery/XQueryP= lanner.java trunk/engine/src/main/java/com/metamatrix/query/parser/ParseInfo.java trunk/engine/src/main/java/com/metamatrix/query/parser/QueryParser.java trunk/engine/src/main/java/com/metamatrix/query/parser/SQLParserUtil.java trunk/engine/src/main/java/com/metamatrix/query/processor/BaseProcessorP= lan.java trunk/engine/src/main/java/com/metamatrix/query/processor/Describable.ja= va trunk/engine/src/main/java/com/metamatrix/query/processor/DescribableUti= l.java trunk/engine/src/main/java/com/metamatrix/query/processor/NullTupleSourc= e.java trunk/engine/src/main/java/com/metamatrix/query/processor/ProcessorDataM= anager.java trunk/engine/src/main/java/com/metamatrix/query/processor/ProcessorPlan.= java trunk/engine/src/main/java/com/metamatrix/query/processor/QueryProcessor= .java trunk/engine/src/main/java/com/metamatrix/query/processor/TempTableDataM= anager.java trunk/engine/src/main/java/com/metamatrix/query/processor/batch/BatchedU= pdatePlan.java trunk/engine/src/main/java/com/metamatrix/query/processor/batch/Prepared= BatchUpdatePlan.java trunk/engine/src/main/java/com/metamatrix/query/processor/dynamic/SQLSou= rce.java trunk/engine/src/main/java/com/metamatrix/query/processor/dynamic/SqlEva= l.java trunk/engine/src/main/java/com/metamatrix/query/processor/dynamic/TupleI= nputSource.java trunk/engine/src/main/java/com/metamatrix/query/processor/dynamic/TupleX= MLReader.java trunk/engine/src/main/java/com/metamatrix/query/processor/dynamic/XMLSou= rce.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/AbstractA= ssignmentInstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/Assignmen= tInstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/BreakInst= ruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/CommandIn= struction.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/ContinueI= nstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/CreateCur= sorResultSetInstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/ErrorInst= ruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/ExecDynam= icSqlInstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/ExecSqlIn= struction.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/IfInstruc= tion.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/LoopInstr= uction.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/Procedure= Environment.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/Procedure= Plan.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/RepeatedI= nstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/UpdateCou= ntTupleSource.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/WhileInst= ruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/program/Progra= m.java trunk/engine/src/main/java/com/metamatrix/query/processor/program/Progra= mEnvironment.java trunk/engine/src/main/java/com/metamatrix/query/processor/program/Progra= mInstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/program/Progra= mUtil.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Acc= essNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Bat= chCollector.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Bat= chIterator.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Bat= chedCommandsEvaluator.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Bat= chedUpdateNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dep= endentAccessNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dep= endentCriteriaProcessor.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dep= endentProcedureAccessNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dep= endentProcedureCriteriaProcessor.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dep= endentProcedureExecutionNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dep= endentProjectNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dep= endentSelectNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dep= endentSourceState.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dep= endentValueSource.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dup= RemoveNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dup= licateFilter.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Gro= upingNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Ind= exedTupleSourceIterator.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Joi= nNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Joi= nStrategy.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Lim= itNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Lis= tNestedSortComparator.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Mer= geJoinStrategy.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Nes= tedLoopJoinStrategy.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Nul= lNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Pla= nExecutionNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Pro= jectIntoNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Pro= jectNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Rel= ationalNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Rel= ationalNodeStatistics.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Rel= ationalNodeUtil.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Rel= ationalPlan.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Sel= ectNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Sor= tNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Sor= tUtility.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Sou= rceState.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Sub= queryProcessorUtility.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Tup= leSourceIterator.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Tup= leSourceValueIterator.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Uni= onAllNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/AbortProce= ssingInstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/AddComment= Instruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/AddNodeIns= truction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/BlockInstr= uction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/Condition.= java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/CriteriaCo= ndition.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/DefaultCon= dition.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/DocumentIn= Progress.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/Element.ja= va trunk/engine/src/main/java/com/metamatrix/query/processor/xml/EndBlockIn= struction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/EndDocumen= tInstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/ExecSqlIns= truction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/ExecStagin= gTableInstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/IfInstruct= ion.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/Initialize= DocumentInstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/JoinedWhil= eInstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/MoveCursor= Instruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/MoveDocIns= truction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/NodeDescri= ptor.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/PlanExecut= or.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/ProcessorI= nstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/Program.ja= va trunk/engine/src/main/java/com/metamatrix/query/processor/xml/ProgramUti= l.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/RecursePro= gramCondition.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/Relational= PlanExecutor.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/SAXDocumen= tInProgress.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/WhileInstr= uction.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLContext= .java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLPlan.ja= va trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLProcess= orEnvironment.java trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLUtil.ja= va trunk/engine/src/main/java/com/metamatrix/query/processor/xml/XMLValueTr= anslator.java trunk/engine/src/main/java/com/metamatrix/query/processor/xquery/XQueryP= lan.java trunk/engine/src/main/java/com/metamatrix/query/report/ActivityReport.ja= va trunk/engine/src/main/java/com/metamatrix/query/report/ReportItem.java trunk/engine/src/main/java/com/metamatrix/query/resolver/CommandResolver= .java trunk/engine/src/main/java/com/metamatrix/query/resolver/ProcedureContai= nerResolver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/QueryResolver.j= ava trunk/engine/src/main/java/com/metamatrix/query/resolver/VariableResolve= r.java trunk/engine/src/main/java/com/metamatrix/query/resolver/command/Batched= UpdateResolver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/command/DeleteR= esolver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/command/Dynamic= CommandResolver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/command/ExecRes= olver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/command/InsertR= esolver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/command/SetQuer= yResolver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/command/SimpleQ= ueryResolver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/command/TempTab= leResolver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/command/UpdateP= rocedureResolver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/command/UpdateR= esolver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/command/XMLQuer= yResolver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/command/XQueryR= esolver.java trunk/engine/src/main/java/com/metamatrix/query/resolver/util/AccessPatt= ern.java trunk/engine/src/main/java/com/metamatrix/query/resolver/util/BindVariab= leVisitor.java trunk/engine/src/main/java/com/metamatrix/query/resolver/util/ResolveVir= tualGroupCriteriaVisitor.java trunk/engine/src/main/java/com/metamatrix/query/resolver/util/ResolverUt= il.java trunk/engine/src/main/java/com/metamatrix/query/resolver/util/ResolverVi= sitor.java trunk/engine/src/main/java/com/metamatrix/query/resolver/util/ResolverVi= sitorUtil.java trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.j= ava trunk/engine/src/main/java/com/metamatrix/query/rewriter/VariableSubstit= utionVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/LanguageObject.java trunk/engine/src/main/java/com/metamatrix/query/sql/LanguageVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/ProcedureReservedWor= ds.java trunk/engine/src/main/java/com/metamatrix/query/sql/ReservedWords.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/AbstractCompare= Criteria.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/AbstractSetCrit= eria.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/AtomicCriteria.= java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/BatchedUpdateCo= mmand.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/BetweenCriteria= .java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/BulkInsert.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/CollectionValue= Iterator.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Command.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/CommandContaine= r.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/CompareCriteria= .java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/CompoundCriteri= a.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Create.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Criteria.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Delete.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/DependentSetCri= teria.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Drop.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/DynamicCommand.= java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/ExistsCriteria.= java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/From.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/FromClause.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/GroupBy.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/GroupContext.ja= va trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Insert.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Into.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/IsNullCriteria.= java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/JoinPredicate.j= ava trunk/engine/src/main/java/com/metamatrix/query/sql/lang/JoinType.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Limit.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/LogicalCriteria= .java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/MatchCriteria.j= ava trunk/engine/src/main/java/com/metamatrix/query/sql/lang/NotCriteria.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Option.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/OrderBy.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/PredicateCriter= ia.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/PreparedBatchUp= date.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/ProcedureContai= ner.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Query.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/QueryCommand.ja= va trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SPParameter.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Select.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SetClause.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SetClauseList.j= ava trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SetCriteria.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SetQuery.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/StoredProcedure= .java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SubqueryCompare= Criteria.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SubqueryContain= er.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SubqueryFromCla= use.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/SubquerySetCrit= eria.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/UnaryFromClause= .java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Update.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/XQuery.java trunk/engine/src/main/java/com/metamatrix/query/sql/navigator/AbstractNa= vigator.java trunk/engine/src/main/java/com/metamatrix/query/sql/navigator/DeepPostOr= derNavigator.java trunk/engine/src/main/java/com/metamatrix/query/sql/navigator/DeepPreOrd= erNavigator.java trunk/engine/src/main/java/com/metamatrix/query/sql/navigator/PostOrderN= avigator.java trunk/engine/src/main/java/com/metamatrix/query/sql/navigator/PreOrPostO= rderNavigator.java trunk/engine/src/main/java/com/metamatrix/query/sql/navigator/PreOrderNa= vigator.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/AssignmentState= ment.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/Block.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/BreakStatement.= java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/CommandStatemen= t.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/ContinueStateme= nt.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/CreateUpdatePro= cedureCommand.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/CriteriaSelecto= r.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/DeclareStatemen= t.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/HasCriteria.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/IfStatement.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/LoopStatement.j= ava trunk/engine/src/main/java/com/metamatrix/query/sql/proc/RaiseErrorState= ment.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/Statement.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/TranslateCriter= ia.java trunk/engine/src/main/java/com/metamatrix/query/sql/proc/WhileStatement.= java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/AbstractCaseE= xpression.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/AggregateSymb= ol.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/AliasSymbol.j= ava trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/AllInGroupSym= bol.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/AllSymbol.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/CaseExpressio= n.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Constant.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/ElementSymbol= .java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Expression.ja= va trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/ExpressionSym= bol.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Function.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/GroupSymbol.j= ava trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/MultipleEleme= ntSymbol.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Reference.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/ScalarSubquer= y.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/SearchedCaseE= xpression.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/SelectSymbol.= java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/SingleElement= Symbol.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Symbol.java trunk/engine/src/main/java/com/metamatrix/query/sql/util/ElementSymbolOp= timizer.java trunk/engine/src/main/java/com/metamatrix/query/sql/util/SymbolMap.java trunk/engine/src/main/java/com/metamatrix/query/sql/util/UpdateProcedure= Generator.java trunk/engine/src/main/java/com/metamatrix/query/sql/util/ValueIterator.j= ava trunk/engine/src/main/java/com/metamatrix/query/sql/util/ValueIteratorPr= ovider.java trunk/engine/src/main/java/com/metamatrix/query/sql/util/ValueIteratorSo= urce.java trunk/engine/src/main/java/com/metamatrix/query/sql/util/VariableContext= .java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/AbstractSymb= olMappingVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/AggregateSym= bolCollectorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/CommandColle= ctorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/CorrelatedRe= ferenceCollectorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/CorrelatedVa= riableSubstitutionVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/CriteriaTran= slatorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/DependentSet= CriteriaCollectorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/ElementColle= ctorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/EvaluatableV= isitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/EvaluateExpr= essionVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/ExpressionMa= ppingVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/ExpressionSy= mbolCollector.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/FunctionColl= ectorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/GroupCollect= orVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/GroupsUsedBy= ElementsVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/NeedsEvaluat= ionVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/PredicateCol= lectorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/ReferenceCol= lectorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/SQLStringVis= itor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/StaticSymbol= MappingVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/ValueIterato= rProviderCollectorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/VariableColl= ectorVisitor.java trunk/engine/src/main/java/com/metamatrix/query/tempdata/TempTableStore.= java trunk/engine/src/main/java/com/metamatrix/query/tempdata/TempTableStoreI= mpl.java trunk/engine/src/main/java/com/metamatrix/query/util/CommandContext.java trunk/engine/src/main/java/com/metamatrix/query/util/ContextProperties.j= ava trunk/engine/src/main/java/com/metamatrix/query/util/ErrorMessageKeys.ja= va trunk/engine/src/main/java/com/metamatrix/query/util/LogConstants.java trunk/engine/src/main/java/com/metamatrix/query/util/TypeRetrievalUtil.j= ava trunk/engine/src/main/java/com/metamatrix/query/util/XMLFormatConstants.= java trunk/engine/src/main/java/com/metamatrix/query/validator/AbstractValida= tionVisitor.java trunk/engine/src/main/java/com/metamatrix/query/validator/AggregateValid= ationVisitor.java trunk/engine/src/main/java/com/metamatrix/query/validator/UpdateValidati= onVisitor.java trunk/engine/src/main/java/com/metamatrix/query/validator/ValidateCriter= iaVisitor.java trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisi= tor.java trunk/engine/src/main/java/com/metamatrix/query/validator/Validator.java trunk/engine/src/main/java/com/metamatrix/query/validator/ValidatorFailu= re.java trunk/engine/src/main/java/com/metamatrix/query/validator/ValidatorRepor= t.java trunk/engine/src/main/java/com/metamatrix/query/validator/ValueValidatio= nVisitor.java trunk/engine/src/main/java/com/metamatrix/query/xquery/XQueryExpression.= java trunk/engine/src/main/java/com/metamatrix/query/xquery/XQuerySQLEvaluato= r.java trunk/engine/src/main/java/com/metamatrix/query/xquery/saxon/DocFunction= URIResolver.java trunk/engine/src/main/java/com/metamatrix/query/xquery/saxon/SaxonXMLTra= nslator.java trunk/engine/src/main/java/com/metamatrix/query/xquery/saxon/SaxonXQuery= Expression.java trunk/engine/src/main/resources/com/metamatrix/dqp/i18n.properties trunk/engine/src/main/resources/com/metamatrix/query/execution/i18n.prop= erties trunk/engine/src/main/resources/com/metamatrix/query/i18n.properties trunk/engine/src/test/java/com/metamatrix/cache/FakeCache.java trunk/engine/src/test/java/com/metamatrix/common/buffer/TestTupleBatch.j= ava trunk/engine/src/test/java/com/metamatrix/common/buffer/TestTupleSourceI= D.java trunk/engine/src/test/java/com/metamatrix/common/buffer/impl/TestBatchMa= p.java trunk/engine/src/test/java/com/metamatrix/common/buffer/impl/TestBufferM= anagerImpl.java trunk/engine/src/test/java/com/metamatrix/common/buffer/impl/TestSizeUti= lity.java trunk/engine/src/test/java/com/metamatrix/common/buffer/storage/file/Tes= tFileStorageManager.java trunk/engine/src/test/java/com/metamatrix/common/buffer/storage/memory/T= estMemoryStorageManager.java trunk/engine/src/test/java/com/metamatrix/dqp/config/TestDQPLauncher.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/cache/TestCacheID= .java trunk/engine/src/test/java/com/metamatrix/dqp/internal/cache/TestCursorR= eceiverWindowBuffer.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/cache/TestResultS= etCache.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fake= Connector.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fake= ExecutionContextImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fake= ProcedureExecution.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fake= TransactionService.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Test= ConnectorManagerImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Test= ConnectorStateManager.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Test= ConnectorWorkItem.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Test= ExecutionContextImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Test= TypeFacilityImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestAggregateImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestBatchedUpdatesImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestBulkInsertImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestCaseExpressionImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestCompareCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestCompoundCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestDeleteImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestElementImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestExistsCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestFromImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestFunctionImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestGroupByImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestGroupImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestInCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestInlineViewImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestInsertImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestIsNullCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestJoinImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestLikeCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestLiteralImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestNotCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestOrderByImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestParameterImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestProcedureImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestQueryImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestScalarSubqueryImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestSearchedCaseExpressionImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestSelectImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestSelectSymbolImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestSetQueryImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestSubqueryCompareCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestSubqueryInCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestUpdateImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TstLanguageBridgeFactory.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/metadata/= TestMetadataFactory.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /FakeSourceConnectionFactory.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /FakeUserIdentityConnectionFactory.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /TestConnectionPool.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /TestConnectionWrapper.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/MockSingl= eMetadataService.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestCalla= bleStatement.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestCodeT= ableCache.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestDQPCo= re.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestDQPCo= reRequestHandling.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestDQPWo= rkContext.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestDataT= ierManager.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestMetaD= ataProcessor.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestPrepa= redPlanCache.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestPrepa= redStatement.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestReque= st.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestReque= stWorkItem.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestWorkI= temState.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/capabilit= ies/TestConnectorCapabilitiesFinder.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/multisour= ce/TestMultiSourceCapabilitiesFinder.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/multisour= ce/TestMultiSourceElementReplacementVisitor.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/multisour= ce/TestMultiSourceMetadataWrapper.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/multisour= ce/TestMultiSourcePlanToProcessConverter.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/validator= /TestAuthorizationValidationVisitor.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/validator= /TestModelVisibilityValidationVisitor.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/transaction/TestT= ransactionContextImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/transaction/TestT= ransactionServer.java trunk/engine/src/test/java/com/metamatrix/dqp/message/TestAtomicRequestM= essage.java trunk/engine/src/test/java/com/metamatrix/dqp/message/TestRequestID.java trunk/engine/src/test/java/com/metamatrix/dqp/message/TestRequestMessage= .java trunk/engine/src/test/java/com/metamatrix/dqp/message/TestResultsMessage= .java trunk/engine/src/test/java/com/metamatrix/dqp/service/AutoGenDataService= .java trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeAbstractServic= e.java trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeAuthorizationS= ervice.java trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeBufferService.= java trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeMetadataServic= e.java trunk/engine/src/test/java/com/metamatrix/dqp/service/FakeVDBService.java trunk/engine/src/test/java/com/metamatrix/dqp/service/TestCustomizableTr= ackingService.java trunk/engine/src/test/java/com/metamatrix/dqp/spi/basic/TestFileCommandL= ogger.java trunk/engine/src/test/java/com/metamatrix/query/analysis/TestAnalysisRec= ord.java trunk/engine/src/test/java/com/metamatrix/query/function/TestFunction.ja= va trunk/engine/src/test/java/com/metamatrix/query/function/TestFunctionDes= criptorImpl.java trunk/engine/src/test/java/com/metamatrix/query/function/TestFunctionLib= rary.java trunk/engine/src/test/java/com/metamatrix/query/function/TestFunctionMet= adataReader.java trunk/engine/src/test/java/com/metamatrix/query/function/TestFunctionTre= e.java trunk/engine/src/test/java/com/metamatrix/query/function/TestResolvedFun= ctions.java trunk/engine/src/test/java/com/metamatrix/query/function/metadata/TestFu= nctionMetadataValidator.java trunk/engine/src/test/java/com/metamatrix/query/function/metadata/TestFu= nctionMethod.java trunk/engine/src/test/java/com/metamatrix/query/function/metadata/TestSy= stemSource.java trunk/engine/src/test/java/com/metamatrix/query/function/source/TestXMLS= ystemFunctions.java trunk/engine/src/test/java/com/metamatrix/query/mapping/xml/TestMappingA= ttribute.java trunk/engine/src/test/java/com/metamatrix/query/mapping/xml/TestMappingC= hoiceNode.java trunk/engine/src/test/java/com/metamatrix/query/mapping/xml/TestMappingD= ocument.java trunk/engine/src/test/java/com/metamatrix/query/mapping/xml/TestMappingE= lement.java trunk/engine/src/test/java/com/metamatrix/query/mapping/xml/TestMappingL= oader.java trunk/engine/src/test/java/com/metamatrix/query/mapping/xml/TestMappingO= utputter.java trunk/engine/src/test/java/com/metamatrix/query/mapping/xml/TestMappingR= ecursiveElement.java trunk/engine/src/test/java/com/metamatrix/query/mapping/xml/TestNamespac= e.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/FakeFunctionMe= tadataSource.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/InlineViewCase= .java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestAccessPatt= erns.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestAggregateP= ushdown.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestAnsiJoinPu= shdown.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestDependentJ= oins.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestExpression= sInGroupBy.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestInlineView= .java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoinOptimi= zation.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestLimit.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer.= java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptionalJo= ins.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestRuleMergeV= irtual.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestRuleRaiseN= ull.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestRuleRemove= Sorts.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestStoredProc= edurePlanning.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestUnionPlann= ing.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/batch/TestBatc= hedUpdatePlanner.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/capabilities/A= llCapabilities.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/capabilities/F= akeCapabilitiesFinder.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/capabilities/T= estBasicSourceCapabilities.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/capabilities/T= estDefaultCapabilitiesFinder.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/proc/TestProce= durePlanner.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/Tes= tAliasGenerator.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/Tes= tRuleStack.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/pla= ntree/TestNodeEditor.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestCalculateCostUtil.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestCapabilitiesUtil.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestCriteriaCapabilityValidatorVisitor.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestFrameUtil.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestGroupRecontext.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestJoinRegion.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestRuleAccessPatternValidation.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestRuleAssignOutputElements.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestRuleChooseDependent.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestRulePlaceAccess.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestRulePushSelectCriteria.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestRuleValidateWhereAll.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/xml/FakeXMLMet= adata.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/xml/TestContex= tReplacerVisitor.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/xml/TestHandle= NillableNode.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/xml/TestMarkEx= cludeVisitor.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/xml/TestNameIn= SourceResolverVisitor.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/xml/TestRemove= ExcludedVisitor.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/xml/TestXMLNod= eMappingVisitor.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/xml/TestXMLPla= nner.java trunk/engine/src/test/java/com/metamatrix/query/parser/TestCallableState= mentParsing.java trunk/engine/src/test/java/com/metamatrix/query/parser/TestOptionsAndHin= ts.java trunk/engine/src/test/java/com/metamatrix/query/parser/TestParseCommandT= ype.java trunk/engine/src/test/java/com/metamatrix/query/parser/TestParser.java trunk/engine/src/test/java/com/metamatrix/query/parser/TestParserXQuery.= java trunk/engine/src/test/java/com/metamatrix/query/parser/TestSetQueryParsi= ng.java trunk/engine/src/test/java/com/metamatrix/query/processor/FakeDataManage= r.java trunk/engine/src/test/java/com/metamatrix/query/processor/FakeDataStore.= java trunk/engine/src/test/java/com/metamatrix/query/processor/FakeProcessorP= lan.java trunk/engine/src/test/java/com/metamatrix/query/processor/FakeTupleSourc= e.java trunk/engine/src/test/java/com/metamatrix/query/processor/HardcodedDataM= anager.java trunk/engine/src/test/java/com/metamatrix/query/processor/TestBaseProces= sorPlan.java trunk/engine/src/test/java/com/metamatrix/query/processor/TestDependentJ= oins.java trunk/engine/src/test/java/com/metamatrix/query/processor/TestNullTupleS= ource.java trunk/engine/src/test/java/com/metamatrix/query/processor/TestOptionalJo= ins.java trunk/engine/src/test/java/com/metamatrix/query/processor/TestProcedureR= elational.java trunk/engine/src/test/java/com/metamatrix/query/processor/TestProcessor.= java trunk/engine/src/test/java/com/metamatrix/query/processor/TestQueryProce= ssor.java trunk/engine/src/test/java/com/metamatrix/query/processor/TestSecurityFu= nctions.java trunk/engine/src/test/java/com/metamatrix/query/processor/TestSetProcess= ing.java trunk/engine/src/test/java/com/metamatrix/query/processor/TestVirtualDep= Join.java trunk/engine/src/test/java/com/metamatrix/query/processor/batch/TestBatc= hedUpdatePlan.java trunk/engine/src/test/java/com/metamatrix/query/processor/dynamic/Simple= QueryProcessorFactory.java trunk/engine/src/test/java/com/metamatrix/query/processor/dynamic/TestSq= lEval.java trunk/engine/src/test/java/com/metamatrix/query/processor/eval/TestCrite= riaEvaluator.java trunk/engine/src/test/java/com/metamatrix/query/processor/eval/TestExpre= ssionEvaluator.java trunk/engine/src/test/java/com/metamatrix/query/processor/proc/TestProce= dureProcessor.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Blo= ckingFakeRelationalNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Fak= eRelationalNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Nod= eTestUtil.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tAccessNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tBatchedUpdateNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tDependentSelectNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tDuplicateFilter.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tGroupingNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tJoinNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tJoinNodeWithProcessorBatchSize1.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tJoinNodeWithProcessorBatchSize10.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tJoinNodeWithProcessorBatchSizeSameAsTupleCount.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tLimitNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tProjectIntoNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tProjectNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tRelationalNodeStatistics.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tRelationalPlan.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tSelectNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tSortNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tUnionAllNode.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/FakePlanEx= ecutor.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/FakeXMLPro= cessorEnvironment.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/NoOpInstru= ction.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/TestAddNod= eInstruction.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/TestElemen= t.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/TestInstru= ctions.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/TestProces= sorEnvironment.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/TestSAXDoc= umentInProgress.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/TestSource= NodeGenaratorVisitor.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/TestXMLCon= text.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/TestXMLPla= nningEnhancements.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/TestXMLPro= cessor.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/TestXMLVal= ueTranslator.java trunk/engine/src/test/java/com/metamatrix/query/processor/xml/XMLProgram= Util.java trunk/engine/src/test/java/com/metamatrix/query/processor/xquery/TestXQu= eryProcessor.java trunk/engine/src/test/java/com/metamatrix/query/resolver/CheckNoTempMeta= dataIDsVisitor.java trunk/engine/src/test/java/com/metamatrix/query/resolver/CheckSymbolsAre= ResolvedVisitor.java trunk/engine/src/test/java/com/metamatrix/query/resolver/TestAccessPatte= rn.java trunk/engine/src/test/java/com/metamatrix/query/resolver/TestResolver.ja= va trunk/engine/src/test/java/com/metamatrix/query/resolver/TestXMLResolver= .java trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestOrderByRewr= ite.java trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewrit= er.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestAliasSymbol= .java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestBatchedUpda= teCommand.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestBetweenCrit= eria.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestBulkInsert.= java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestCompoundCri= teria.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestCreate.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestCriteria.ja= va trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestDependentSe= tCriteria.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestDrop.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestDynamicComm= and.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestExpressionS= ymbol.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestIsNullCrite= ria.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestLimit.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestMatchCriter= ia.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestOption.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestQuery.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestSelect.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestSetCriteria= .java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestSetQuery.ja= va trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestSubqueryFro= mClause.java trunk/engine/src/test/java/com/metamatrix/query/sql/lang/TestSubquerySet= Criteria.java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestAssignmentS= tatement.java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestBlock.java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestBreakStatem= ent.java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestCommandStat= ement.java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestContinueSta= tement.java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestCreateUpdat= eProcedureCommand.java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestCriteriaSel= ector.java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestDeclareStat= ement.java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestHasCriteria= .java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestIfStatement= .java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestLoopStateme= nt.java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestRaiseErrorS= tatement.java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestTranslateCr= iteria.java trunk/engine/src/test/java/com/metamatrix/query/sql/proc/TestWhileStatem= ent.java trunk/engine/src/test/java/com/metamatrix/query/sql/symbol/TestAggregate= Symbol.java trunk/engine/src/test/java/com/metamatrix/query/sql/symbol/TestCaseExpre= ssion.java trunk/engine/src/test/java/com/metamatrix/query/sql/symbol/TestConstant.= java trunk/engine/src/test/java/com/metamatrix/query/sql/symbol/TestElementSy= mbol.java trunk/engine/src/test/java/com/metamatrix/query/sql/symbol/TestFunction.= java trunk/engine/src/test/java/com/metamatrix/query/sql/symbol/TestGroupSymb= ol.java trunk/engine/src/test/java/com/metamatrix/query/sql/symbol/TestSearchedC= aseExpression.java trunk/engine/src/test/java/com/metamatrix/query/sql/util/TestElementSymb= olOptimizer.java trunk/engine/src/test/java/com/metamatrix/query/sql/util/TestUpdateProce= dureGenerator.java trunk/engine/src/test/java/com/metamatrix/query/sql/visitor/TestAggregat= eSymbolCollectorVisitor.java trunk/engine/src/test/java/com/metamatrix/query/sql/visitor/TestDeepGrou= pCollectorVisitor.java trunk/engine/src/test/java/com/metamatrix/query/sql/visitor/TestEvaluati= on.java trunk/engine/src/test/java/com/metamatrix/query/sql/visitor/TestExpressi= onMappingVisitor.java trunk/engine/src/test/java/com/metamatrix/query/sql/visitor/TestGroupCol= lectorVisitor.java trunk/engine/src/test/java/com/metamatrix/query/sql/visitor/TestSQLStrin= gVisitor.java trunk/engine/src/test/java/com/metamatrix/query/sql/visitor/TestStaticSy= mbolMappingVisitor.java trunk/engine/src/test/java/com/metamatrix/query/unittest/FakeMetadataFac= ade.java trunk/engine/src/test/java/com/metamatrix/query/unittest/FakeMetadataFac= tory.java trunk/engine/src/test/java/com/metamatrix/query/unittest/FakeMetadataObj= ect.java trunk/engine/src/test/java/com/metamatrix/query/unittest/FakeMetadataSto= re.java trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataIn= terfaceBuilder.java trunk/engine/src/test/java/com/metamatrix/query/unittest/TimestampUtil.j= ava trunk/engine/src/test/java/com/metamatrix/query/validator/TestCriteriaVa= lidator.java trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator.= java trunk/engine/src/test/java/com/metamatrix/query/xquery/HardcodedSqlEval.= java trunk/engine/src/test/java/com/metamatrix/query/xquery/TestXQueryEngine.= java trunk/engine/src/test/resources/LicenseMappingExample.xml trunk/engine/src/test/resources/com/metamatrix/query/mapping/xml/License= MappingExample.xml trunk/engine/src/test/resources/com/metamatrix/query/mapping/xml/PartsMa= ppingExample.xml trunk/engine/src/test/resources/com/metamatrix/query/mapping/xml/testExa= mple.xml trunk/engine/src/test/resources/testExample.xml trunk/metadata/src/main/java/com/metamatrix/connector/metadata/IndexFile= .java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/MetadataC= onnectorConstants.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/MultiObje= ctSource.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/PropertyF= ileObjectSource.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/PropertyH= older.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/ResultsIt= erator.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/RuntimeVd= bRecord.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/index/Ind= exCriteriaBuilder.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/index/Met= adataConnectorMetadata.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/index/Met= adataInCriteria.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/index/Met= adataLiteralCriteria.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/index/Met= adataResultsPostProcessor.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/index/Met= adataSearchCriteria.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/index/Vdb= MetadataContext.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/internal/= IObjectQuery.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/internal/= IObjectSource.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/internal/= MetadataException.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/internal/= ObjectQueryProcessor.java trunk/metadata/src/main/java/com/metamatrix/connector/metadata/internal/= ReflectionWrapper.java trunk/metadata/src/main/java/com/metamatrix/dqp/service/metadata/IndexMe= tadataService.java trunk/metadata/src/main/java/com/metamatrix/dqp/service/metadata/IndexSe= lectorSource.java trunk/metadata/src/main/java/com/metamatrix/dqp/service/metadata/QueryMe= tadataCache.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/RuntimeMeta= dataPlugin.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/VDBMetadata= Factory.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/DataTyp= e.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/DataTyp= eID.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Element= .java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Element= ID.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Group.j= ava trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/GroupID= .java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Key.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/KeyID.j= ava trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Metadat= aConstants.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Metadat= aSourceAPI.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Model.j= ava trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/ModelID= .java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Procedu= re.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Procedu= reID.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Procedu= reParameter.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Runtime= MetadataPropertyNames.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Virtual= DatabaseFactory.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Virtual= DatabaseLoaderProperties.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/api/Virtual= DatabaseMetadata.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/exception/I= nvalidStateException.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/exception/V= irtualDatabaseDoesNotExistException.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Abstra= ctMetadataRecord.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Annota= tionRecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Column= RecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Column= SetRecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Dataty= peRecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/FileRe= cordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Foreig= nKeyRecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/ListEn= tryRecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Metada= taRecordDelegate.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/ModelR= ecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Proced= ureParameterRecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Proced= ureRecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Proper= tyRecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Proper= tyValueRecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Record= Factory.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/TableR= ecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Transf= ormationRecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/Unique= KeyRecordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/impl/VdbRec= ordImpl.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= DataTypeID.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= Element.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= ElementID.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= Group.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= GroupID.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= Key.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= KeyID.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= MetadataID.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= MetadataObject.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= Model.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= ModelID.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= Procedure.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= ProcedureID.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= ProcedureParameter.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= VirtualDatabase.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= VirtualDatabaseID.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= VirtualDatabaseLoaderProperties.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/Basic= VirtualDatabaseMetadata.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/model/MetaM= odelConstants.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/util/LogRun= timeMetadataConstants.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/util/Runtim= eIDParser.java trunk/metadata/src/main/java/com/metamatrix/metadata/runtime/util/Runtim= eMetadataIDContext.java trunk/metadata/src/main/java/com/metamatrix/metadata/util/ErrorMessageKe= ys.java trunk/metadata/src/main/java/com/metamatrix/metadata/util/LogMessageKeys= .java trunk/metadata/src/main/java/com/metamatrix/modeler/core/container/EObje= ctFinder.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/index/IndexCons= tants.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/index/IndexSele= ctor.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/AnnotationRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/ColumnRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/ColumnSetRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/DatatypeRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/FileRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/ForeignKeyRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/ListEntryRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/MetadataConstants.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/MetadataRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/ModelRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/ProcedureParameterRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/ProcedureRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/PropertyRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/PropertyValueRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/TableRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/TransformationRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/UniqueKeyRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/metadata/runtim= e/VdbRecord.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/types/DatatypeC= onstants.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/types/Enterpris= eDatatypeInfo.java trunk/metadata/src/main/java/com/metamatrix/modeler/core/util/ColumnReco= rdComparator.java trunk/metadata/src/main/java/com/metamatrix/modeler/internal/core/index/= AbstractIndexSelector.java trunk/metadata/src/main/java/com/metamatrix/modeler/internal/core/index/= CompositeIndexSelector.java trunk/metadata/src/main/java/com/metamatrix/modeler/internal/core/index/= RuntimeIndexSelector.java trunk/metadata/src/main/java/com/metamatrix/modeler/internal/core/index/= SimpleIndexUtil.java trunk/metadata/src/main/java/com/metamatrix/modeler/internal/core/worksp= ace/ModelFileUtil.java trunk/metadata/src/main/java/com/metamatrix/modeler/internal/transformat= ion/util/UuidUtil.java trunk/metadata/src/main/java/com/metamatrix/modeler/transformation/metad= ata/QueryMetadataContext.java trunk/metadata/src/main/java/com/metamatrix/modeler/transformation/metad= ata/ServerMetadataFactory.java trunk/metadata/src/main/java/com/metamatrix/modeler/transformation/metad= ata/ServerRuntimeMetadata.java trunk/metadata/src/main/java/com/metamatrix/modeler/transformation/metad= ata/TransformationMetadata.java trunk/metadata/src/main/java/com/metamatrix/modeler/transformation/metad= ata/TransformationMetadataFacade.java trunk/metadata/src/main/resources/com/metamatrix/connector/metadata/enum= /DatatypeTypeEnumeration.properties trunk/metadata/src/main/resources/com/metamatrix/connector/metadata/enum= /DatatypeVarietyEnumeration.properties trunk/metadata/src/main/resources/com/metamatrix/connector/metadata/enum= /KeyTypeEnumeration.properties trunk/metadata/src/main/resources/com/metamatrix/connector/metadata/enum= /ModelTypeEnumeration.properties trunk/metadata/src/main/resources/com/metamatrix/connector/metadata/enum= /NullTypeEnumeration.properties trunk/metadata/src/main/resources/com/metamatrix/connector/metadata/enum= /ProcParamDirectionEnumeration.properties trunk/metadata/src/main/resources/com/metamatrix/connector/metadata/enum= /ProcTypeEnumeration.properties trunk/metadata/src/main/resources/com/metamatrix/connector/metadata/enum= /RecordTypeEnumeration.properties trunk/metadata/src/main/resources/com/metamatrix/connector/metadata/enum= /SearchTypeEnumeration.properties trunk/metadata/src/main/resources/com/metamatrix/connector/metadata/enum= /TableTypeEnumeration.properties trunk/metadata/src/main/resources/com/metamatrix/metadata/runtime/i18n.p= roperties trunk/metadata/src/test/java/com/metamatrix/connector/metadata/TestPrope= rtyFileObjectSource.java trunk/metadata/src/test/java/com/metamatrix/connector/metadata/index/Fak= eVDBService.java trunk/metadata/src/test/java/com/metamatrix/connector/metadata/index/Tes= tIndexCriteriaBuilder.java trunk/metadata/src/test/java/com/metamatrix/connector/metadata/index/Tes= tMetadataConnectorMetadata.java trunk/metadata/src/test/java/com/metamatrix/connector/metadata/index/Tes= tMetadataResultsPostProcessor.java trunk/metadata/src/test/java/com/metamatrix/core/util/TestCharOperation.= java trunk/metadata/src/test/java/com/metamatrix/dqp/service/metadata/TestInd= exMetadataService.java trunk/metadata/src/test/java/com/metamatrix/internal/core/index/TestGamm= aCompressedIndexBlock.java trunk/metadata/src/test/java/com/metamatrix/metadata/runtime/FakeMetadat= aService.java trunk/metadata/src/test/java/com/metamatrix/metadata/runtime/FakeQueryMe= tadata.java trunk/metadata/src/test/java/com/metamatrix/metadata/runtime/model/TestM= odelClasses.java trunk/metadata/src/test/resources/fakeFiles/fake0.properties trunk/metadata/src/test/resources/fakeFiles/fake1.properties trunk/metadata/src/test/resources/fakeFiles/fake2.properties trunk/server-installer/src/main/java/com/metamatrix/platform/config/util= /CurrentConfigHelper.java trunk/server/src/main/java/com/metamatrix/admin/server/AbstractAdminImpl= .java trunk/server/src/main/java/com/metamatrix/admin/server/AdminServerPlugin= .java trunk/server/src/main/java/com/metamatrix/admin/server/ServerAdminImpl.j= ava trunk/server/src/main/java/com/metamatrix/admin/server/ServerConfigAdmin= Impl.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringA= dminImpl.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerRuntimeStat= eAdminImpl.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerSecurityAdm= inImpl.java trunk/server/src/main/java/com/metamatrix/admin/util/AdminMethodRoleReso= lver.java trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/So= cketVMController.java trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/se= rver/AdminAuthorizationInterceptor.java trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/se= rver/ClientInstance.java trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/se= rver/LogonImpl.java trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/se= rver/ServerWorkItem.java trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/se= rver/SocketClientInstance.java trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/se= rver/SocketListener.java trunk/server/src/main/java/com/metamatrix/common/config/JDBCConnectionPo= olHelper.java trunk/server/src/main/java/com/metamatrix/common/connection/BaseTransact= ion.java trunk/server/src/main/java/com/metamatrix/common/connection/ManagedConne= ction.java trunk/server/src/main/java/com/metamatrix/common/connection/ManagedConne= ctionException.java trunk/server/src/main/java/com/metamatrix/common/connection/SimpleManage= dConnection.java trunk/server/src/main/java/com/metamatrix/common/connection/TransactionF= actory.java trunk/server/src/main/java/com/metamatrix/common/connection/TransactionI= nterface.java trunk/server/src/main/java/com/metamatrix/common/connection/TransactionM= gr.java trunk/server/src/main/java/com/metamatrix/common/connection/jdbc/JDBCMgd= ResourceConnection.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/Extensi= onModuleEvent.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/Extensi= onModuleManager.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/Extensi= onModulePropertyNames.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/Extensi= onModuleTypes.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/FileExt= ensionModuleFactory.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/protoco= l/URLFactory.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/protoco= l/extensionjar/ExtensionJarURLConnection.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/protoco= l/extensionjar/Handler.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/spi/Ext= ensionModuleTransaction.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/spi/jdb= c/FileCache.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/spi/jdb= c/JDBCExtensionDescriptor.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/spi/jdb= c/JDBCExtensionModuleReader.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/spi/jdb= c/JDBCExtensionModuleTransaction.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/spi/jdb= c/JDBCExtensionModuleTransactionFactory.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/spi/jdb= c/JDBCExtensionModuleTranslator.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/spi/jdb= c/JDBCExtensionModuleUtil.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/spi/jdb= c/JDBCExtensionModuleWriter.java trunk/server/src/main/java/com/metamatrix/common/extensionmodule/spi/jdb= c/JDBCNames.java trunk/server/src/main/java/com/metamatrix/common/id/dbid/DBIDController.= java trunk/server/src/main/java/com/metamatrix/common/id/dbid/DBIDGenerator.j= ava trunk/server/src/main/java/com/metamatrix/common/id/dbid/DBIDGeneratorEx= ception.java trunk/server/src/main/java/com/metamatrix/common/id/dbid/ReservedIDBlock= .java trunk/server/src/main/java/com/metamatrix/common/id/dbid/spi/DBIDSourceT= ransaction.java trunk/server/src/main/java/com/metamatrix/common/id/dbid/spi/InMemoryIDC= ontroller.java trunk/server/src/main/java/com/metamatrix/common/id/dbid/spi/jdbc/DBIDRe= sourceTransaction.java trunk/server/src/main/java/com/metamatrix/common/id/dbid/spi/jdbc/DBIDRe= sourceTransactionFactory.java trunk/server/src/main/java/com/metamatrix/common/id/dbid/spi/jdbc/JDBCNa= mes.java trunk/server/src/main/java/com/metamatrix/common/id/dbid/spi/jdbc/Persis= tentIDController.java trunk/server/src/main/java/com/metamatrix/common/jdbc/JDBCPlatform.java trunk/server/src/main/java/com/metamatrix/common/jdbc/JDBCPlatformFactor= y.java trunk/server/src/main/java/com/metamatrix/common/jdbc/JDBCReservedWords.= java trunk/server/src/main/java/com/metamatrix/common/jdbc/JDBCURL.java trunk/server/src/main/java/com/metamatrix/common/jdbc/db/DB2Platform.java trunk/server/src/main/java/com/metamatrix/common/jdbc/db/DerbyPlatform.j= ava trunk/server/src/main/java/com/metamatrix/common/jdbc/db/InformixPlatfor= m.java trunk/server/src/main/java/com/metamatrix/common/jdbc/db/MMOraclePlatfor= m.java trunk/server/src/main/java/com/metamatrix/common/jdbc/db/MMOracleSecureP= latform.java trunk/server/src/main/java/com/metamatrix/common/jdbc/db/MSSQLPlatform.j= ava trunk/server/src/main/java/com/metamatrix/common/jdbc/db/MetaMatrixPlatf= orm.java trunk/server/src/main/java/com/metamatrix/common/jdbc/db/MySQLPlatform.j= ava trunk/server/src/main/java/com/metamatrix/common/jdbc/db/OraclePlatform.= java trunk/server/src/main/java/com/metamatrix/common/jdbc/db/PostgresPlatfor= m.java trunk/server/src/main/java/com/metamatrix/common/jdbc/db/SybasePlatform.= java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/Catalog.j= ava trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/Column.ja= va trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/ColumnSet= .java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/ColumnTyp= e.java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/ForeignKe= y.java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/Index.java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/IndexColu= mn.java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/IndexType= .java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/JDBCNames= pace.java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/JDBCObjec= t.java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/Nullabili= ty.java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/Procedure= .java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/Procedure= Column.java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/Procedure= ColumnType.java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/Procedure= Type.java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/Schema.ja= va trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/Table.java trunk/server/src/main/java/com/metamatrix/common/jdbc/metadata/UniqueKey= .java trunk/server/src/main/java/com/metamatrix/common/jdbc/syntax/ExpressionO= perator.java trunk/server/src/main/java/com/metamatrix/common/jdbc/syntax/FieldType.j= ava trunk/server/src/main/java/com/metamatrix/common/log/DbLogListener.java trunk/server/src/main/java/com/metamatrix/common/log/DbLogWriter.java trunk/server/src/main/java/com/metamatrix/common/log/DbWriterException.j= ava trunk/server/src/main/java/com/metamatrix/common/log/I18nLogManager.java trunk/server/src/main/java/com/metamatrix/common/log/reader/DBLogReader.= java trunk/server/src/main/java/com/metamatrix/common/messaging/MessageBus.ja= va trunk/server/src/main/java/com/metamatrix/common/messaging/MessageBusCon= stants.java trunk/server/src/main/java/com/metamatrix/common/messaging/MessagingExce= ption.java trunk/server/src/main/java/com/metamatrix/common/messaging/NoOpMessageBu= s.java trunk/server/src/main/java/com/metamatrix/common/messaging/RemoteMessagi= ngException.java trunk/server/src/main/java/com/metamatrix/common/messaging/VMMessageBus.= java trunk/server/src/main/java/com/metamatrix/common/messaging/jgroups/JGrou= psMessageBus.java trunk/server/src/main/java/com/metamatrix/common/messaging/jgroups/RPCSt= ruct.java trunk/server/src/main/java/com/metamatrix/common/messaging/jgroups/Remot= eProxy.java trunk/server/src/main/java/com/metamatrix/common/net/ServerSocketConfigu= ration.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/AbstractVDBDe= leteUtility.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/RuntimeMetada= taCatalog.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/RuntimeVDBDel= eteUtility.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/StartupVDBDel= eteUtility.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/VDBTreeUtilit= y.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/event/Runtime= MetadataEvent.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/event/Runtime= MetadataListener.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/model/Metadat= aCache.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/model/UpdateC= ontroller.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/spi/MetaBaseC= onnector.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/spi/RuntimeBa= seConnector.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/spi/jdbc/JDBC= Connector.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/spi/jdbc/JDBC= ConnectorFactory.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/spi/jdbc/JDBC= Names.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/spi/jdbc/JDBC= RuntimeMetadataReader.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/spi/jdbc/JDBC= RuntimeMetadataWriter.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/spi/jdbc/JDBC= Translator.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/vdb/defn/VDBC= reation.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/vdb/defn/VDBD= efnFactory.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/vdb/defn/VDBD= efnImport.java trunk/server/src/main/java/com/metamatrix/platform/PlatformPlugin.java trunk/server/src/main/java/com/metamatrix/platform/admin/api/runtime/Sys= temStateBuilder.java trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/AdminAP= IHelper.java trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/AdminHe= lper.java trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/Authori= zationAdminAPIImpl.java trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/Configu= rationAdminAPIImpl.java trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/Extensi= onSourceAdminAPIImpl.java trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/IAdminH= elper.java trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/Members= hipAdminAPIImpl.java trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/Runtime= StateAdminAPIHelper.java trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/Runtime= StateAdminAPIImpl.java trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/Session= AdminAPIImpl.java trunk/server/src/main/java/com/metamatrix/platform/admin/apiimpl/SubSyst= emAdminAPIImpl.java trunk/server/src/main/java/com/metamatrix/platform/config/ConfigMessages= .java trunk/server/src/main/java/com/metamatrix/platform/config/ConfigPlugin.j= ava trunk/server/src/main/java/com/metamatrix/platform/config/ConfigurationC= hangeListener.java trunk/server/src/main/java/com/metamatrix/platform/config/api/service/Co= nfigurationServiceInterface.java trunk/server/src/main/java/com/metamatrix/platform/config/api/service/Co= nfigurationServicePropertyNames.java trunk/server/src/main/java/com/metamatrix/platform/config/event/Configur= ationChangeEvent.java trunk/server/src/main/java/com/metamatrix/platform/config/persistence/ap= i/PersistentConnection.java trunk/server/src/main/java/com/metamatrix/platform/config/persistence/ap= i/PersistentConnectionFactory.java trunk/server/src/main/java/com/metamatrix/platform/config/persistence/im= pl/file/FilePersistentConnection.java trunk/server/src/main/java/com/metamatrix/platform/config/persistence/im= pl/file/FilePersistentConnectionFactory.java trunk/server/src/main/java/com/metamatrix/platform/config/persistence/im= pl/file/FilePersistentUtil.java trunk/server/src/main/java/com/metamatrix/platform/config/persistence/im= pl/jdbc/JDBCPersistentConnection.java trunk/server/src/main/java/com/metamatrix/platform/config/persistence/im= pl/jdbc/JDBCPersistentConnectionFactory.java trunk/server/src/main/java/com/metamatrix/platform/config/persistence/im= pl/jdbc/SQL_Translator.java trunk/server/src/main/java/com/metamatrix/platform/config/service/Action= History.java trunk/server/src/main/java/com/metamatrix/platform/config/service/Config= urationServiceConstants.java trunk/server/src/main/java/com/metamatrix/platform/config/service/Config= urationServiceImpl.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/Configurat= ionTransaction.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/SystemConf= igurationNames.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/Config= Transaction.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/Config= TransactionException.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/Config= UserTransaction.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/Config= UserTransactionFactory.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLAct= ionUpdateStrategy.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCon= figurationConnector.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCon= figurationConnectorFactory.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCon= figurationMgr.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCon= figurationReader.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCon= figurationTransaction.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCon= figurationWriter.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCur= rentConfigurationReader.java trunk/server/src/main/java/com/metamatrix/platform/registry/ClusteredReg= istryState.java trunk/server/src/main/java/com/metamatrix/platform/registry/RegistryList= ener.java trunk/server/src/main/java/com/metamatrix/platform/registry/RegistryProp= ertyNames.java trunk/server/src/main/java/com/metamatrix/platform/registry/ResourceAlre= adyBoundException.java trunk/server/src/main/java/com/metamatrix/platform/registry/ResourceNotB= oundException.java trunk/server/src/main/java/com/metamatrix/platform/registry/ServiceRegis= tryBinding.java trunk/server/src/main/java/com/metamatrix/platform/registry/VMMonitor.ja= va trunk/server/src/main/java/com/metamatrix/platform/registry/VMRegistryBi= nding.java trunk/server/src/main/java/com/metamatrix/platform/security/api/UserEnti= tlementInfo.java trunk/server/src/main/java/com/metamatrix/platform/security/api/service/= AuthorizationServiceInterface.java trunk/server/src/main/java/com/metamatrix/platform/security/api/service/= AuthorizationServicePropertyNames.java trunk/server/src/main/java/com/metamatrix/platform/security/api/service/= MembershipServiceInterface.java trunk/server/src/main/java/com/metamatrix/platform/security/api/service/= SessionServiceInterface.java trunk/server/src/main/java/com/metamatrix/platform/security/api/service/= SessionTerminationHandler.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/AuditC= onfiguration.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/AuditL= evel.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/AuditM= anager.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/AuditM= essage.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/Securi= tyAuditContexts.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/config= /AuditConfigurationException.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/config= /AuditConfigurationFactory.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/config= /BasicAuditConfiguration.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/config= /CurrentConfigAuditConfigurationFactory.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/config= /UnmodifiableAuditConfiguration.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/destin= ation/AbstractAuditDestination.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/destin= ation/AuditDestination.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/destin= ation/AuditDestinationInitFailedException.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/destin= ation/ConsoleAuditDestination.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/destin= ation/DatabaseAuditDestination.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/destin= ation/SingleFileAuditDestination.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/format= /AuditMessageFormat.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/format= /DelimitedAuditMessageFormat.java trunk/server/src/main/java/com/metamatrix/platform/security/audit/format= /ReadableAuditMessageFormat.java trunk/server/src/main/java/com/metamatrix/platform/security/authorizatio= n/cache/AuthorizationCache.java trunk/server/src/main/java/com/metamatrix/platform/security/authorizatio= n/service/AuthorizationServiceImpl.java trunk/server/src/main/java/com/metamatrix/platform/security/authorizatio= n/spi/AuthorizationSourceConnectionException.java trunk/server/src/main/java/com/metamatrix/platform/security/authorizatio= n/spi/AuthorizationSourceException.java trunk/server/src/main/java/com/metamatrix/platform/security/authorizatio= n/spi/AuthorizationSourceTransaction.java trunk/server/src/main/java/com/metamatrix/platform/security/authorizatio= n/spi/jdbc/JDBCAuthorizationReader.java trunk/server/src/main/java/com/metamatrix/platform/security/authorizatio= n/spi/jdbc/JDBCAuthorizationTransaction.java trunk/server/src/main/java/com/metamatrix/platform/security/authorizatio= n/spi/jdbc/JDBCAuthorizationTransactionFactory.java trunk/server/src/main/java/com/metamatrix/platform/security/authorizatio= n/spi/jdbc/JDBCNames.java trunk/server/src/main/java/com/metamatrix/platform/security/membership/s= ervice/AuthenticationToken.java trunk/server/src/main/java/com/metamatrix/platform/security/membership/s= ervice/FailedAuthenticationToken.java trunk/server/src/main/java/com/metamatrix/platform/security/membership/s= ervice/MembershipServiceImpl.java trunk/server/src/main/java/com/metamatrix/platform/security/membership/s= ervice/SuccessfulAuthenticationToken.java trunk/server/src/main/java/com/metamatrix/platform/security/membership/s= pi/MembershipDomain.java trunk/server/src/main/java/com/metamatrix/platform/security/membership/s= pi/MembershipSourceException.java trunk/server/src/main/java/com/metamatrix/platform/security/membership/s= pi/file/FileMembershipDomain.java trunk/server/src/main/java/com/metamatrix/platform/security/membership/s= pi/ldap/LDAPMembershipDomain.java trunk/server/src/main/java/com/metamatrix/platform/security/session/serv= ice/SessionServiceImpl.java trunk/server/src/main/java/com/metamatrix/platform/service/ServiceMessag= es.java trunk/server/src/main/java/com/metamatrix/platform/service/ServicePlugin= .java trunk/server/src/main/java/com/metamatrix/platform/service/api/CacheAdmi= n.java trunk/server/src/main/java/com/metamatrix/platform/service/api/ServiceIn= terface.java trunk/server/src/main/java/com/metamatrix/platform/service/api/event/Ser= viceEvent.java trunk/server/src/main/java/com/metamatrix/platform/service/api/exception= /ServiceClosedException.java trunk/server/src/main/java/com/metamatrix/platform/service/api/exception= /ServiceException.java trunk/server/src/main/java/com/metamatrix/platform/service/api/exception= /ServiceNotFoundException.java trunk/server/src/main/java/com/metamatrix/platform/service/api/exception= /ServiceNotInitializedException.java trunk/server/src/main/java/com/metamatrix/platform/service/api/exception= /ServiceStateException.java trunk/server/src/main/java/com/metamatrix/platform/service/api/exception= /ServiceSuspendedException.java trunk/server/src/main/java/com/metamatrix/platform/service/controller/Ab= stractService.java trunk/server/src/main/java/com/metamatrix/platform/service/controller/Se= rvicePropertyNames.java trunk/server/src/main/java/com/metamatrix/platform/service/proxy/Multipl= eInvokationProxy.java trunk/server/src/main/java/com/metamatrix/platform/service/proxy/ProxyMa= nager.java trunk/server/src/main/java/com/metamatrix/platform/service/proxy/RandomS= electionPolicy.java trunk/server/src/main/java/com/metamatrix/platform/service/proxy/RoundRo= binSelectionPolicy.java trunk/server/src/main/java/com/metamatrix/platform/service/proxy/Service= Proxy.java trunk/server/src/main/java/com/metamatrix/platform/service/proxy/Service= ProxyProperties.java trunk/server/src/main/java/com/metamatrix/platform/service/proxy/Service= SelectionPolicy.java trunk/server/src/main/java/com/metamatrix/platform/service/proxy/Service= SelectionPolicyKey.java trunk/server/src/main/java/com/metamatrix/platform/service/proxy/SingleI= nvokationProxy.java trunk/server/src/main/java/com/metamatrix/platform/util/ErrorMessageKeys= .java trunk/server/src/main/java/com/metamatrix/platform/util/LogMessageKeys.j= ava trunk/server/src/main/java/com/metamatrix/platform/util/LogPlatformConst= ants.java trunk/server/src/main/java/com/metamatrix/platform/util/PlatformProxyHel= per.java trunk/server/src/main/java/com/metamatrix/platform/vm/api/controller/VMC= ontrollerInterface.java trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ServerE= vents.java trunk/server/src/main/java/com/metamatrix/platform/vm/controller/VMContr= oller.java trunk/server/src/main/java/com/metamatrix/platform/vm/util/VMUtils.java trunk/server/src/main/java/com/metamatrix/server/CacheProvider.java trunk/server/src/main/java/com/metamatrix/server/ChannelProvider.java trunk/server/src/main/java/com/metamatrix/server/Configuration.java trunk/server/src/main/java/com/metamatrix/server/HostController.java trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceModu= le.java trunk/server/src/main/java/com/metamatrix/server/HostManagement.java trunk/server/src/main/java/com/metamatrix/server/HostManagementProvider.= java trunk/server/src/main/java/com/metamatrix/server/JGroupsProvider.java trunk/server/src/main/java/com/metamatrix/server/LogApplicationInfo.java trunk/server/src/main/java/com/metamatrix/server/Main.java trunk/server/src/main/java/com/metamatrix/server/ResourceFinder.java trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java trunk/server/src/main/java/com/metamatrix/server/ServerPlugin.java trunk/server/src/main/java/com/metamatrix/server/ServiceManager.java trunk/server/src/main/java/com/metamatrix/server/ServiceManagerGuiceModu= le.java trunk/server/src/main/java/com/metamatrix/server/admin/api/ServerAdminLo= gConstants.java trunk/server/src/main/java/com/metamatrix/server/admin/apiimpl/QueryAdmi= nAPIImpl.java trunk/server/src/main/java/com/metamatrix/server/admin/apiimpl/RuntimeMe= tadataAdminAPIImpl.java trunk/server/src/main/java/com/metamatrix/server/admin/apiimpl/RuntimeMe= tadataHelper.java trunk/server/src/main/java/com/metamatrix/server/admin/apiimpl/Transacti= onAdminAPIImpl.java trunk/server/src/main/java/com/metamatrix/server/connector/service/Clien= tServiceRegistryService.java trunk/server/src/main/java/com/metamatrix/server/connector/service/Conne= ctorService.java trunk/server/src/main/java/com/metamatrix/server/connector/service/Conne= ctorServiceInterface.java trunk/server/src/main/java/com/metamatrix/server/connector/service/Conne= ctorServicePropertyNames.java trunk/server/src/main/java/com/metamatrix/server/dqp/config/PlatformConf= igSource.java trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformAut= horizationService.java trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformBuf= ferService.java trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDat= aService.java trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformTra= nsactionService.java trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformVDB= Service.java trunk/server/src/main/java/com/metamatrix/server/dqp/service/RemoteResul= tsReceiver.java trunk/server/src/main/java/com/metamatrix/server/dqp/service/tracker/Dat= abaseCommandLogger.java trunk/server/src/main/java/com/metamatrix/server/dqp/service/tracker/Tra= nsactionLogMessage.java trunk/server/src/main/java/com/metamatrix/server/dqp/service/tracker/Tra= nsactionLogWriter.java trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServ= ice.java trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServ= iceInterface.java trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServ= icePropertyNames.java trunk/server/src/main/java/com/metamatrix/server/util/DataServerSessionT= erminationHandler.java trunk/server/src/main/java/com/metamatrix/server/util/ErrorMessageKeys.j= ava trunk/server/src/main/java/com/metamatrix/server/util/LogConstants.java trunk/server/src/main/java/com/metamatrix/server/util/LogMessageKeys.java trunk/server/src/main/java/com/metamatrix/server/util/SecurityRoles.java trunk/server/src/main/java/com/metamatrix/server/util/ServerAuditContext= s.java trunk/server/src/main/java/com/metamatrix/server/util/ServerPropertyName= s.java trunk/server/src/main/resources/com/metamatrix/admin/server/i18n.propert= ies trunk/server/src/main/resources/com/metamatrix/admin/util/methodroles.pr= operties trunk/server/src/main/resources/com/metamatrix/platform/config/i18n.prop= erties trunk/server/src/main/resources/com/metamatrix/platform/i18n.properties trunk/server/src/main/resources/com/metamatrix/platform/service/i18n.pro= perties trunk/server/src/main/resources/com/metamatrix/server/i18n.properties trunk/server/src/test/java/com/metamatrix/admin/server/FakeCacheAdmin.ja= va trunk/server/src/test/java/com/metamatrix/admin/server/FakeConfiguration= .java trunk/server/src/test/java/com/metamatrix/admin/server/FakeConfiguration= Service.java trunk/server/src/test/java/com/metamatrix/admin/server/FakeExtensionModu= leManager.java trunk/server/src/test/java/com/metamatrix/admin/server/FakeQueryService.= java trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeMetada= taCatalog.java trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeStateA= dminAPIHelper.java trunk/server/src/test/java/com/metamatrix/admin/server/FakeServerAdminIm= pl.java trunk/server/src/test/java/com/metamatrix/admin/server/FakeServerConfigA= dminImpl.java trunk/server/src/test/java/com/metamatrix/admin/server/FakeServerSession= Service.java trunk/server/src/test/java/com/metamatrix/admin/server/IdentifierConstan= ts.java trunk/server/src/test/java/com/metamatrix/admin/server/TestAbstractAdmin= Impl.java trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigA= dminImpl.java trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonitor= ingAdminImpl.java trunk/server/src/test/java/com/metamatrix/admin/server/TestServerRuntime= StateAdminImpl.java trunk/server/src/test/java/com/metamatrix/admin/util/TestAdminMethodRole= Resolver.java trunk/server/src/test/java/com/metamatrix/common/comm/platform/FakeAdmin= Helper.java trunk/server/src/test/java/com/metamatrix/common/comm/platform/server/Te= stAdminAuthInterceptor.java trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/se= rver/TestSocketRemoting.java trunk/server/src/test/java/com/metamatrix/common/connection/SimpleJDBCMa= nagedConnection.java trunk/server/src/test/java/com/metamatrix/common/extensionmodule/Extensi= onModuleDescriptorUtils.java trunk/server/src/test/java/com/metamatrix/common/extensionmodule/FakeDat= a.java trunk/server/src/test/java/com/metamatrix/common/extensionmodule/TestExt= ensionModuleManager.java trunk/server/src/test/java/com/metamatrix/common/extensionmodule/spi/InM= emoryExtensionModuleTransaction.java trunk/server/src/test/java/com/metamatrix/common/extensionmodule/spi/InM= emoryExtensionModuleTransactionFactory.java trunk/server/src/test/java/com/metamatrix/common/extensionmodule/spi/jdb= c/TestFileCache.java trunk/server/src/test/java/com/metamatrix/common/jdbc/TestJDBCURL.java trunk/server/src/test/java/com/metamatrix/metadata/runtime/model/TestMet= adataCache.java trunk/server/src/test/java/com/metamatrix/platform/config/BaseTest.java trunk/server/src/test/java/com/metamatrix/platform/config/CurrentConfigH= elper.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/Helper= TestConfiguration.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCo= nfigTransactions.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCu= rrentConfiguration.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCu= rrentConfigurationShutdown.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestIn= itialConfigurationRead.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestXM= LConfigImportExport.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestXM= LConfigReader.java trunk/server/src/test/java/com/metamatrix/platform/registry/FakeRegistry= Util.java trunk/server/src/test/java/com/metamatrix/platform/registry/TestClustere= dRegistryState.java trunk/server/src/test/java/com/metamatrix/platform/registry/TestServiceR= egistryBinding.java trunk/server/src/test/java/com/metamatrix/platform/security/api/TestAuth= orizationCache.java trunk/server/src/test/java/com/metamatrix/platform/security/api/TestAuth= orizationObjectEditor.java trunk/server/src/test/java/com/metamatrix/platform/security/api/TestAuth= orizationPolicyFactory.java trunk/server/src/test/java/com/metamatrix/platform/security/api/TestAuth= orizationPolicyID.java trunk/server/src/test/java/com/metamatrix/platform/security/api/TestAuth= orizationRealm.java trunk/server/src/test/java/com/metamatrix/platform/security/api/TestBasi= cAuthorizationPermission.java trunk/server/src/test/java/com/metamatrix/platform/security/api/TestStan= dardAuthorizationActions.java trunk/server/src/test/java/com/metamatrix/platform/security/authorizatio= n/service/TestAuthorizationServiceImpl.java trunk/server/src/test/java/com/metamatrix/platform/security/authorizatio= n/spi/AuthorizationTestUtil.java trunk/server/src/test/java/com/metamatrix/platform/security/authorizatio= n/spi/FakeAuthorizationSource.java trunk/server/src/test/java/com/metamatrix/platform/security/authorizatio= n/spi/TestFakeAuthorizationSource.java trunk/server/src/test/java/com/metamatrix/platform/security/membership/s= ervice/TestMembershipServiceImpl.java trunk/server/src/test/java/com/metamatrix/platform/security/membership/s= pi/file/TestFileMembershipDomain.java trunk/server/src/test/java/com/metamatrix/platform/security/membership/s= pi/ldap/TestLDAPMembershipDomainConfiguration.java trunk/server/src/test/java/com/metamatrix/platform/service/controller/Fa= keService.java trunk/server/src/test/java/com/metamatrix/platform/service/controller/Fa= keServiceInterface.java trunk/server/src/test/java/com/metamatrix/platform/service/proxy/TestPro= xies.java trunk/server/src/test/java/com/metamatrix/server/admin/apiimpl/FakeModel= Info.java trunk/server/src/test/java/com/metamatrix/server/admin/apiimpl/TestRunti= meMetadataHelper.java trunk/server/src/test/resources/com/metamatrix/platform/security/members= hip/spi/file/groups.properties trunk/server/src/test/resources/com/metamatrix/platform/security/members= hip/spi/file/users.properties trunk/server/src/test/resources/config/config.xml trunk/server/src/test/resources/config/config30_ns.xml trunk/server/src/test/resources/config/config42_ns.xml trunk/server/src/test/resources/config/config_format.xml trunk/server/src/test/resources/config/config_wconnector.xml trunk/server/src/test/resources/config/config_wgateaconnector.xml trunk/server/src/test/resources/config/config_woresources.xml trunk/server/src/test/resources/config/configjdbc.properties trunk/server/src/test/resources/groups.properties trunk/server/src/test/resources/materializedView/expected/MySQL_1_Connec= tion.properties trunk/server/src/test/resources/materializedView/expected/PartsSupplier_= 3_Connection.properties trunk/server/src/test/resources/materializedView/expected/RiggaMaRoll_33= _Connection.properties trunk/server/src/test/resources/materializedView/expected/TestConnPropsV= DB_1_Connection.properties trunk/server/src/test/resources/materializedView/expected/TestSSLConnPro= psVDB_1_Connection.properties trunk/server/src/test/resources/metamatrix.properties trunk/server/src/test/resources/users.properties trunk/soap/src/main/java/com/metamatrix/dqp/client/impl/ServerRequest.ja= va trunk/soap/src/main/java/com/metamatrix/soap/SOAPPlugin.java trunk/soap/src/main/java/com/metamatrix/soap/exceptions/SOAPProcessingEx= ception.java trunk/soap/src/main/java/com/metamatrix/soap/handler/ActionUpdateHandler= .java trunk/soap/src/main/java/com/metamatrix/soap/handler/PWCBHandler.java trunk/soap/src/main/java/com/metamatrix/soap/log/MMSOAPLog.java trunk/soap/src/main/java/com/metamatrix/soap/object/MMServerInfo.java trunk/soap/src/main/java/com/metamatrix/soap/object/WSDLUrl.java trunk/soap/src/main/java/com/metamatrix/soap/security/Credential.java trunk/soap/src/main/java/com/metamatrix/soap/service/BasicConnectionPool= Factory.java trunk/soap/src/main/java/com/metamatrix/soap/service/ConnectionPoolFacto= ry.java trunk/soap/src/main/java/com/metamatrix/soap/service/ConnectionSource.ja= va trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceInfo.java trunk/soap/src/main/java/com/metamatrix/soap/service/DataServiceWebServi= ceImpl.java trunk/soap/src/main/java/com/metamatrix/soap/service/PoolingConnectionSo= urce.java trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMDiscoverWSDLServl= et.java trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceLog= .java trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourcePla= tformLog.java trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceSer= vlet.java trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetWSDLServlet.ja= va trunk/soap/src/main/java/com/metamatrix/soap/servlet/WSDLURLGenerator.ja= va trunk/soap/src/main/java/com/metamatrix/soap/servlet/filter/BasicAuthInt= erceptor.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/handler/= PWCBHandler.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/C= ell.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/C= olumnMetadata.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/C= onnection.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/C= onnectionContextualRequest.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/C= onnectionlessRequest.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/C= ursorType.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/D= ata.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/L= ogInParameters.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/P= roperty.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/R= equestId.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/R= equestInfo.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/R= equestType.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/R= esults.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/R= esultsRequest.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/R= ow.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/S= qlQueryWebServiceFault.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/S= qlWarning.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/helper/T= ransactionAutoWrapType.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/log/LogU= til.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/service/= SqlQueryWebService.java trunk/soap/src/main/java/com/metamatrix/soap/sqlquerywebservice/service/= SqlQueryWebServiceFault.java trunk/soap/src/main/java/com/metamatrix/soap/util/EndpointUriTranslatorS= trategyImpl.java trunk/soap/src/main/java/com/metamatrix/soap/util/EndpointUrlConstants.j= ava trunk/soap/src/main/java/com/metamatrix/soap/util/ErrorMessageKeys.java trunk/soap/src/main/java/com/metamatrix/soap/util/SOAPConstants.java trunk/soap/src/main/java/com/metamatrix/soap/util/ServletClientConstants= .java trunk/soap/src/main/java/com/metamatrix/soap/util/WebServiceUtil.java trunk/soap/src/main/java/com/metamatrix/soap/util/XMLTranslationExceptio= n.java trunk/soap/src/main/java/com/metamatrix/soap/util/XMLTranslator.java trunk/soap/src/main/resources/com/metamatrix/soap/i18n.properties trunk/soap/src/test/java/com/metamatrix/soap/handler/TestActionUpdateHan= dler.java trunk/soap/src/test/java/com/metamatrix/soap/service/TestBasicConnection= PoolFactory.java trunk/soap/src/test/java/com/metamatrix/soap/service/TestDataServiceWebS= erviceImpl.java trunk/soap/src/test/java/com/metamatrix/soap/service/TestPoolingConnecti= onSource.java trunk/soap/src/test/java/com/metamatrix/soap/servlet/TestMMGetVDBResourc= eServlet.java trunk/soap/src/test/java/com/metamatrix/soap/servlet/TestMMGetWSDLServle= t.java trunk/soap/src/test/java/com/metamatrix/soap/sqlquerywebservice/TestSqlQ= ueryWebService.java trunk/soap/src/test/java/com/metamatrix/soap/util/TestEndpointUrlTransla= torStrategyImpl.java trunk/soap/src/test/java/com/metamatrix/soap/util/TestWebServiceUtil.java trunk/test-integration/src/test/java/com/metamatrix/cdk/TestConnectorShe= ll.java trunk/test-integration/src/test/java/com/metamatrix/cdk/TestLoopbackConn= ector.java trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestConnecto= rResultUtility.java trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslat= ionUtility.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exten= sion/TestSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracl= e/TestOracleSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/= TestJDBCExecutionHelper.java trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLa= nguageUtil.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestElement.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestGroup.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestMetadataID.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestParams.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestProcedure.java trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/Te= stCollectorVisitor.java trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/Te= stSQLStringVisitor.java trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestCase3473.ja= va trunk/test-integration/src/test/java/com/metamatrix/jdbc/TestMMDatabaseM= etaData.java trunk/test-integration/src/test/java/com/metamatrix/server/integration/B= aseQueryTest.java trunk/test-integration/src/test/java/com/metamatrix/server/integration/T= estTPCR.java trunk/test-integration/src/test/java/com/metamatrix/server/integration/T= estXMLTypeTranslations.java trunk/test-integration/src/test/java/com/metamatrix/server/integration/T= estXQueryServices.java trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestPart= sDatabaseMetadata.java trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestResu= ltSetMetadata.java trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestSyst= emPhysicalModel.java trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestSyst= emPhysicalModelSelf.java trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestSyst= emVirtualModel.java trunk/test-integration/src/test/java/com/metamatrix/systemmodel/TestVirt= ualDocWithVirtualProc.java trunk/test-integration/src/test/resources/3473/3473.properties trunk/test-integration/src/test/resources/ServerConfig.xml trunk/test-integration/src/test/resources/bqt/bqt.properties trunk/test-integration/src/test/resources/connector.properties trunk/test-integration/src/test/resources/dqp/ServerConfig.xml trunk/test-integration/src/test/resources/dqp/dqp.properties trunk/test-integration/src/test/resources/metadata/dqp.properties trunk/test-integration/src/test/resources/partssupplier/dqp.properties trunk/test-integration/src/test/resources/xml-vp/xmlvp.properties trunk/txn-jbossts/src/main/java/com/arjuna/ats/arjuna/coordinator/TwoPha= seCoordinator.java trunk/txn-jbossts/src/main/java/com/arjuna/ats/internal/jta/transaction/= arjunacore/subordinate/jca/TransactionImple.java trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/ArjunaTransacti= onProvider.java trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/XAArjunaPlugin.= java trunk/txn-jbossts/src/main/java/com/metamatrix/xa/arjuna/XAConnectorReco= very.java trunk/txn-jbossts/src/main/resources/com/metamatrix/xa/arjuna/i18n.prope= rties trunk/txn-jbossts/src/main/resources/jbossjts-properties.xml trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXAConnectio= n.java trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXAResource.= java trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/RecoveryCallbac= k.java trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaRecov= ery.java trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestXAConnector= Recovery.java trunk/txn-jbossts/src/test/resources/com/metamatrix/xa/arjuna/jbossjta-p= roperties.xml Log: TEIID-349 updating headers Modified: trunk/adminshell/src/main/java/com/metamatrix/script/junit/BshTes= tCase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/adminshell/src/main/java/com/metamatrix/script/junit/BshTestCase.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/adminshell/src/main/java/com/metamatrix/script/junit/BshTestCase.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/adminshell/src/main/java/com/metamatrix/script/junit/BshTes= tSuite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/adminshell/src/main/java/com/metamatrix/script/junit/BshTestSuite= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/adminshell/src/main/java/com/metamatrix/script/junit/BshTestSuite= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/adminshell/src/main/java/com/metamatrix/script/shell/Custom= Parser.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/adminshell/src/main/java/com/metamatrix/script/shell/CustomParser= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/adminshell/src/main/java/com/metamatrix/script/shell/CustomParser= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/adminshell/src/main/java/com/metamatrix/script/shell/FilePr= intStream.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/adminshell/src/main/java/com/metamatrix/script/shell/FilePrintStr= eam.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/adminshell/src/main/java/com/metamatrix/script/shell/FilePrintStr= eam.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/adminshell/src/main/java/com/metamatrix/script/shell/JConso= le.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/adminshell/src/main/java/com/metamatrix/script/shell/JConsole.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/adminshell/src/main/java/com/metamatrix/script/shell/JConsole.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/adminshell/src/main/java/com/metamatrix/script/shell/MMAdmi= n.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/adminshell/src/main/java/com/metamatrix/script/shell/MMAdmin.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/adminshell/src/main/java/com/metamatrix/script/shell/MMAdmin.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/adminshell/src/main/java/com/metamatrix/script/shell/Reader= Interceptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/adminshell/src/main/java/com/metamatrix/script/shell/ReaderInterc= eptor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/adminshell/src/main/java/com/metamatrix/script/shell/ReaderInterc= eptor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/adminshell/src/main/java/com/metamatrix/script/shell/Simple= Parser.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/adminshell/src/main/java/com/metamatrix/script/shell/SimpleParser= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/adminshell/src/main/java/com/metamatrix/script/shell/SimpleParser= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/build/kit-embedded/examples/portfolio/java/JDBCClient.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/kit-embedded/examples/portfolio/java/JDBCClient.java 2009-0= 2-12 20:51:18 UTC (rev 464) +++ trunk/build/kit-embedded/examples/portfolio/java/JDBCClient.java 2009-0= 2-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/build/kit-server/config/install/setup_server.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/kit-server/config/install/setup_server.xml 2009-02-12 20:51= :18 UTC (rev 464) +++ trunk/build/kit-server/config/install/setup_server.xml 2009-02-12 21:40= :56 UTC (rev 465) @@ -1,8 +1,27 @@ - + Modified: trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/J= BossCache.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCa= che.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCa= che.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/J= BossCacheFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCa= cheFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCa= cheFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/J= BossCacheListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCa= cheListener.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCa= cheListener.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/AdminPlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/AdminPlugin.java 2009-0= 2-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/AdminPlugin.java 2009-0= 2-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/core/Admin.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/core/Admin.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/core/Admin.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreConf= igAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreConfigAdmi= n.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreConfigAdmi= n.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreMoni= toringAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreMonitoring= Admin.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreMonitoring= Admin.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreRunt= imeStateAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreRuntimeSta= teAdmin.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreRuntimeSta= teAdmin.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreSecu= rityAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreSecurityAd= min.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/core/CoreSecurityAd= min.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/embedded/Embe= ddedAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedAd= min.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedAd= min.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/embedded/Embe= ddedConfigAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedCo= nfigAdmin.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedCo= nfigAdmin.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/embedded/Embe= ddedLogger.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedLo= gger.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedLo= gger.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/embedded/Embe= ddedMonitoringAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedMo= nitoringAdmin.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedMo= nitoringAdmin.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/embedded/Embe= ddedRuntimeStateAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedRu= ntimeStateAdmin.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedRu= ntimeStateAdmin.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/embedded/Embe= ddedSecurityAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedSe= curityAdmin.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/embedded/EmbeddedSe= curityAdmin.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/exception/Adm= inComponentException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminComp= onentException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminComp= onentException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/exception/Adm= inException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminExce= ption.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminExce= ption.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/exception/Adm= inProcessingException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminProc= essingException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/exception/AdminProc= essingException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/exception/sec= urity/InvalidSessionException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/exception/security/= InvalidSessionException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/exception/security/= InvalidSessionException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/exception/sec= urity/MetaMatrixSecurityException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/exception/security/= MetaMatrixSecurityException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/exception/security/= MetaMatrixSecurityException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/exception/sec= urity/SessionException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/exception/security/= SessionException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/exception/security/= SessionException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Admin= Object.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/AdminObject= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/AdminObject= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Admin= Options.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/AdminOption= s.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/AdminOption= s.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Admin= Status.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/AdminStatus= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/AdminStatus= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Cache= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Cache.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Cache.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Conne= ctorBinding.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/ConnectorBi= nding.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/ConnectorBi= nding.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Conne= ctorType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/ConnectorTy= pe.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/ConnectorTy= pe.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/DQP.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/DQP.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/DQP.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Entit= lement.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Entitlement= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Entitlement= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Exten= sionModule.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/ExtensionMo= dule.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/ExtensionMo= dule.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Group= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Group.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Group.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/LogCo= nfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/LogConfigur= ation.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/LogConfigur= ation.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Model= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Model.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Model.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Princ= ipal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Principal.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Principal.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Proce= ssObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/ProcessObje= ct.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/ProcessObje= ct.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Prope= rtyDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/PropertyDef= inition.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/PropertyDef= inition.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Queue= WorkerPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/QueueWorker= Pool.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/QueueWorker= Pool.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Reque= st.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Request.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Request.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Resou= rce.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Resource.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Resource.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Role.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Role.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Role.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Scrip= tsContainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/ScriptsCont= ainer.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/ScriptsCont= ainer.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Sessi= on.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Session.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Session.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Sourc= eRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/SourceReque= st.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/SourceReque= st.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Syste= mObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/SystemObjec= t.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/SystemObjec= t.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/User.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/User.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/User.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/VDB.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/VDB.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/VDB.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/server/AdminR= oles.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/server/AdminRoles.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/server/AdminRoles.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/server/Server= Admin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerAdmin.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerAdmin.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/server/Server= ConfigAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerConfig= Admin.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerConfig= Admin.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/server/Server= MonitoringAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerMonito= ringAdmin.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerMonito= ringAdmin.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/server/Server= RuntimeStateAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerRuntim= eStateAdmin.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerRuntim= eStateAdmin.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/api/server/Server= SecurityAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerSecuri= tyAdmin.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/api/server/ServerSecuri= tyAdmin.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminOb= ject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminObject.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminObject.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminSt= atus.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMAdminStatus.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnect= orBinding.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorBind= ing.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorBind= ing.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnect= orType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorType= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMConnectorType= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java 2009= -02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMDQP.java 2009= -02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMExtensi= onModule.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMExtensionModu= le.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMExtensionModu= le.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMGroup.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMGroup.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMGroup.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMHost.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConf= iguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfigurat= ion.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfigurat= ion.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMModel.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMModel.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMModel.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincip= al.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincipal.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMPrincipal.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMProcess= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMProcess.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMProcess.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMPropert= yDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMPropertyDefin= ition.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMPropertyDefin= ition.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMQueueWo= rkerPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMQueueWorkerPo= ol.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMQueueWorkerPo= ol.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMRequest= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMRequest.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMRequest.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMResourc= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMResource.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMResource.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMRole.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMRole.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMRole.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMScripts= Container.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMScriptsContai= ner.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMScriptsContai= ner.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMSession= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMSession.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMSession.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMSourceR= equest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMSourceRequest= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMSourceRequest= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMSystem.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMSystem.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMSystem.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMUser.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMUser.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMUser.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMVDB.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMVDB.java 2009= -02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMVDB.java 2009= -02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Cri= teriaEvaluationException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/CriteriaE= valuationException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/CriteriaE= valuationException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Exp= ressionEvaluationException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/Expressio= nEvaluationException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/Expressio= nEvaluationException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Fun= ctionExecutionException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/FunctionE= xecutionException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/FunctionE= xecutionException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Fun= ctionMetadataException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/FunctionM= etadataException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/FunctionM= etadataException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Inv= alidFunctionException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/InvalidFu= nctionException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/InvalidFu= nctionException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Pro= cedureErrorInstructionException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/Procedure= ErrorInstructionException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/Procedure= ErrorInstructionException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Que= ryMetadataException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryMeta= dataException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryMeta= dataException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Que= ryParserException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryPars= erException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryPars= erException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Que= ryPlannerException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryPlan= nerException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryPlan= nerException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Que= ryProcessingException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryProc= essingException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryProc= essingException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Que= ryResolverException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryReso= lverException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryReso= lverException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Que= ryValidatorException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryVali= datorException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/QueryVali= datorException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/query/Unr= esolvedSymbolDescription.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/query/Unresolve= dSymbolDescription.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/query/Unresolve= dSymbolDescription.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/api/exception/security/= LogonException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/api/exception/security/LogonE= xception.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/api/exception/security/LogonE= xception.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/client/ExceptionUtil.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/client/ExceptionUtil.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/client/ExceptionUtil.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/api/HostInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/api/HostInfo.java 2009= -02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/api/HostInfo.java 2009= -02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/api/MMURL.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/api/MMURL.java 2009-02= -12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/api/MMURL.java 2009-02= -12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/batch/BatchSeria= lizer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/batch/BatchSerializer.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/batch/BatchSerializer.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/CommonCommP= lugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/CommonCommPlugin.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/CommonCommPlugin.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/api/Message= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/api/Message.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/api/Message.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/api/Message= Listener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/api/MessageListen= er.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/api/MessageListen= er.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/api/Results= Receiver.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/api/ResultsReceiv= er.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/api/ResultsReceiv= er.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerC= onnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnect= ion.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnect= ion.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerC= onnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnect= ionFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnect= ionFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/exception/C= ommunicationException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/exception/Communi= cationException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/exception/Communi= cationException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/exception/C= onnectionException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/exception/Connect= ionException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/exception/Connect= ionException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/exception/E= xceptionHolder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/exception/Excepti= onHolder.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/exception/Excepti= onHolder.java 2009-02-12 21:40:56 UTC (rev 465) @@ -11,11 +11,9 @@ = /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/exception/S= ingleInstanceCommunicationException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/exception/SingleI= nstanceCommunicationException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/exception/SingleI= nstanceCommunicationException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/Co= mmPlatformPlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/CommPlat= formPlugin.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/CommPlat= formPlugin.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/cl= ient/ServerAdminFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/client/S= erverAdminFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/client/S= erverAdminFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/Handshake.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/H= andshake.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/H= andshake.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/ObjectChannel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/O= bjectChannel.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/O= bjectChannel.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/PrintStreamSocketLog.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/P= rintStreamSocketLog.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/P= rintStreamSocketLog.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/SSLAwareChannelHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/S= SLAwareChannelHandler.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/S= SLAwareChannelHandler.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/SocketLog.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/S= ocketLog.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/S= ocketLog.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/SocketUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/S= ocketUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/S= ocketUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/AdminApiServerDiscovery.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/AdminApiServerDiscovery.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/AdminApiServerDiscovery.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/NioObjectChannelFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/NioObjectChannelFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/NioObjectChannelFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/ObjectChannelFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/ObjectChannelFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/ObjectChannelFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/ServerDiscovery.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/ServerDiscovery.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/ServerDiscovery.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/ServiceInvocationStruct.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/ServiceInvocationStruct.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/ServiceInvocationStruct.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/SocketServerConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerConnection.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerConnection.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/SocketServerConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerConnectionFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerConnectionFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/SocketServerInstance.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerInstance.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerInstance.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/SocketServerInstanceFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerInstanceFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerInstanceFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/SocketServerInstanceImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerInstanceImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerInstanceImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/UrlServerDiscovery.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/UrlServerDiscovery.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/UrlServerDiscovery.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/lob/ByteLobChunk= Stream.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/lob/ByteLobChunkStream= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/lob/ByteLobChunkStream= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/lob/LobChunk.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/lob/LobChunk.java 2009= -02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/lob/LobChunk.java 2009= -02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/lob/LobChunkInpu= tStream.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/lob/LobChunkInputStrea= m.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/lob/LobChunkInputStrea= m.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/lob/LobChunkProd= ucer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/lob/LobChunkProducer.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/lob/LobChunkProducer.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/lob/ReaderInputS= tream.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/lob/ReaderInputStream.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/lob/ReaderInputStream.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/xa/MMXid.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/xa/MMXid.java 2009-02-= 12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/xa/MMXid.java 2009-02-= 12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/common/xa/XATransaction= Exception.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/xa/XATransactionExcept= ion.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/common/xa/XATransactionExcept= ion.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/client/ClientSideDQ= P.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/client/ClientSideDQP.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/client/ClientSideDQP.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/client/MetadataResu= lt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/client/MetadataResult.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/client/MetadataResult.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/client/ResultsFutur= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/client/ResultsFuture.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/client/ResultsFuture.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/client/impl/Streami= ngLobChunckProducer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/client/impl/StreamingLobC= hunckProducer.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/client/impl/StreamingLobC= hunckProducer.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/exception/PartialRe= sultsException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/exception/PartialResultsE= xception.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/exception/PartialResultsE= xception.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/exception/SourceFai= lureDetails.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/exception/SourceFailureDe= tails.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/exception/SourceFailureDe= tails.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/internal/datamgr/Co= nnectorID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/internal/datamgr/Connecto= rID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/internal/datamgr/Connecto= rID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/message/ParameterIn= fo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/message/ParameterInfo.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/message/ParameterInfo.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/message/RequestID.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/message/RequestID.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/message/RequestID.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/message/RequestMess= age.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/message/RequestMessage.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/message/RequestMessage.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/message/ResultsMess= age.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/message/ResultsMessage.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/message/ResultsMessage.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/metadata/ResultsMet= adataConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/metadata/ResultsMetadataC= onstants.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/metadata/ResultsMetadataC= onstants.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/dqp/metadata/ResultsMet= adataDefaults.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/dqp/metadata/ResultsMetadataD= efaults.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/dqp/metadata/ResultsMetadataD= efaults.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/jdbc/api/Annotation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/jdbc/api/Annotation.java 2009= -02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/jdbc/api/Annotation.java 2009= -02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/jdbc/api/ConnectionProp= erties.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/jdbc/api/ConnectionProperties= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/jdbc/api/ConnectionProperties= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/jdbc/api/DefaultDisplay= Helper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/jdbc/api/DefaultDisplayHelper= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/jdbc/api/DefaultDisplayHelper= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/jdbc/api/DisplayHelper.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/jdbc/api/DisplayHelper.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/jdbc/api/DisplayHelper.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/jdbc/api/ExecutionPrope= rties.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/jdbc/api/ExecutionProperties.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/jdbc/api/ExecutionProperties.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/jdbc/api/PlanNode.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/jdbc/api/PlanNode.java 2009-0= 2-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/jdbc/api/PlanNode.java 2009-0= 2-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/jdbc/api/PlanVisitor.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/jdbc/api/PlanVisitor.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/jdbc/api/PlanVisitor.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/jdbc/api/TextOutputVisi= tor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/jdbc/api/TextOutputVisitor.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/jdbc/api/TextOutputVisitor.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/jdbc/api/XMLOutputVisit= or.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/jdbc/api/XMLOutputVisitor.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/jdbc/api/XMLOutputVisitor.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/platform/security/api/B= asicMetaMatrixPrincipal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/platform/security/api/BasicMe= taMatrixPrincipal.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/platform/security/api/BasicMe= taMatrixPrincipal.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/platform/security/api/I= Logon.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/platform/security/api/ILogon.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/platform/security/api/ILogon.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/platform/security/api/L= ogonResult.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/platform/security/api/LogonRe= sult.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/platform/security/api/LogonRe= sult.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/platform/security/api/M= etaMatrixPrincipal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMat= rixPrincipal.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMat= rixPrincipal.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/platform/security/api/M= etaMatrixPrincipalName.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMat= rixPrincipalName.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMat= rixPrincipalName.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/platform/security/api/M= etaMatrixPrincipalNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMat= rixPrincipalNames.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMat= rixPrincipalNames.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/platform/security/api/M= etaMatrixSessionID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMat= rixSessionID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMat= rixSessionID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/platform/security/api/M= etaMatrixSessionInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMat= rixSessionInfo.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMat= rixSessionInfo.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/platform/security/api/M= etaMatrixSessionState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMat= rixSessionState.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/platform/security/api/MetaMat= rixSessionState.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/platform/security/api/S= essionToken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/platform/security/api/Session= Token.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/platform/security/api/Session= Token.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/platform/util/ProductIn= foConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/platform/util/ProductInfoCons= tants.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/platform/util/ProductInfoCons= tants.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/java/com/metamatrix/server/serverapi/Reques= tInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/server/serverapi/RequestInfo.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/java/com/metamatrix/server/serverapi/RequestInfo.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/resources/com/metamatrix/admin/i18n.propert= ies =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/resources/com/metamatrix/admin/i18n.properties 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/resources/com/metamatrix/admin/i18n.properties 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ # # JBoss, Home of Professional Open Source. -# Copyright (C) 2008 Red Hat, Inc. -# Copyright (C) 2000-2007 MetaMatrix, Inc. -# Licensed to Red Hat, Inc. under one or more contributor = -# license agreements. See the copyright.txt file in the -# distribution for a full listing of individual contributors. +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. Some portions may be licensed +# to Red Hat, Inc. under one or more contributor license agreements. # = # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/resources/com/metamatrix/common/comm/i18n.p= roperties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/resources/com/metamatrix/common/comm/i18n.propert= ies 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/resources/com/metamatrix/common/comm/i18n.propert= ies 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ # # JBoss, Home of Professional Open Source. -# Copyright (C) 2008 Red Hat, Inc. -# Copyright (C) 2000-2007 MetaMatrix, Inc. -# Licensed to Red Hat, Inc. under one or more contributor = -# license agreements. See the copyright.txt file in the -# distribution for a full listing of individual contributors. +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. Some portions may be licensed +# to Red Hat, Inc. under one or more contributor license agreements. # = # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/main/resources/com/metamatrix/common/comm/platfo= rm/i18n.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/resources/com/metamatrix/common/comm/platform/i18= n.properties 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/main/resources/com/metamatrix/common/comm/platform/i18= n.properties 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ # # JBoss, Home of Professional Open Source. -# Copyright (C) 2008 Red Hat, Inc. -# Copyright (C) 2000-2007 MetaMatrix, Inc. -# Licensed to Red Hat, Inc. under one or more contributor = -# license agreements. See the copyright.txt file in the -# distribution for a full listing of individual contributors. +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. Some portions may be licensed +# to Red Hat, Inc. under one or more contributor license agreements. # = # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/admin/api/objects/TestA= dminOptions.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/admin/api/objects/TestAdminOp= tions.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/admin/api/objects/TestAdminOp= tions.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/batch/TestBatchS= erializer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/batch/TestBatchSeriali= zer.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/batch/TestBatchSeriali= zer.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/so= cket/TestSocketUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/T= estSocketUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/T= estSocketUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008-2009 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/so= cket/client/TestAdminApiServerDiscovery.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestAdminApiServerDiscovery.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestAdminApiServerDiscovery.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/so= cket/client/TestServiceInvocationStruct.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestServiceInvocationStruct.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestServiceInvocationStruct.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/so= cket/client/TestSocketServerConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestSocketServerConnection.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestSocketServerConnection.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/so= cket/client/TestSocketServerInstanceImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestSocketServerInstanceImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestSocketServerInstanceImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/so= cket/client/TestSocketServiceRegistry.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestSocketServiceRegistry.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestSocketServiceRegistry.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/lob/TestByteLobC= hunk.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/lob/TestByteLobChunk.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/lob/TestByteLobChunk.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/lob/TestByteLobC= hunkStream.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/lob/TestByteLobChunkSt= ream.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/lob/TestByteLobChunkSt= ream.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/lob/TestLobChunk= InputStream.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/lob/TestLobChunkInputS= tream.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/lob/TestLobChunkInputS= tream.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/lob/TestReaderIn= putStream.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/lob/TestReaderInputStr= eam.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/lob/TestReaderInputStr= eam.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/util/TestMMURL.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/util/TestMMURL.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/util/TestMMURL.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/common/xa/TestMMXid.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/xa/TestMMXid.java 2009= -02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/common/xa/TestMMXid.java 2009= -02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client/src/test/java/com/metamatrix/dqp/client/TestResultsF= uture.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/dqp/client/TestResultsFuture.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client/src/test/java/com/metamatrix/dqp/client/TestResultsFuture.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/AbstractMetad= ataProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/AbstractMetadataPro= vider.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/AbstractMetadataPro= vider.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/AnnotationImp= l.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/AnnotationImpl.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/AnnotationImpl.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDataSourc= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDataSource.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDataSource.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDriver.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDriver.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDriver.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BatchFetcher.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BatchFetcher.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BatchFetcher.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BatchResults.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BatchResults.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BatchResults.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ConnectionLis= tener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ConnectionListener.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ConnectionListener.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DataTypeTrans= former.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DataTypeTransformer= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DataTypeTransformer= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DeferredMetad= ataProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DeferredMetadataPro= vider.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DeferredMetadataPro= vider.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DriverManager= Logger.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DriverManagerLogger= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DriverManagerLogger= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConne= ctionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionF= actory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionF= actory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConne= ctionTracker.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionT= racker.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionT= racker.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDataS= ource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDataSource.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDataSource.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDrive= r.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedSQLEx= ception.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedSQLExceptio= n.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedSQLExceptio= n.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/FilteredResul= tsMetadata.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/FilteredResultsMeta= data.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/FilteredResultsMeta= data.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCColumnNam= es.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCColumnNames.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCColumnNames.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCColumnPos= itions.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCColumnPositions= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCColumnPositions= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCLogger.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCLogger.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCLogger.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCPlugin.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCPlugin.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCPlugin.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/LobSearchUtil= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/LobSearchUtil.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/LobSearchUtil.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMBlob.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMBlob.java 2009-02= -12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMBlob.java 2009-02= -12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMCallableSta= tement.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMCallableStatement= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMCallableStatement= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMClob.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMClob.java 2009-02= -12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMClob.java 2009-02= -12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDatabaseMet= aData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDatabaseMetaData.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDatabaseMetaData.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java 2009-= 02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java 2009-= 02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedSta= tement.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMResultSet.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMResultSet.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMResultSet.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMSQLExceptio= n.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMSQLException.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMSQLException.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMSQLXML.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMSQLXML.java 2009-= 02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMSQLXML.java 2009-= 02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMServerConne= ction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMServerConnection.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMServerConnection.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMStatement.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMStatement.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMStatement.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAConnectio= n.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAConnection.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAConnection.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAResource.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAResource.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAResource.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/PlanNodeImpl.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/PlanNodeImpl.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/PlanNodeImpl.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ResultsMetada= taProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ResultsMetadataProv= ider.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ResultsMetadataProv= ider.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ResultsMetada= taWithProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ResultsMetadataWith= Provider.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ResultsMetadataWith= Provider.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/StaticMetadat= aProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/StaticMetadataProvi= der.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/StaticMetadataProvi= der.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/WarningUtil.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/WarningUtil.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/WarningUtil.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/WrapperImpl.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/WrapperImpl.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/WrapperImpl.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/Connectio= n.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/Connection.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/Connection.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/DatabaseM= etaData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/DatabaseMetaDat= a.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/DatabaseMetaDat= a.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/PartialRe= sultsWarning.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/PartialResultsW= arning.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/PartialResultsW= arning.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/ResultSet= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/ResultSet.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/ResultSet.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/ResultSet= MetaData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/ResultSetMetaDa= ta.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/ResultSetMetaDa= ta.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/SQLExcept= ion.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/SQLException.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/SQLException.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/SQLStates= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/SQLStates.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/SQLStates.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/Statement= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/Statement.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/Statement.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/tools/Que= ryPlanDisplayHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/tools/QueryPlan= DisplayHelper.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/api/tools/QueryPlan= DisplayHelper.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/util/MMJDBCUR= L.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/util/MMJDBCURL.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/util/MMJDBCURL.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/script/io/Metadata= Reader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/script/io/MetadataReader= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/script/io/MetadataReader= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/script/io/ResultSe= tReader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/script/io/ResultSetReade= r.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/script/io/ResultSetReade= r.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/script/io/StringAr= rayReader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/script/io/StringArrayRea= der.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/script/io/StringArrayRea= der.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/java/com/metamatrix/script/io/StringLi= neReader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/script/io/StringLineRead= er.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/java/com/metamatrix/script/io/StringLineRead= er.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/basic_i1= 8n.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/basic_i18n.pro= perties 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/basic_i18n.pro= perties 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ # # JBoss, Home of Professional Open Source. -# Copyright (C) 2008 Red Hat, Inc. -# Copyright (C) 2000-2007 MetaMatrix, Inc. -# Licensed to Red Hat, Inc. under one or more contributor = -# license agreements. See the copyright.txt file in the -# distribution for a full listing of individual contributors. +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. Some portions may be licensed +# to Red Hat, Inc. under one or more contributor license agreements. # = # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.pro= perties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.propertie= s 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/main/resources/com/metamatrix/jdbc/i18n.propertie= s 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ # # JBoss, Home of Professional Open Source. -# Copyright (C) 2008 Red Hat, Inc. -# Copyright (C) 2000-2007 MetaMatrix, Inc. -# Licensed to Red Hat, Inc. under one or more contributor = -# license agreements. See the copyright.txt file in the -# distribution for a full listing of individual contributors. +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. Some portions may be licensed +# to Red Hat, Inc. under one or more contributor license agreements. # = # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestAllResult= sImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestAllResultsImpl.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestAllResultsImpl.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestBatchResu= lts.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestBatchResults.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestBatchResults.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestDataTypeT= ransformer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestDataTypeTransfo= rmer.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestDataTypeTransfo= rmer.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMConnect= ion.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMConnection.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMConnection.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDataSou= rce.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDataSource.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDataSource.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDriver.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDriver.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDriver.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMResultS= et.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMResultSet.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMResultSet.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMSQLExce= ption.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMSQLException.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMSQLException.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMXAConne= ction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMXAConnection.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMXAConnection.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestWrapperIm= pl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestWrapperImpl.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestWrapperImpl.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractM= MQueryTestCase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQuery= TestCase.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/AbstractMMQuery= TestCase.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/FakeDispl= ayHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/FakeDisplayHelp= er.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/FakeDisplayHelp= er.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/FakePlanN= ode.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/FakePlanNode.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/FakePlanNode.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/TestQuery= PlanDisplayHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/TestQueryPlanDi= splayHelper.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/TestQueryPlanDi= splayHelper.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/TestTextO= utputVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/TestTextOutputV= isitor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/TestTextOutputV= isitor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/TestXMLOu= tputVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/TestXMLOutputVi= sitor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/api/TestXMLOutputVi= sitor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/util/ResultSe= tUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/util/ResultSetUtil.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/util/ResultSetUtil.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/util/TestMMJD= BCURL.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/util/TestMMJDBCURL.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/util/TestMMJDBCURL.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/api/exception/Comp= onentCommunicationException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/api/exception/ComponentC= ommunicationException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/api/exception/ComponentC= ommunicationException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/api/exception/Comp= onentNotFoundException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/api/exception/ComponentN= otFoundException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/api/exception/ComponentN= otFoundException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/api/exception/Meta= MatrixComponentException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/api/exception/MetaMatrix= ComponentException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/api/exception/MetaMatrix= ComponentException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/api/exception/Meta= MatrixException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/api/exception/MetaMatrix= Exception.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/api/exception/MetaMatrix= Exception.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/api/exception/Meta= MatrixProcessingException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/api/exception/MetaMatrix= ProcessingException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/api/exception/MetaMatrix= ProcessingException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/api/exception/Mult= ipleException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleEx= ception.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleEx= ception.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/api/exception/Mult= ipleRuntimeException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleRu= ntimeException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/api/exception/MultipleRu= ntimeException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/classloader= /NonDelegatingClassLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/classloader/NonDe= legatingClassLoader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/classloader/NonDe= legatingClassLoader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/classloader= /URLFilteringClassLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/classloader/URLFi= lteringClassLoader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/classloader/URLFi= lteringClassLoader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/jdbc/JDBCUt= il.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/jdbc/JDBCUtil.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/jdbc/JDBCUtil.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/jdbc/Simple= PooledConnectionSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/jdbc/SimplePooled= ConnectionSource.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/jdbc/SimplePooled= ConnectionSource.java 2009-02-12 21:40:56 UTC (rev 465) @@ -20,11 +20,9 @@ = /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008-2009 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/properties/= UnmodifiableProperties.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/properties/Unmodi= fiableProperties.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/properties/Unmodi= fiableProperties.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/MM= URLConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/MMURLCon= nection.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/MMURLCon= nection.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/Me= taMatrixURLStreamHandlerFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/MetaMatr= ixURLStreamHandlerFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/MetaMatr= ixURLStreamHandlerFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/UR= LHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/URLHelpe= r.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/URLHelpe= r.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/cl= asspath/ClasspathURLConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/classpat= h/ClasspathURLConnection.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/classpat= h/ClasspathURLConnection.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/cl= asspath/Handler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/classpat= h/Handler.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/classpat= h/Handler.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/ja= r/Handler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/Hand= ler.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/Hand= ler.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/ja= r/JarURLConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/JarU= RLConnection.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/JarU= RLConnection.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/mm= file/Handler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmfile/H= andler.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmfile/H= andler.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/mm= file/MMFileURLConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmfile/M= MFileURLConnection.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmfile/M= MFileURLConnection.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/mm= rofile/Handler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmrofile= /Handler.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmrofile= /Handler.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/mm= rofile/MMROFileURLConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmrofile= /MMROFileURLConnection.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmrofile= /MMROFileURLConnection.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/Abstr= actTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/AbstractTra= nsform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/AbstractTra= nsform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/BaseX= MLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/BaseXMLTran= slator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/BaseXMLTran= slator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/BlobI= mpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/BlobImpl.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/BlobImpl.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/BlobT= ype.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/BlobType.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/BlobType.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/ClobI= mpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/ClobImpl.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/ClobImpl.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/ClobT= ype.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/ClobType.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/ClobType.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/DataT= ypeManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/DataTypeMan= ager.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/DataTypeMan= ager.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/Inval= idReferenceException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/InvalidRefe= renceException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/InvalidRefe= renceException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/MMJDB= CSQLTypeInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/MMJDBCSQLTy= peInfo.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/MMJDBCSQLTy= peInfo.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/NullT= ype.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/NullType.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/NullType.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/SQLXM= LImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/SQLXMLImpl.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/SQLXMLImpl.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/Seque= ncable.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/Sequencable= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/Sequencable= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/Strea= mable.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/Streamable.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/Streamable.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/Trans= form.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/Transform.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/Transform.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/Trans= formationException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/Transformat= ionException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/Transformat= ionException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/XMLDo= mSourceTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/XMLDomSourc= eTranslator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/XMLDomSourc= eTranslator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/XMLRe= aderFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/XMLReaderFa= ctory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/XMLReaderFa= ctory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/XMLSA= XSourceTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/XMLSAXSourc= eTranslator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/XMLSAXSourc= eTranslator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/XMLSt= reamSourceTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/XMLStreamSo= urceTranslator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/XMLStreamSo= urceTranslator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/XMLTr= anslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/XMLTranslat= or.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/XMLTranslat= or.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/XMLTy= pe.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/XMLType.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/XMLType.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /AnyToObjectTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/AnyTo= ObjectTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/AnyTo= ObjectTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /AnyToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/AnyTo= StringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/AnyTo= StringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigDecimalToBigIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToBigIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToBigIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigDecimalToBooleanTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToBooleanTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToBooleanTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigDecimalToByteTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToByteTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToByteTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigDecimalToDoubleTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToDoubleTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToDoubleTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigDecimalToFloatTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToFloatTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToFloatTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigDecimalToIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigDecimalToLongTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToLongTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToLongTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigDecimalToShortTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToShortTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToShortTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigDecimalToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigDe= cimalToStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigIntegerToBigDecimalTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToBigDecimalTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToBigDecimalTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigIntegerToBooleanTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToBooleanTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToBooleanTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigIntegerToByteTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToByteTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToByteTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigIntegerToDoubleTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToDoubleTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToDoubleTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigIntegerToFloatTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToFloatTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToFloatTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigIntegerToIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigIntegerToLongTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToLongTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToLongTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigIntegerToShortTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToShortTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToShortTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BigIntegerToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/BigIn= tegerToStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BooleanToBigDecimalTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToBigDecimalTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToBigDecimalTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BooleanToBigIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToBigIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToBigIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BooleanToByteTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToByteTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToByteTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BooleanToDoubleTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToDoubleTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToDoubleTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BooleanToFloatTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToFloatTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToFloatTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BooleanToIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BooleanToLongTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToLongTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToLongTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BooleanToShortTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToShortTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToShortTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /BooleanToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Boole= anToStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ByteToBigDecimalTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oBigDecimalTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oBigDecimalTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ByteToBigIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oBigIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oBigIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ByteToBooleanTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oBooleanTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oBooleanTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ByteToDoubleTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oDoubleTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oDoubleTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ByteToFloatTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oFloatTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oFloatTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ByteToIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ByteToLongTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oLongTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oLongTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ByteToShortTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oShortTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oShortTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ByteToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ByteT= oStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /CharacterToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Chara= cterToStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Chara= cterToStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ClobToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ClobT= oStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/ClobT= oStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /DateToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/DateT= oStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/DateT= oStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /DateToTimestampTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/DateT= oTimestampTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/DateT= oTimestampTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /DoubleToBigDecimalTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToBigDecimalTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToBigDecimalTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /DoubleToBigIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToBigIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToBigIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /DoubleToBooleanTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToBooleanTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToBooleanTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /DoubleToByteTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToByteTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToByteTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /DoubleToFloatTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToFloatTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToFloatTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /DoubleToIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /DoubleToLongTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToLongTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToLongTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /DoubleToShortTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToShortTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToShortTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /DoubleToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Doubl= eToStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /FloatToBigDecimalTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToBigDecimalTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToBigDecimalTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /FloatToBigIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToBigIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToBigIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /FloatToBooleanTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToBooleanTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToBooleanTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /FloatToByteTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToByteTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToByteTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /FloatToDoubleTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToDoubleTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToDoubleTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /FloatToIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /FloatToLongTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToLongTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToLongTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /FloatToShortTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToShortTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToShortTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /FloatToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Float= ToStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /IntegerToBigDecimalTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToBigDecimalTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToBigDecimalTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /IntegerToBigIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToBigIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToBigIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /IntegerToBooleanTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToBooleanTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToBooleanTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /IntegerToByteTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToByteTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToByteTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /IntegerToDoubleTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToDoubleTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToDoubleTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /IntegerToFloatTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToFloatTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToFloatTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /IntegerToLongTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToLongTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToLongTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /IntegerToShortTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToShortTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToShortTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /IntegerToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Integ= erToStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /LongToBigDecimalTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oBigDecimalTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oBigDecimalTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /LongToBigIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oBigIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oBigIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /LongToBooleanTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oBooleanTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oBooleanTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /LongToByteTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oByteTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oByteTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /LongToDoubleTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oDoubleTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oDoubleTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /LongToFloatTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oFloatTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oFloatTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /LongToIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /LongToShortTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oShortTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oShortTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /LongToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/LongT= oStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /NullToAnyTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/NullT= oAnyTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/NullT= oAnyTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ObjectToAnyTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Objec= tToAnyTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Objec= tToAnyTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /SQLXMLToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/SQLXM= LToStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/SQLXM= LToStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ShortToBigDecimalTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToBigDecimalTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToBigDecimalTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ShortToBigIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToBigIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToBigIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ShortToBooleanTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToBooleanTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToBooleanTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ShortToByteTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToByteTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToByteTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ShortToDoubleTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToDoubleTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToDoubleTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ShortToFloatTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToFloatTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToFloatTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ShortToIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ShortToLongTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToLongTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToLongTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /ShortToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Short= ToStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToBigDecimalTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToBigDecimalTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToBigDecimalTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToBigIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToBigIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToBigIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToBooleanTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToBooleanTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToBooleanTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToByteTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToByteTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToByteTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToCharacterTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToCharacterTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToCharacterTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToClobTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToClobTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToClobTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToDateTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToDateTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToDateTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToDoubleTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToDoubleTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToDoubleTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToFloatTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToFloatTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToFloatTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToIntegerTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToIntegerTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToIntegerTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToLongTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToLongTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToLongTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToSQLXMLTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToSQLXMLTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToSQLXMLTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToShortTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToShortTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToShortTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToTimeTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToTimeTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToTimeTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /StringToTimestampTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToTimestampTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Strin= gToTimestampTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /TimeToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/TimeT= oStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/TimeT= oStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /TimeToTimestampTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/TimeT= oTimestampTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/TimeT= oTimestampTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /TimestampToDateTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Times= tampToDateTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Times= tampToDateTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /TimestampToStringTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Times= tampToStringTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Times= tampToStringTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/types/basic= /TimestampToTimeTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Times= tampToTimeTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/types/basic/Times= tampToTimeTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/Applic= ationInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/ApplicationI= nfo.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/ApplicationI= nfo.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/ByteAr= rayHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/ByteArrayHel= per.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/ByteArrayHel= per.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/MetaMa= trixProductNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/MetaMatrixPr= oductNames.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/MetaMatrixPr= oductNames.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/NetUti= ls.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/NetUtils.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/NetUtils.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/Passwo= rdMaskUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/PasswordMask= Util.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/PasswordMask= Util.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/Proper= tiesUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUt= ils.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUt= ils.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/SqlUti= l.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/SqlUtil.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/SqlUtil.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/Timest= ampWithTimezone.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/TimestampWit= hTimezone.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/TimestampWit= hTimezone.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/WSDLSe= rvletUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/WSDLServletU= til.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/WSDLServletU= til.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/crypto= /CryptoException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Crypt= oException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Crypt= oException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/crypto= /CryptoUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Crypt= oUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Crypt= oUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/crypto= /Cryptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Crypt= or.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Crypt= or.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/crypto= /Decryptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Decry= ptor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Decry= ptor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/crypto= /DhKeyGenerator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/DhKey= Generator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/DhKey= Generator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/crypto= /Encryptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Encry= ptor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Encry= ptor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/crypto= /NullCryptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/NullC= ryptor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/NullC= ryptor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/crypto= /PasswordChangeUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Passw= ordChangeUtility.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/Passw= ordChangeUtility.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/crypto= /cipher/BasicCryptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/ciphe= r/BasicCryptor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/ciphe= r/BasicCryptor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/crypto= /cipher/SymmetricCryptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/ciphe= r/SymmetricCryptor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/crypto/ciphe= r/SymmetricCryptor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/except= ion/SQLExceptionUnroller.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/exception/SQ= LExceptionUnroller.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/exception/SQ= LExceptionUnroller.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/BundleUtil.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/BundleUtil.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/BundleUtil.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/CoreConstants= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/CoreConstants.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/CoreConstants.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/CorePlugin.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/CorePlugin.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/CorePlugin.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/MetaMatrixCor= eException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/MetaMatrixCoreExcep= tion.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/MetaMatrixCoreExcep= tion.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/MetaMatrixRun= timeException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/MetaMatrixRuntimeEx= ception.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/MetaMatrixRuntimeEx= ception.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/IDGenerato= r.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/IDGenerator.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/IDGenerator.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/IntegerID.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/IntegerID.java 2= 009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/IntegerID.java 2= 009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/IntegerIDF= actory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/IntegerIDFactory= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/IntegerIDFactory= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/InvalidIDE= xception.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/InvalidIDExcepti= on.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/InvalidIDExcepti= on.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/LongID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/LongID.java 2009= -02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/LongID.java 2009= -02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/LongIDFact= ory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/LongIDFactory.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/LongIDFactory.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/ObjectID.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/ObjectID.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/ObjectID.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/ObjectIDFa= ctory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/ObjectIDFactory.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/ObjectIDFactory.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/ParsedObje= ctID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/ParsedObjectID.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/ParsedObjectID.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/StringID.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/StringID.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/StringID.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/StringIDFa= ctory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/StringIDFactory.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/StringIDFactory.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/UUID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/UUID.java 2009-0= 2-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/UUID.java 2009-0= 2-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/id/UUIDFactor= y.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/id/UUIDFactory.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/id/UUIDFactory.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/io/FileUrl.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/io/FileUrl.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/io/FileUrl.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/log/FileLimit= SizeLogWriter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/log/FileLimitSizeLo= gWriter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/log/FileLimitSizeLo= gWriter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/log/FileLogWr= iter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/log/FileLogWriter.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/log/FileLogWriter.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/log/LogListen= er.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/log/LogListener.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/log/LogListener.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/log/LogMessag= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/log/LogMessage.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/log/LogMessage.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/log/Logger.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/log/Logger.java 200= 9-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/log/Logger.java 200= 9-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/log/MessageLe= vel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/log/MessageLevel.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/log/MessageLevel.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/log/NullLogWr= iter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/log/NullLogWriter.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/log/NullLogWriter.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/log/NullLogge= r.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/log/NullLogger.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/log/NullLogger.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/log/SystemLog= Writer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/log/SystemLogWriter= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/log/SystemLogWriter= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/ArgCheck= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/ArgCheck.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/ArgCheck.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/Assertio= n.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/Assertion.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/Assertion.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/Base64.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/Base64.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/Base64.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/Checksum= Util.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/ChecksumUtil.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/ChecksumUtil.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/DateUtil= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/DateUtil.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/DateUtil.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/Equivale= nceUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/EquivalenceUti= l.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/EquivalenceUti= l.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/External= izeUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/ExternalizeUti= l.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/ExternalizeUti= l.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/FileUtil= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/FileUtil.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/FileUtil.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/FileUtil= s.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/FileUtils.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/FileUtils.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/HashCode= Util.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/HashCodeUtil.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/HashCodeUtil.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/LRUCache= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/LRUCache.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/LRUCache.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/MetaMatr= ixExceptionUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/MetaMatrixExce= ptionUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/MetaMatrixExce= ptionUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/MetaMatr= ixProductVersion.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/MetaMatrixProd= uctVersion.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/MetaMatrixProd= uctVersion.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/MixinPro= xy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/MixinProxy.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/MixinProxy.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/ObjectCo= nverterUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/ObjectConverte= rUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/ObjectConverte= rUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/Reflecti= onHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/ReflectionHelp= er.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/ReflectionHelp= er.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/Resource= NameUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/ResourceNameUt= il.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/ResourceNameUt= il.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/Stopwatc= h.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/Stopwatch.java= 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/Stopwatch.java= 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/StringUt= il.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtil.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtil.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,9 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * * Copyright (c) 2000, 2008 IBM Corporation and others. * All rights reserved. * This code is made available under the terms of the Eclipse Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/StringUt= ilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtilitie= s.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtilitie= s.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/ZipFileU= til.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/ZipFileUtil.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/ZipFileUtil.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/vdb/ModelType= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/vdb/ModelType.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/vdb/ModelType.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/vdb/VDBStatus= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/vdb/VDBStatus.java = 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/vdb/VDBStatus.java = 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/core/vdb/VdbConsta= nts.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/vdb/VdbConstants.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/core/vdb/VdbConstants.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/internal/core/log/= BasePlatformLogWriter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/internal/core/log/BasePl= atformLogWriter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/internal/core/log/BasePl= atformLogWriter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/internal/core/log/= PlatformLimitSizeLogWriter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/internal/core/log/Platfo= rmLimitSizeLogWriter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/internal/core/log/Platfo= rmLimitSizeLogWriter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/internal/core/log/= PlatformLog.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/internal/core/log/Platfo= rmLog.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/internal/core/log/Platfo= rmLog.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/java/com/metamatrix/internal/core/log/= PlatformLogWriter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/internal/core/log/Platfo= rmLogWriter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/java/com/metamatrix/internal/core/log/Platfo= rmLogWriter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/resources/com/metamatrix/common/util/c= rypto/dh.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/resources/com/metamatrix/common/util/crypto/= dh.properties 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/resources/com/metamatrix/common/util/crypto/= dh.properties 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ # # JBoss, Home of Professional Open Source. -# Copyright (C) 2008 Red Hat, Inc. -# Copyright (C) 2000-2007 MetaMatrix, Inc. -# Licensed to Red Hat, Inc. under one or more contributor = -# license agreements. See the copyright.txt file in the -# distribution for a full listing of individual contributors. +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. Some portions may be licensed +# to Red Hat, Inc. under one or more contributor license agreements. # = # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/main/resources/com/metamatrix/core/i18n.pro= perties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/resources/com/metamatrix/core/i18n.propertie= s 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/main/resources/com/metamatrix/core/i18n.propertie= s 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ # # JBoss, Home of Professional Open Source. -# Copyright (C) 2008 Red Hat, Inc. -# Copyright (C) 2000-2007 MetaMatrix, Inc. -# Licensed to Red Hat, Inc. under one or more contributor = -# license agreements. See the copyright.txt file in the -# distribution for a full listing of individual contributors. +# See the COPYRIGHT.txt file distributed with this work for information +# regarding copyright ownership. Some portions may be licensed +# to Red Hat, Inc. under one or more contributor license agreements. # = # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/api/exception/Test= MetaMatrixException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/api/exception/TestMetaMa= trixException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/api/exception/TestMetaMa= trixException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/api/exception/Test= MetaMatrixRuntimeException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/api/exception/TestMetaMa= trixRuntimeException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/api/exception/TestMetaMa= trixRuntimeException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/classloader= /TestNonDelegatingClassLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/classloader/TestN= onDelegatingClassLoader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/classloader/TestN= onDelegatingClassLoader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/classloader= /TestURLFilteringClassLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/classloader/TestU= RLFilteringClassLoader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/classloader/TestU= RLFilteringClassLoader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/jdbc/TestSi= mplePooledConnectionSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/jdbc/TestSimplePo= oledConnectionSource.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/jdbc/TestSimplePo= oledConnectionSource.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008-2009 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/protocol/Fa= keVersion.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/protocol/FakeVers= ion.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/protocol/FakeVers= ion.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/protocol/Te= stClasspathURLHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/protocol/TestClas= spathURLHandler.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/protocol/TestClas= spathURLHandler.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/protocol/Te= stMMFileURLHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/protocol/TestMMFi= leURLHandler.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/protocol/TestMMFi= leURLHandler.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/protocol/Te= stURLHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/protocol/TestURLH= elper.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/protocol/TestURLH= elper.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestB= lobImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobImp= l.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobImp= l.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestB= lobValue.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobVal= ue.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestBlobVal= ue.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestC= lobImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobImp= l.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobImp= l.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestC= lobValue.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobVal= ue.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestClobVal= ue.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestD= ataTypeManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestDataTyp= eManager.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestDataTyp= eManager.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestS= QLXMLImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestSQLXMLI= mpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestSQLXMLI= mpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestX= MLStreamSourceTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestXMLStre= amSourceTranslator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestXMLStre= amSourceTranslator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/TestX= MLValue.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/types/TestXMLValu= e.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/TestXMLValu= e.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/basic= /TestStringToXmlTransform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestS= tringToXmlTransform.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestS= tringToXmlTransform.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/basic= /TestTransforms.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestT= ransforms.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestT= ransforms.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/FakeIn= putStream.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/FakeInputStr= eam.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/FakeInputStr= eam.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/TestBy= teArrayHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/TestByteArra= yHelper.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/TestByteArra= yHelper.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/TestNe= tUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/TestNetUtils= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/TestNetUtils= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/TestPr= opertiesUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/TestProperti= esUtils.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/TestProperti= esUtils.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/TestSq= lUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/TestSqlUtil.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/TestSqlUtil.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/TestTi= mestampWithTimezone.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/TestTimestam= pWithTimezone.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/TestTimestam= pWithTimezone.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/TestWS= DLServletUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/TestWSDLServ= letUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/TestWSDLServ= letUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/crypto= /FakeCryptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/crypto/FakeC= ryptor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/crypto/FakeC= ryptor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/crypto= /TestDhKeyGenerator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/crypto/TestD= hKeyGenerator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/crypto/TestD= hKeyGenerator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/crypto= /TestEncryptDecrypt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/crypto/TestE= ncryptDecrypt.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/crypto/TestE= ncryptDecrypt.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/crypto= /TestPasswordChangeUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/crypto/TestP= asswordChangeUtility.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/crypto/TestP= asswordChangeUtility.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/except= ion/TestSQLExceptionUnroller.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/exception/Te= stSQLExceptionUnroller.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/exception/Te= stSQLExceptionUnroller.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/id/TestIDGene= rator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/id/TestIDGenerator.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/id/TestIDGenerator.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/id/TestParsed= ObjectID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/id/TestParsedObject= ID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/id/TestParsedObject= ID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/id/TestParsin= gObjectIDs.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/id/TestParsingObjec= tIDs.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/id/TestParsingObjec= tIDs.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/id/TestUUID.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/id/TestUUID.java 20= 09-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/id/TestUUID.java 20= 09-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/id/TestUUIDFa= ctory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/id/TestUUIDFactory.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/id/TestUUIDFactory.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/id/TestUUIDFa= ctoryWithoutCreation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/id/TestUUIDFactoryW= ithoutCreation.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/id/TestUUIDFactoryW= ithoutCreation.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/log/SysOutLog= ger.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/log/SysOutLogger.ja= va 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/log/SysOutLogger.ja= va 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/SimpleMo= ck.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/SimpleMock.jav= a 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/SimpleMock.jav= a 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/TestAsse= rtion.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/TestAssertion.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/TestAssertion.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/TestEqui= valenceUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/TestEquivalenc= eUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/TestEquivalenc= eUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/TestExte= rnalizeUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/TestExternaliz= eUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/TestExternaliz= eUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/TestFile= Util.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/TestFileUtil.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/TestFileUtil.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/TestFile= Utils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/TestFileUtils.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/TestFileUtils.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/TestMeta= MatrixExceptionUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/TestMetaMatrix= ExceptionUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/TestMetaMatrix= ExceptionUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/TestRefl= ectionHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/TestReflection= Helper.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/TestReflection= Helper.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/TestReso= urceNameUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/TestResourceNa= meUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/TestResourceNa= meUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/TestStri= ngUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/TestStringUtil= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/TestStringUtil= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/TestStri= ngUtilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/TestStringUtil= ities.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/TestStringUtil= ities.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/TestZipF= ileUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/TestZipFileUti= l.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/TestZipFileUti= l.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-core/src/test/java/com/metamatrix/core/util/UnitTest= Util.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/core/util/UnitTestUtil.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-core/src/test/java/com/metamatrix/core/util/UnitTestUtil.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/admin/AdminMes= sages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/admin/AdminMessages.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/admin/AdminMessages.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/core/messa= ge/DefaultMessage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/core/message/Def= aultMessage.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/core/message/Def= aultMessage.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/core/messa= ge/Message.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/core/message/Mes= sage.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/core/message/Mes= sage.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/core/messa= ge/MessageList.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/core/message/Mes= sageList.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/core/message/Mes= sageList.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/core/messa= ge/MessageTypes.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/core/message/Mes= sageTypes.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/core/message/Mes= sageTypes.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/E= ntityInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/EntityI= nfo.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/EntityI= nfo.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/F= eatureInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/Feature= Info.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/Feature= Info.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/X= MIConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/XMICons= tants.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/XMICons= tants.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/X= MIHeader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/XMIHead= er.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/XMIHead= er.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/X= MIReaderAdapter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/XMIRead= erAdapter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/core/xmi/XMIRead= erAdapter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/exception/= security/AuthorizationException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/AuthorizationException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/AuthorizationException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/exception/= security/AuthorizationMgmtException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/AuthorizationMgmtException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/AuthorizationMgmtException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/exception/= security/InvalidPrincipalException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/InvalidPrincipalException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/InvalidPrincipalException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/exception/= security/InvalidUserException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/InvalidUserException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/InvalidUserException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/exception/= security/InvalidVDBException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/InvalidVDBException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/InvalidVDBException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/exception/= security/MembershipServiceException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/MembershipServiceException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/MembershipServiceException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/exception/= security/MetaMatrixAuthenticationException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/MetaMatrixAuthenticationException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/MetaMatrixAuthenticationException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/exception/= security/SessionServiceException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/SessionServiceException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/SessionServiceException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/exception/= security/UnsupportedCredentialException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/UnsupportedCredentialException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/exception/securi= ty/UnsupportedCredentialException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/api/exception/= server/InvalidRequestIDException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/api/exception/server= /InvalidRequestIDException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/api/exception/server= /InvalidRequestIDException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/CommonP= lugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/CommonPlugin.= java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/CommonPlugin.= java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /AbstractObjectEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Abstr= actObjectEditor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Abstr= actObjectEditor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ActionDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Actio= nDefinition.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Actio= nDefinition.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /AddNamedObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/AddNa= medObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/AddNa= medObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /AddObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/AddOb= ject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/AddOb= ject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /AttributeDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Attri= buteDefinition.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Attri= buteDefinition.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /BasicModificationActionQueue.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Basic= ModificationActionQueue.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Basic= ModificationActionQueue.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ClassDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Class= Definition.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Class= Definition.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /CreateObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Creat= eObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Creat= eObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /DestroyObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Destr= oyObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Destr= oyObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ExchangeBoolean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeBoolean.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeBoolean.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ExchangeDouble.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeDouble.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeDouble.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ExchangeFloat.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeFloat.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeFloat.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ExchangeInt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeInt.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeInt.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ExchangeLong.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeLong.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeLong.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ExchangeNamedObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeNamedObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeNamedObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ExchangeObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ExchangePrimitive.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngePrimitive.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngePrimitive.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ExchangeShort.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeShort.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Excha= ngeShort.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ModificationActionQueue.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Modif= icationActionQueue.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Modif= icationActionQueue.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ModificationException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Modif= icationException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Modif= icationException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /NamedObjectActionDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Named= ObjectActionDefinition.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Named= ObjectActionDefinition.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /ObjectEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Objec= tEditor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Objec= tEditor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /RemoveNamedObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Remov= eNamedObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Remov= eNamedObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /RemoveObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Remov= eObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Remov= eObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /StringLengthExceededException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Strin= gLengthExceededException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Strin= gLengthExceededException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/actions= /TargetedActionDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/actions/Targe= tedActionDefinition.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/actions/Targe= tedActionDefinition.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= CurrentConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/Curren= tConfiguration.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/Curren= tConfiguration.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= ResourceNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/Resour= ceNames.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/Resour= ceNames.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= StartupStateController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/Startu= pStateController.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/Startu= pStateController.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= StartupStateException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/Startu= pStateException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/Startu= pStateException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/AuthenticationProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Au= thenticationProvider.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Au= thenticationProvider.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/AuthenticationProviderID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Au= thenticationProviderID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Au= thenticationProviderID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/AuthenticationProviderType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Au= thenticationProviderType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Au= thenticationProviderType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ComponentDefn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentDefn.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentDefn.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ComponentDefnID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentDefnID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentDefnID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ComponentObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ComponentObjectID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentObjectID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentObjectID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ComponentType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ComponentTypeDefn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentTypeDefn.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentTypeDefn.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ComponentTypeDefnID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentTypeDefnID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentTypeDefnID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ComponentTypeID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentTypeID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentTypeID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ComponentTypePropDefn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentTypePropDefn.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= mponentTypePropDefn.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/Configuration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nfiguration.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nfiguration.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ConfigurationID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nfigurationID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nfigurationID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ConfigurationInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nfigurationInfo.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nfigurationInfo.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ConfigurationModelContainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nfigurationModelContainer.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nfigurationModelContainer.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ConfigurationObjectEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nfigurationObjectEditor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nfigurationObjectEditor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ConnectorArchive.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nnectorArchive.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nnectorArchive.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ConnectorBinding.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nnectorBinding.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nnectorBinding.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ConnectorBindingID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nnectorBindingID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nnectorBindingID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ConnectorBindingType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nnectorBindingType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Co= nnectorBindingType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/DeployedComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/De= ployedComponent.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/De= ployedComponent.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/DeployedComponentID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/De= ployedComponentID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/De= ployedComponentID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ExtensionModule.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ex= tensionModule.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ex= tensionModule.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/Host.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ho= st.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ho= st.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/HostID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ho= stID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ho= stID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/HostType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ho= stType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ho= stType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/IndexingServiceComponentType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/In= dexingServiceComponentType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/In= dexingServiceComponentType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/LockedConfigurationID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Lo= ckedConfigurationID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Lo= ckedConfigurationID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ProductServiceConfig.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= oductServiceConfig.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= oductServiceConfig.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ProductServiceConfigComponentType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= oductServiceConfigComponentType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= oductServiceConfigComponentType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ProductServiceConfigID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= oductServiceConfigID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= oductServiceConfigID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ProductType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= oductType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= oductType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ProductTypeID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= oductTypeID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= oductTypeID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/PropDefnAllowedValue.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= opDefnAllowedValue.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= opDefnAllowedValue.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/PropDefnAllowedValueID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= opDefnAllowedValueID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Pr= opDefnAllowedValueID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ReleaseInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Re= leaseInfo.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Re= leaseInfo.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ResourceComponentType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Re= sourceComponentType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Re= sourceComponentType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ResourceDescriptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Re= sourceDescriptor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Re= sourceDescriptor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ResourceDescriptorID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Re= sourceDescriptorID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Re= sourceDescriptorID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ResourceModel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Re= sourceModel.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Re= sourceModel.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/RuntimeMetadataServiceComponentType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ru= ntimeMetadataServiceComponentType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ru= ntimeMetadataServiceComponentType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/SearchbaseConnectorComponentType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Se= archbaseConnectorComponentType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Se= archbaseConnectorComponentType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ServiceComponentDefn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Se= rviceComponentDefn.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Se= rviceComponentDefn.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ServiceComponentDefnID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Se= rviceComponentDefnID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Se= rviceComponentDefnID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/ServiceComponentType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Se= rviceComponentType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Se= rviceComponentType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/SharedResource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Sh= aredResource.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Sh= aredResource.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/SharedResourceID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Sh= aredResourceID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Sh= aredResourceID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/VMComponentDefn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VM= ComponentDefn.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VM= ComponentDefn.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/VMComponentDefnID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VM= ComponentDefnID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VM= ComponentDefnID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/VMComponentDefnType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VM= ComponentDefnType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VM= ComponentDefnType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/ConfigurationConnectionException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/ConfigurationConnectionException.java 2009-02-12 20:51:18 UTC (rev= 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/ConfigurationConnectionException.java 2009-02-12 21:40:56 UTC (rev= 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/ConfigurationException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/ConfigurationException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/ConfigurationException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/ConfigurationLockException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/ConfigurationLockException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/ConfigurationLockException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/DuplicateComponentException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/DuplicateComponentException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/DuplicateComponentException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/InvalidArgumentException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidArgumentException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidArgumentException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/InvalidComponentException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidComponentException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidComponentException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/InvalidComponentIDCharacterException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidComponentIDCharacterException.java 2009-02-12 20:51:18 UTC = (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidComponentIDCharacterException.java 2009-02-12 21:40:56 UTC = (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/InvalidComponentIDFormatException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidComponentIDFormatException.java 2009-02-12 20:51:18 UTC (re= v 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidComponentIDFormatException.java 2009-02-12 21:40:56 UTC (re= v 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/InvalidConfigurationException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidConfigurationException.java 2009-02-12 20:51:18 UTC (rev 46= 4) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidConfigurationException.java 2009-02-12 21:40:56 UTC (rev 46= 5) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/InvalidDeployedComponentException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidDeployedComponentException.java 2009-02-12 20:51:18 UTC (re= v 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidDeployedComponentException.java 2009-02-12 21:40:56 UTC (re= v 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/InvalidNameException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidNameException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidNameException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/InvalidPropertyValueException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidPropertyValueException.java 2009-02-12 20:51:18 UTC (rev 46= 4) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidPropertyValueException.java 2009-02-12 21:40:56 UTC (rev 46= 5) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/InvalidStringValueException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidStringValueException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidStringValueException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/InvalidVersionException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidVersionException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/InvalidVersionException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/exceptions/ZeroLengthComponentIDException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/ZeroLengthComponentIDException.java 2009-02-12 20:51:18 UTC (rev 4= 64) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/ex= ceptions/ZeroLengthComponentIDException.java 2009-02-12 21:40:56 UTC (rev 4= 65) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicAuthenticationProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicAuthenticationProvider.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicAuthenticationProvider.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicAuthenticationProviderType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicAuthenticationProviderType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicAuthenticationProviderType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicComponentDefn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicComponentDefn.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicComponentDefn.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicComponentObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicComponentObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicComponentObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicComponentType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicComponentType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicComponentType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicComponentTypeDefn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicComponentTypeDefn.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicComponentTypeDefn.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicConfiguration.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicConfiguration.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicConfigurationInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicConfigurationInfo.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicConfigurationInfo.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicConfigurationObjectEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicConfigurationObjectEditor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicConfigurationObjectEditor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicConnectorArchive.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicConnectorArchive.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicConnectorArchive.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicConnectorBinding.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicConnectorBinding.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicConnectorBinding.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicConnectorBindingType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicConnectorBindingType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicConnectorBindingType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicDeployedComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicDeployedComponent.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicDeployedComponent.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicExtensionModule.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicExtensionModule.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicExtensionModule.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicHost.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicHost.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicHost.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicHostType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicHostType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicHostType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicProductServiceConfig.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicProductServiceConfig.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicProductServiceConfig.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicProductServiceConfigType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicProductServiceConfigType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicProductServiceConfigType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicProductType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicProductType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicProductType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicPropDefnAllowedValue.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicPropDefnAllowedValue.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicPropDefnAllowedValue.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicResourceComponentType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicResourceComponentType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicResourceComponentType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicResourceDescriptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicResourceDescriptor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicResourceDescriptor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicServiceComponentDefn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicServiceComponentDefn.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicServiceComponentDefn.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicServiceComponentType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicServiceComponentType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicServiceComponentType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicSharedResource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicSharedResource.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicSharedResource.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicVMComponentDefn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicVMComponentDefn.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicVMComponentDefn.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicVMComponentDefnType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicVMComponentDefnType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicVMComponentDefnType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/ComponentCryptoUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= ComponentCryptoUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= ComponentCryptoUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/ConfigurationModel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= ConfigurationModel.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= ConfigurationModel.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/ConfigurationModelContainerAdapter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= ConfigurationModelContainerAdapter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= ConfigurationModelContainerAdapter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/ConfigurationModelContainerImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= ConfigurationModelContainerImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= ConfigurationModelContainerImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/ConfigurationObjectEditorHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= ConfigurationObjectEditorHelper.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= ConfigurationObjectEditorHelper.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/ConfigurationVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= ConfigurationVisitor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= ConfigurationVisitor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/PropertyValidations.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= PropertyValidations.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= PropertyValidations.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= reader/CurrentConfigurationReader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/reader= /CurrentConfigurationReader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/reader= /CurrentConfigurationReader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= reader/PropertiesConfigurationReader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/reader= /PropertiesConfigurationReader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/reader= /PropertiesConfigurationReader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= util/ConfigObjectsNotResolvableException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/util/C= onfigObjectsNotResolvableException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/util/C= onfigObjectsNotResolvableException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= util/ConfigUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/util/C= onfigUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/util/C= onfigUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= util/ConfigurationImportExportUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/util/C= onfigurationImportExportUtility.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/util/C= onfigurationImportExportUtility.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= util/ConfigurationPropertyNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/util/C= onfigurationPropertyNames.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/util/C= onfigurationPropertyNames.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= util/InvalidConfigurationElementException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/util/I= nvalidConfigurationElementException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/util/I= nvalidConfigurationElementException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= xml/ConnectorArchiveImportExportUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/Co= nnectorArchiveImportExportUtility.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/Co= nnectorArchiveImportExportUtility.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= xml/XMLConfig_42_ElementNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfig_42_ElementNames.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfig_42_ElementNames.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= xml/XMLConfig_42_HelperImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfig_42_HelperImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfig_42_HelperImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= xml/XMLConfig_42_ImportExportUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfig_42_ImportExportUtility.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfig_42_ImportExportUtility.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= xml/XMLConfig_42_Visitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfig_42_Visitor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfig_42_Visitor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= xml/XMLConfig_Base_ImportExportUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfig_Base_ImportExportUtility.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfig_Base_ImportExportUtility.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= xml/XMLConfigurationImportExportUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfigurationImportExportUtility.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfigurationImportExportUtility.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= xml/XMLElementNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LElementNames.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LElementNames.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= xml/XMLHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LHelper.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LHelper.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= xml/XMLHelperImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LHelperImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LHelperImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= xml/XMLHelperUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LHelperUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LHelperUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/extensi= onmodule/ExtensionModuleDescriptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/ExtensionModuleDescriptor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/ExtensionModuleDescriptor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/extensi= onmodule/exception/DuplicateExtensionModuleException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/exception/DuplicateExtensionModuleException.java 2009-02-12 20:51:18 UTC= (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/exception/DuplicateExtensionModuleException.java 2009-02-12 21:40:56 UTC= (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/extensi= onmodule/exception/ExtensionModuleException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/exception/ExtensionModuleException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/exception/ExtensionModuleException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/extensi= onmodule/exception/ExtensionModuleNotFoundException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/exception/ExtensionModuleNotFoundException.java 2009-02-12 20:51:18 UTC = (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/exception/ExtensionModuleNotFoundException.java 2009-02-12 21:40:56 UTC = (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/extensi= onmodule/exception/ExtensionModuleOrderingException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/exception/ExtensionModuleOrderingException.java 2009-02-12 20:51:18 UTC = (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/exception/ExtensionModuleOrderingException.java 2009-02-12 21:40:56 UTC = (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/extensi= onmodule/exception/ExtensionModuleRuntimeException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/exception/ExtensionModuleRuntimeException.java 2009-02-12 20:51:18 UTC (= rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/exception/ExtensionModuleRuntimeException.java 2009-02-12 21:40:56 UTC (= rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/extensi= onmodule/exception/InvalidExtensionModuleTypeException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/exception/InvalidExtensionModuleTypeException.java 2009-02-12 20:51:18 U= TC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/extensionmodu= le/exception/InvalidExtensionModuleTypeException.java 2009-02-12 21:40:56 U= TC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/id/Tran= sactionID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/id/Transactio= nID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/id/Transactio= nID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/id/Tran= sactionIDFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/id/Transactio= nIDFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/id/Transactio= nIDFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/Log= Configuration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfig= uration.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfig= uration.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/Log= Manager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/LogManage= r.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/LogManage= r.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/con= fig/BasicLogConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Ba= sicLogConfiguration.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Ba= sicLogConfiguration.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/con= fig/DefaultLogConfigurationFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/config/De= faultLogConfigurationFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/config/De= faultLogConfigurationFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/con= fig/LogConfigurationException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Lo= gConfigurationException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Lo= gConfigurationException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/con= fig/LogConfigurationFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Lo= gConfigurationFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Lo= gConfigurationFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/for= mat/DelimitedLogMessageFormat.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/format/De= limitedLogMessageFormat.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/format/De= limitedLogMessageFormat.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/for= mat/LogMessageFormat.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/format/Lo= gMessageFormat.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/format/Lo= gMessageFormat.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/rea= der/LogEntry.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/reader/Lo= gEntry.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/reader/Lo= gEntry.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/rea= der/LogEntryPropertyNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/reader/Lo= gEntryPropertyNames.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/reader/Lo= gEntryPropertyNames.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/rea= der/LogReader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/reader/Lo= gReader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/reader/Lo= gReader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/namedob= ject/BaseID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/namedobject/B= aseID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/namedobject/B= aseID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/namedob= ject/BaseObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/namedobject/B= aseObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/namedobject/B= aseObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/namedob= ject/BasicObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/namedobject/B= asicObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/namedobject/B= asicObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/namedob= ject/IDVerifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/namedobject/I= DVerifier.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/namedobject/I= DVerifier.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= ConfigurationPropertyObjDisplayComparator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Config= urationPropertyObjDisplayComparator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Config= urationPropertyObjDisplayComparator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= DefaultPropertyAccessPolicy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Defaul= tPropertyAccessPolicy.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Defaul= tPropertyAccessPolicy.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= DefaultPropertyDefinitionFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Defaul= tPropertyDefinitionFilter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Defaul= tPropertyDefinitionFilter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= Multiplicity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Multip= licity.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Multip= licity.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= MultiplicityExpressionException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Multip= licityExpressionException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Multip= licityExpressionException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= MultiplicityPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Multip= licityPool.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Multip= licityPool.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= ObjectDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Object= Definition.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Object= Definition.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= ObjectDefinitionDisplayNameComparator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Object= DefinitionDisplayNameComparator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Object= DefinitionDisplayNameComparator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= ObjectDefinitionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Object= DefinitionFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Object= DefinitionFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= ObjectDefinitionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Object= DefinitionImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Object= DefinitionImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= ObjectDefinitionImplFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Object= DefinitionImplFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Object= DefinitionImplFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertiedObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertiedObjectEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObjectEditor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObjectEditor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertiedObjectEditorImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObjectEditorImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObjectEditorImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertiedObjectImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObjectImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObjectImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertiedObjectView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObjectView.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObjectView.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertiedObjectsEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObjectsEditor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObjectsEditor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertiedObjectsEditorImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObjectsEditorImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tiedObjectsEditorImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertyAccessPolicy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyAccessPolicy.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyAccessPolicy.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertyAccessPolicyImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyAccessPolicyImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyAccessPolicyImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertyDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyDefinition.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyDefinition.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertyDefinitionFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyDefinitionFilter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyDefinitionFilter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertyDefinitionGroup.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyDefinitionGroup.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyDefinitionGroup.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertyDefinitionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyDefinitionImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyDefinitionImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertyDefinitionImplFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyDefinitionImplFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyDefinitionImplFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertyType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= PropertyTypeValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyTypeValidator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Proper= tyTypeValidator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/object/= StandardPropertyTypeValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/object/Standa= rdPropertyTypeValidator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/object/Standa= rdPropertyTypeValidator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/queue/W= orkerPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerP= ool.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerP= ool.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/queue/W= orkerPoolFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerP= oolFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerP= oolFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/queue/W= orkerPoolStats.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerP= oolStats.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/queue/WorkerP= oolStats.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/transac= tion/TransactionException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/transaction/T= ransactionException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/transaction/T= ransactionException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/transac= tion/TransactionNotSupportedException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/transaction/T= ransactionNotSupportedException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/transaction/T= ransactionNotSupportedException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/transac= tion/TransactionStatus.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/transaction/T= ransactionStatus.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/transaction/T= ransactionStatus.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/transac= tion/UserTransaction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/transaction/U= serTransaction.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/transaction/U= serTransaction.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/transac= tion/UserTransactionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/transaction/U= serTransactionFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/transaction/U= serTransactionFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/transac= tion/manager/SimpleUserTransaction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/transaction/m= anager/SimpleUserTransaction.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/transaction/m= anager/SimpleUserTransaction.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/transac= tion/manager/SimpleUserTransactionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/transaction/m= anager/SimpleUserTransactionFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/transaction/m= anager/SimpleUserTransactionFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Ab= stractTreeView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/Abstract= TreeView.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/Abstract= TreeView.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Ch= ildRules.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/ChildRul= es.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/ChildRul= es.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/De= faultChildRules.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/DefaultC= hildRules.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/DefaultC= hildRules.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Pa= ssThroughTreeNodeFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/PassThro= ughTreeNodeFilter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/PassThro= ughTreeNodeFilter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Ru= ledTreeViewImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/RuledTre= eViewImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/RuledTre= eViewImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Tr= eeNode.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Tr= eeNodeComparator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= Comparator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= Comparator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Tr= eeNodeEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= Editor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= Editor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Tr= eeNodeException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= Exception.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= Exception.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Tr= eeNodeFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= Filter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= Filter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Tr= eeNodeIterator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= Iterator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= Iterator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Tr= eeNodeIteratorWithStack.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= IteratorWithStack.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= IteratorWithStack.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Tr= eeNodeNameComparator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= NameComparator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= NameComparator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Tr= eeNodePathComparator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= PathComparator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= PathComparator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Tr= eeNodePropertyComparator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= PropertyComparator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= PropertyComparator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Tr= eeNodeSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= Source.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeNode= Source.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/Tr= eeView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeView= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/TreeView= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/ba= sic/BasicTreeNode.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Ba= sicTreeNode.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Ba= sicTreeNode.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/ba= sic/BasicTreeNodeEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Ba= sicTreeNodeEditor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Ba= sicTreeNodeEditor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/ba= sic/BasicTreeNodeIterator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Ba= sicTreeNodeIterator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Ba= sicTreeNodeIterator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/ba= sic/BasicTreeNodeSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Ba= sicTreeNodeSource.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Ba= sicTreeNodeSource.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/ba= sic/BasicTreeView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Ba= sicTreeView.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/basic/Ba= sicTreeView.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/DirectoryEntry.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/DirectoryEntry.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/DirectoryEntry.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/DirectoryEntryEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/DirectoryEntryEditor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/DirectoryEntryEditor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/DirectoryEntryFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/DirectoryEntryFilter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/DirectoryEntryFilter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/DirectoryEntryNameAndTypeComparator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/DirectoryEntryNameAndTypeComparator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/DirectoryEntryNameAndTypeComparator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/DirectoryEntryView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/DirectoryEntryView.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/DirectoryEntryView.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/FileDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FileDefinition.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FileDefinition.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/FileDefinitionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FileDefinitionImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FileDefinitionImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/FileSystemEntry.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FileSystemEntry.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FileSystemEntry.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/FileSystemEntryEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FileSystemEntryEditor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FileSystemEntryEditor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/FileSystemFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FileSystemFilter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FileSystemFilter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/FileSystemView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FileSystemView.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FileSystemView.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/FolderDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FolderDefinition.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FolderDefinition.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/FolderDefinitionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FolderDefinitionImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FolderDefinitionImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/FolderOnlyFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FolderOnlyFilter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/FolderOnlyFilter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/PassThroughDirectoryEntryFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/PassThroughDirectoryEntryFilter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/PassThroughDirectoryEntryFilter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/PlatformAwareFilePermission.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/PlatformAwareFilePermission.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/PlatformAwareFilePermission.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/PreviewableDirectoryEntry.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/PreviewableDirectoryEntry.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/PreviewableDirectoryEntry.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/tree/di= rectory/RuledDirectoryEntryViewImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/RuledDirectoryEntryViewImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/tree/director= y/RuledDirectoryEntryViewImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/Co= mmonPropertyNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/util/CommonPr= opertyNames.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/CommonPr= opertyNames.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/Er= rorMessageKeys.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/util/ErrorMes= sageKeys.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/ErrorMes= sageKeys.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/In= tervals.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/util/Interval= s.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/Interval= s.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/Lo= gCommonConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/util/LogCommo= nConstants.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/LogCommo= nConstants.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/Lo= gContextsUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/util/LogConte= xtsUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/LogConte= xtsUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/Mu= ltipleRequestConfirmation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/util/Multiple= RequestConfirmation.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/Multiple= RequestConfirmation.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/OS= PlatformUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/util/OSPlatfo= rmUtil.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/OSPlatfo= rmUtil.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/Pe= rmutation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/util/Permutat= ion.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/Permutat= ion.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/VD= BNameValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/util/VDBNameV= alidator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/VDBNameV= alidator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/VM= Naming.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/util/VMNaming= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/VMNaming= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/cr= ypto/keymanage/FilePasswordConverter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/util/crypto/k= eymanage/FilePasswordConverter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/crypto/k= eymanage/FilePasswordConverter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api= /DEFReaderWriter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/DEFRe= aderWriter.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/DEFRe= aderWriter.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api= /Manifest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/Manif= est.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/Manif= est.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api= /ModelInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/Model= Info.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/Model= Info.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api= /SystemVdbUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/Syste= mVdbUtility.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/Syste= mVdbUtility.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api= /VDBArchive.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBAr= chive.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBAr= chive.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api= /VDBDefn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBDe= fn.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBDe= fn.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api= /VDBFile.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBFi= le.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBFi= le.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api= /VDBInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBIn= fo.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBIn= fo.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api= /VDBStream.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBSt= ream.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBSt= ream.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api= /VDBStreamImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBSt= reamImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBSt= reamImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/xa/Tran= sactionID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/xa/Transactio= nID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/xa/Transactio= nID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/xml/XML= ReaderWriter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/xml/XMLReader= Writer.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/xml/XMLReader= Writer.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/xml/XML= ReaderWriterImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/xml/XMLReader= WriterImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/xml/XMLReader= WriterImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/xml/XPa= thUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/xml/XPathUtil= .java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/xml/XPathUtil= .java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/xml/Xml= Util.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/xml/XmlUtil.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/xml/XmlUtil.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/xml/xmi= /XMIContentHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/xml/xmi/XMICo= ntentHandler.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/xml/xmi/XMICo= ntentHandler.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/common/xml/xmi= /XMIHeaderContentHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/xml/xmi/XMIHe= aderContentHandler.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/common/xml/xmi/XMIHe= aderContentHandler.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/event/Abs= tractEventBroker.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/event/AbstractE= ventBroker.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/event/AbstractE= ventBroker.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/event/Abs= tractEventSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/event/AbstractE= ventSource.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/event/AbstractE= ventSource.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/event/Asy= nchEventBroker.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/event/AsynchEve= ntBroker.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/event/AsynchEve= ntBroker.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/event/Eve= ntBroker.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/event/EventBrok= er.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/event/EventBrok= er.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/event/Eve= ntBrokerException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/event/EventBrok= erException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/event/EventBrok= erException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/event/Eve= ntManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/event/EventMana= ger.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/event/EventMana= ger.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/event/Eve= ntObjectListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/event/EventObje= ctListener.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/event/EventObje= ctListener.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/event/Eve= ntSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/event/EventSour= ce.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/event/EventSour= ce.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/event/Eve= ntSourceException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/event/EventSour= ceException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/event/EventSour= ceException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/event/Tar= getableEvent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/event/Targetabl= eEvent.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/event/Targetabl= eEvent.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/util/Temp= Directory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/util/TempDirect= ory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/util/TempDirect= ory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/util/Temp= DirectoryMonitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/util/TempDirect= oryMonitor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/util/TempDirect= oryMonitor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/core/xml/CoreX= mlPlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/core/xml/CoreXmlPlug= in.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/core/xml/CoreXmlPlug= in.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/JdomHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/Jd= omHelper.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/Jd= omHelper.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/SAXBuilderHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/SA= XBuilderHelper.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/SA= XBuilderHelper.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/XPathHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/XP= athHelper.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/XP= athHelper.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/vdb/TerminatingVdbHeaderContentHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vd= b/TerminatingVdbHeaderContentHandler.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vd= b/TerminatingVdbHeaderContentHandler.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/vdb/VdbHeader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vd= b/VdbHeader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vd= b/VdbHeader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/vdb/VdbHeaderReader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vd= b/VdbHeaderReader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vd= b/VdbHeaderReader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/vdb/VdbModelInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vd= b/VdbModelInfo.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vd= b/VdbModelInfo.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/vdb/VdbNonModelInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vd= b/VdbNonModelInfo.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/vd= b/VdbNonModelInfo.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/xmi/ModelImportInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xm= i/ModelImportInfo.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xm= i/ModelImportInfo.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/xmi/TerminatingXMIHeaderContentHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xm= i/TerminatingXMIHeaderContentHandler.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xm= i/TerminatingXMIHeaderContentHandler.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/xmi/XMIHeader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xm= i/XMIHeader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xm= i/XMIHeader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/xmi/XMIHeaderReader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xm= i/XMIHeaderReader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xm= i/XMIHeaderReader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/xsd/TerminatingXsdHeaderContentHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xs= d/TerminatingXsdHeaderContentHandler.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xs= d/TerminatingXsdHeaderContentHandler.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/xsd/XsdHeader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xs= d/XsdHeader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xs= d/XsdHeader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/internal/core/= xml/xsd/XsdHeaderReader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xs= d/XsdHeaderReader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/internal/core/xml/xs= d/XsdHeaderReader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/metadata/runti= me/api/MetadataID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/api= /MetadataID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/api= /MetadataID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/metadata/runti= me/api/MetadataObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/api= /MetadataObject.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/api= /MetadataObject.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/metadata/runti= me/api/VirtualDatabase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/api= /VirtualDatabase.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/api= /VirtualDatabase.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/metadata/runti= me/api/VirtualDatabaseID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/api= /VirtualDatabaseID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/api= /VirtualDatabaseID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/metadata/runti= me/exception/VirtualDatabaseException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/exc= eption/VirtualDatabaseException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/metadata/runtime/exc= eption/VirtualDatabaseException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/AuthorizationAdminAPI.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/A= uthorizationAdminAPI.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/A= uthorizationAdminAPI.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/AuthorizationEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/A= uthorizationEditor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/A= uthorizationEditor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/ConfigurationAdminAPI.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/C= onfigurationAdminAPI.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/C= onfigurationAdminAPI.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/EntitlementMigrationReport.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/E= ntitlementMigrationReport.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/E= ntitlementMigrationReport.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/ExtensionSourceAdminAPI.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/E= xtensionSourceAdminAPI.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/E= xtensionSourceAdminAPI.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/MembershipAdminAPI.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/M= embershipAdminAPI.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/M= embershipAdminAPI.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/PermissionDataNode.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/P= ermissionDataNode.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/P= ermissionDataNode.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/PermissionDataNodeDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/P= ermissionDataNodeDefinition.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/P= ermissionDataNodeDefinition.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/PermissionDataNodeTreeView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/P= ermissionDataNodeTreeView.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/P= ermissionDataNodeTreeView.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/PermissionNode.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/P= ermissionNode.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/P= ermissionNode.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/PermissionTreeView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/P= ermissionTreeView.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/P= ermissionTreeView.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/PlatformAdminLogConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/P= latformAdminLogConstants.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/P= latformAdminLogConstants.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/RuntimeStateAdminAPI.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/R= untimeStateAdminAPI.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/R= untimeStateAdminAPI.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/RuntimeStateChangeEvent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/R= untimeStateChangeEvent.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/R= untimeStateChangeEvent.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/SessionAdminAPI.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/S= essionAdminAPI.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/S= essionAdminAPI.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/SubSystemAdminAPI.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/S= ubSystemAdminAPI.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/S= ubSystemAdminAPI.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/exception/MetaMatrixAdminException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/e= xception/MetaMatrixAdminException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/e= xception/MetaMatrixAdminException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/exception/PermissionNodeException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/e= xception/PermissionNodeException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/e= xception/PermissionNodeException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/exception/PermissionNodeNotActionableException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/e= xception/PermissionNodeNotActionableException.java 2009-02-12 20:51:18 UTC = (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/e= xception/PermissionNodeNotActionableException.java 2009-02-12 21:40:56 UTC = (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/exception/PermissionNodeNotFoundException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/e= xception/PermissionNodeNotFoundException.java 2009-02-12 20:51:18 UTC (rev = 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/e= xception/PermissionNodeNotFoundException.java 2009-02-12 21:40:56 UTC (rev = 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/exception/ProductNotRegisteredException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/e= xception/ProductNotRegisteredException.java 2009-02-12 20:51:18 UTC (rev 46= 4) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/e= xception/ProductNotRegisteredException.java 2009-02-12 21:40:56 UTC (rev 46= 5) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/exception/UnknownProductOrSubsystemException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/e= xception/UnknownProductOrSubsystemException.java 2009-02-12 20:51:18 UTC (r= ev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/e= xception/UnknownProductOrSubsystemException.java 2009-02-12 21:40:56 UTC (r= ev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/runtime/ComponentData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/ComponentData.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/ComponentData.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/runtime/HostData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/HostData.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/HostData.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/runtime/PSCData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/PSCData.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/PSCData.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/runtime/ProcessData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/ProcessData.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/ProcessData.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/runtime/PscID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/PscID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/PscID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/runtime/ServiceData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/ServiceData.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/ServiceData.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/runtime/SystemState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/SystemState.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/SystemState.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /apiimpl/PermissionDataNodeDefinitionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiim= pl/PermissionDataNodeDefinitionImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiim= pl/PermissionDataNodeDefinitionImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /apiimpl/PermissionDataNodeImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiim= pl/PermissionDataNodeImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiim= pl/PermissionDataNodeImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /apiimpl/PermissionDataNodeTreeViewImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiim= pl/PermissionDataNodeTreeViewImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/apiim= pl/PermissionDataNodeTreeViewImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AbstractAuthorizationObjectEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AbstractAuthorizationObjectEditor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AbstractAuthorizationObjectEditor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AuthorizationActions.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationActions.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationActions.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AuthorizationModel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationModel.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationModel.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AuthorizationObjectEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationObjectEditor.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationObjectEditor.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AuthorizationPermission.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPermission.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPermission.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AuthorizationPermissionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPermissionFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPermissionFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AuthorizationPermissions.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPermissions.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPermissions.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AuthorizationPermissionsImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPermissionsImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPermissionsImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AuthorizationPolicy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPolicy.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPolicy.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AuthorizationPolicyFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPolicyFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPolicyFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AuthorizationPolicyID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPolicyID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationPolicyID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AuthorizationRealm.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationRealm.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationRealm.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/AuthorizationResource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationResource.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/AuthorizationResource.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/BasicAuthorizationPermission.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/BasicAuthorizationPermission.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/BasicAuthorizationPermission.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/BasicAuthorizationPermissionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/BasicAuthorizationPermissionFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/BasicAuthorizationPermissionFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/Credentials.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/Credentials.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/Credentials.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/DataAccessResource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/DataAccessResource.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/DataAccessResource.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/GranteeEntitlementEntry.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/GranteeEntitlementEntry.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/GranteeEntitlementEntry.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/SecurityMessagesKeys.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/SecurityMessagesKeys.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/SecurityMessagesKeys.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/SecurityPlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/SecurityPlugin.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/SecurityPlugin.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/api/StandardAuthorizationActions.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/StandardAuthorizationActions.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ap= i/StandardAuthorizationActions.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/util/LogSecurityConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ut= il/LogSecurityConstants.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ut= il/LogSecurityConstants.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/util/RolePermission.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ut= il/RolePermission.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ut= il/RolePermission.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/secur= ity/util/RolePermissionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/security/ut= il/RolePermissionFactory.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/security/ut= il/RolePermissionFactory.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/servi= ce/api/ServiceID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/service/api= /ServiceID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/service/api= /ServiceID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/servi= ce/api/ServiceState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/service/api= /ServiceState.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/service/api= /ServiceState.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/vm/co= ntroller/SocketListenerStats.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/vm/controll= er/SocketListenerStats.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/vm/controll= er/SocketListenerStats.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/vm/co= ntroller/VMControllerID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/vm/controll= er/VMControllerID.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/vm/controll= er/VMControllerID.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/vm/co= ntroller/VMStatistics.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/vm/controll= er/VMStatistics.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/vm/controll= er/VMStatistics.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/server/admin/a= pi/MaterializationLoadScripts.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/server/admin/api/Mat= erializationLoadScripts.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/server/admin/api/Mat= erializationLoadScripts.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/server/admin/a= pi/QueryAdminAPI.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/server/admin/api/Que= ryAdminAPI.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/server/admin/api/Que= ryAdminAPI.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/server/admin/a= pi/RuntimeMetadataAdminAPI.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/server/admin/api/Run= timeMetadataAdminAPI.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/server/admin/api/Run= timeMetadataAdminAPI.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/server/admin/a= pi/TransactionAdminAPI.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/server/admin/api/Tra= nsactionAdminAPI.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/server/admin/api/Tra= nsactionAdminAPI.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/server/admin/a= piimpl/MaterializationLoadScriptsImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/server/admin/apiimpl= /MaterializationLoadScriptsImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/server/admin/apiimpl= /MaterializationLoadScriptsImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/edit/loade= r/VdbProcessingException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/edit/loader/VdbP= rocessingException.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/edit/loader/VdbP= rocessingException.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/materializ= ation/DatabaseDialect.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= DatabaseDialect.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= DatabaseDialect.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/materializ= ation/MaterializedViewScriptGenerator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= MaterializedViewScriptGenerator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= MaterializedViewScriptGenerator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/materializ= ation/MaterializedViewScriptGeneratorImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= MaterializedViewScriptGeneratorImpl.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= MaterializedViewScriptGeneratorImpl.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/materializ= ation/ScriptDecorator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= ScriptDecorator.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= ScriptDecorator.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/materializ= ation/ScriptType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= ScriptType.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= ScriptType.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/materializ= ation/template/ExpandedTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= template/ExpandedTemplate.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= template/ExpandedTemplate.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/materializ= ation/template/MaterializedViewConnectionData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= template/MaterializedViewConnectionData.java 2009-02-12 20:51:18 UTC (rev 4= 64) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= template/MaterializedViewConnectionData.java 2009-02-12 21:40:56 UTC (rev 4= 65) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/materializ= ation/template/MaterializedViewData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= template/MaterializedViewData.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= template/MaterializedViewData.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/materializ= ation/template/Template.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= template/Template.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= template/Template.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/materializ= ation/template/TemplateData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= template/TemplateData.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= template/TemplateData.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/materializ= ation/template/TemplateExpander.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= template/TemplateExpander.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/materialization/= template/TemplateExpander.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/Ba= sicModelInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicMod= elInfo.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicMod= elInfo.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/Ba= sicURIModelResource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicURI= ModelResource.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicURI= ModelResource.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/Ba= sicVDBDefn.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicVDB= Defn.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicVDB= Defn.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/Ba= sicVDBInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicVDB= Info.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/BasicVDB= Info.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/UR= IModelResource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/URIModel= Resource.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/URIModel= Resource.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/UR= IResource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/URIResou= rce.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/URIResou= rce.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/UR= IResourceReader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/URIResou= rceReader.java 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/URIResou= rceReader.java 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/VD= BKey.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/VDBKey.j= ava 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/java/com/metamatrix/vdb/runtime/VDBKey.j= ava 2009-02-12 21:40:56 UTC (rev 465) @@ -1,10 +1,8 @@ /* * JBoss, Home of Professional Open Source. - * Copyright (C) 2008 Red Hat, Inc. - * Copyright (C) 2000-2007 MetaMatrix, Inc. - * Licensed to Red Hat, Inc. under one or more contributor = - * license agreements. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. * = * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/common-internal/src/main/resources/com/metamatrix/common/co= nfig/api/resourcetypemodel.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/resources/com/metamatrix/common/config/a= pi/resourcetypemodel.xml 2009-02-12 20:51:18 UTC (rev 464) +++ trunk/common-internal/src/main/resources/com/metamatrix/common/config/a= pi/resourcetypemodel.xml 2009-02-12 21:40:56 UTC (rev 465) @@ -2,11 +2,9 @@ List(s) of values, which are = usally - * List of IExpression (usually ILiteral) + * @param List of Lists containing the actual values * @return New IBulkInsert */ - IBulkInsert createBulkInsert(IGroup group, List columns, List rows); + IBulkInsert createBulkInsert(IGroup group, List columns, Lis= t> rows); = /** * Create new IS NULL criteria @@ -181,7 +182,7 @@ * @param criteria List of ICriteria (considered to be AND'ed together) * @return New IJoin */ - IJoin createJoin(int joinType, IFromItem leftItem, IFromItem rightItem= , List criteria); + IJoin createJoin(IJoin.JoinType joinType, IFromItem leftItem, IFromIte= m rightItem, List criteria); = /** * Create new LIKE criteria @@ -213,7 +214,7 @@ * @param items List of IOrderByItem * @return New IOrderBy */ - IOrderBy createOrderBy(List items); + IOrderBy createOrderBy(List items); = /** * Create new ORDER BY item @@ -233,7 +234,7 @@ * @param metadataReference Metadata identifier reference * @return New IParameter */ - IParameter createParameter(int index, int direction, Object value, Cla= ss type, MetadataID metadataReference); + IParameter createParameter(int index, Direction direction, Object valu= e, Class type, MetadataID metadataReference); = /** * Create new procedure @@ -242,7 +243,7 @@ * @param metadataReference Metadata identifier reference * @return New IProcedure */ - IProcedure createProcedure(String name, List parameters, MetadataID me= tadataReference); + IProcedure createProcedure(String name, List parameters, M= etadataID metadataReference); = /** * Create new query @@ -273,7 +274,7 @@ * @param type Data type * @return New ICaseExpression */ = - ISearchedCaseExpression createSearchedCaseExpression(List whenExpressi= ons, List thenExpressions, IExpression elseExpression, Class type); + ISearchedCaseExpression createSearchedCaseExpression(List= whenExpressions, List thenExpressions, IExpression elseExpres= sion, Class type); = /** * Create new SELECT clause @@ -281,7 +282,7 @@ * @param selectSymbols List of ISelectSymbol * @return New ISelect */ - ISelect createSelect(boolean isDistinct, List selectSymbols); + ISelect createSelect(boolean isDistinct, List selectSym= bols); = /** * Create new select symbol @@ -299,7 +300,7 @@ * @param subquery Right subquery * @return New ISubqueryCompareCriteria */ - ISubqueryCompareCriteria createSubqueryCompareCriteria(IExpression lef= tExpression, int operator, int quantifier, IQuery subquery); + ISubqueryCompareCriteria createSubqueryCompareCriteria(IExpression lef= tExpression, ICompareCriteria.Operator operator, ISubqueryCompareCriteria.Q= uantifier quantifier, IQuery subquery); = /** * Create new subquery IN criteria Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IOrderBy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IOr= derBy.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IOr= derBy.java 2009-02-16 21:35:21 UTC (rev 474) @@ -38,12 +38,12 @@ * Get list of {@link IOrderByItem}s specifying the ordering of the re= sults. * @return List of IOrderByItem */ - List getItems(); + List getItems(); = /** * Set list of {@link IOrderByItem}s specifying the ordering of the re= sults. * @param items List of IOrderByItem */ - void setItems(List items); + void setItems(List items); = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IParameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPa= rameter.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPa= rameter.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,13 +26,15 @@ * Represents an execution parameter. */ public interface IParameter extends ILanguageObject, IMetadataReference { + = + public enum Direction { + IN, + OUT, + INOUT, + RETURN, + RESULT_SET + } = - public static final int IN =3D 0; - public static final int OUT =3D 1; - public static final int INOUT =3D 2; - public static final int RETURN =3D 3; - public static final int RESULT_SET =3D 4; - /** * Get index of this parameter in the IExecution. * @return Index of the parameter @@ -42,12 +44,12 @@ /** * Get direction of parameter * @return Direction - * @see #IN - * @see #OUT - * @see #INOUT - * @see #RETURN + * @see Direction#IN + * @see Direction#OUT + * @see Direction#INOUT + * @see Direction#RETURN */ - int getDirection(); + Direction getDirection(); = /** * Get type of parameter, defined as a Java class. Output result sets= will @@ -84,12 +86,12 @@ /** * Set direction of parameter * @param direction Direction - * @see #IN - * @see #OUT - * @see #INOUT - * @see #RETURN + * @see Direction#IN + * @see Direction#OUT + * @see Direction#INOUT + * @see Direction#RETURN */ - void setDirection(int direction); + void setDirection(Direction direction); = /** * Set type of parameter, defined as a Java class. Output result sets= will Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IProcedure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPr= ocedure.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPr= ocedure.java 2009-02-16 21:35:21 UTC (rev 474) @@ -40,7 +40,7 @@ * The parameters describe inputs and outputs. * @return List of IParameter */ - List getParameters(); + List getParameters(); = /** * Sets the name of the procedure. @@ -53,6 +53,6 @@ * The parameters describe inputs and outputs. * @param parameters List of IParameter */ - void setParameters(List parameters); + void setParameters(List parameters); = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/ISelect.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISe= lect.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISe= lect.java 2009-02-16 21:35:21 UTC (rev 474) @@ -33,7 +33,7 @@ * Get List of ISelectSymbol. * @return List of ISelectSymbol */ - List getSelectSymbols(); + List getSelectSymbols(); = /** * Determine whether the DISTINCT flag is used in this SELECT. @@ -45,7 +45,7 @@ * Set List of ISelectSymbol. * @param symbols List of ISelectSymbol */ - void setSelectSymbols(List symbols); + void setSelectSymbols(List symbols); = /** * Set whether the DISTINCT flag is used in this SELECT. Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/ISubqueryCompareCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISu= bqueryCompareCriteria.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISu= bqueryCompareCriteria.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,16 +29,10 @@ */ public interface ISubqueryCompareCriteria extends IPredicateCriteria, ISub= queryContainer { = - public static final int EQ =3D 1; - public static final int NE =3D 2; - public static final int LT =3D 3; - public static final int LE =3D 4; - public static final int GT =3D 5; - public static final int GE =3D 6; - - public static final int SOME =3D 0; - public static final int ALL =3D 1; - + public enum Quantifier { + SOME, + ALL + } /** * Get left expression. * @return Left expression @@ -55,15 +49,15 @@ * @see #GT * @see #GE */ - int getOperator(); + ICompareCriteria.Operator getOperator(); = /** * Get quantifier. * @return Quantifier constant - * @see #SOME - * @see #ALL + * @see Quantifier#SOME + * @see Quantifier#ALL */ - int getQuantifier(); + Quantifier getQuantifier(); = /** * Set left expression. @@ -81,15 +75,15 @@ * @see #GT * @see #GE */ - void setOperator(int operator); + void setOperator(ICompareCriteria.Operator operator); = /** * Set quantifier. * @param quantifier Quantifier constant - * @see #SOME - * @see #ALL + * @see Quantifier#SOME + * @see Quantifier#ALL */ - void setQuantifier(int quantifier); + void setQuantifier(Quantifier quantifier); = = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/LanguageUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/Lan= guageUtil.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/Lan= guageUtil.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,9 +23,9 @@ package com.metamatrix.connector.language; = import java.util.*; -import java.util.Collections; -import java.util.List; = +import com.metamatrix.connector.language.ICompoundCriteria.Operator; + /** * Helpful utility methods to work with language interfaces. = */ @@ -66,7 +66,7 @@ private static void separateCriteria(ICriteria crit, List parts) { if(crit instanceof ICompoundCriteria) { ICompoundCriteria compCrit =3D (ICompoundCriteria) crit; - if(compCrit.getOperator() =3D=3D ICompoundCriteria.AND) { + if(compCrit.getOperator() =3D=3D Operator.AND) { List subCrits =3D compCrit.getCriteria(); Iterator iter =3D subCrits.iterator(); while(iter.hasNext()) { = @@ -97,7 +97,7 @@ return additionalCrit; } else if(additionalCrit =3D=3D null) { = return primaryCrit; - } else if((primaryCrit instanceof ICompoundCriteria) && ((ICompoun= dCriteria)primaryCrit).getOperator() =3D=3D ICompoundCriteria.AND) { + } else if((primaryCrit instanceof ICompoundCriteria) && ((ICompoun= dCriteria)primaryCrit).getOperator() =3D=3D Operator.AND) { ICompoundCriteria primaryCompound =3D (ICompoundCriteria) prim= aryCrit; primaryCompound.getCriteria().add(additionalCrit); return primaryCrit; @@ -105,7 +105,7 @@ List crits =3D new ArrayList(2); crits.add(primaryCrit); crits.add(additionalCrit); - ICompoundCriteria compCrit =3D languageFactory.createCompoundC= riteria(ICompoundCriteria.AND, crits); + ICompoundCriteria compCrit =3D languageFactory.createCompoundC= riteria(Operator.AND, crits); return compCrit; } = } = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/Element.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Element.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Element.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,7 @@ */ package com.metamatrix.connector.metadata.runtime; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = /** * Represents an element, such as a column, in runtime metadata. = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/MetadataID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/MetadataID.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/MetadataID.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,7 @@ = import java.util.List; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = /** * Represents a runtime metadata identifier. @@ -52,7 +52,7 @@ * A procedure ID will return the IDs of it's parameters. * @return List of MetadataID, which may be empty but never null */ - List getChildIDs() throws ConnectorException; + List getChildIDs() throws ConnectorException; = /** * Get the parent ID if one exists Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/MetadataObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/MetadataObject.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/MetadataObject.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,7 @@ = import java.util.Properties; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = /** * Represents a runtime metadata object. Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/Parameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Parameter.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Parameter.java 2009-02-16 21:35:21 UTC (rev 474) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.metadata.runtime; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = /** * Represents a procedure parameter in the runtime metadata. Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/RuntimeMetadata.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/RuntimeMetadata.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/RuntimeMetadata.java 2009-02-16 21:35:21 UTC (rev 474) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.metadata.runtime; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = /** * Helper methods that can be used to access runtime metadata. Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/TypeModel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/TypeModel.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/TypeModel.java 2009-02-16 21:35:21 UTC (rev 474) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.metadata.runtime; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = = /** = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/pool/C= onnectorIdentity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/Connect= orIdentity.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/pool/Connect= orIdentity.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,6 @@ */ package com.metamatrix.connector.pool; = -import com.metamatrix.connector.api.ExecutionContext; = /** * Represents the identity of a connection in the pool. Identities are = @@ -33,11 +32,5 @@ * {@link java.lang.Object#hashCode()} methods. = */ public interface ConnectorIdentity { - = - /** - * Get the security context that was used to create this identity. - * @return The original context - * @deprecated see {@link ExecutionContext#getConnectorIdentity()} - */ - ExecutionContext getSecurityContext(); + = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/pool/C= onnectorIdentityFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/Connect= orIdentityFactory.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/pool/Connect= orIdentityFactory.java 2009-02-16 21:35:21 UTC (rev 474) @@ -22,16 +22,13 @@ = package com.metamatrix.connector.pool; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; = public interface ConnectorIdentityFactory { = /** - * Create an identity object based on a security context. This method= determines - * how different security contexts are treated within the connection p= ool. For = - * example, using a {@link SingleIdentity} specifies that ALL contexts= are treated - * equally and thus use the same pool. + * Create an identity object based on a security context. * = * If single identity is not supported then an exception should be thr= own when a * null context is supplied. Deleted: trunk/connector-api/src/main/java/com/metamatrix/connector/pool/Cr= edentialMap.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/Credent= ialMap.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/pool/Credent= ialMap.java 2009-02-16 21:35:21 UTC (rev 474) @@ -1,379 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.pool; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import com.metamatrix.connector.DataPlugin; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; -import com.metamatrix.core.util.StringUtil; - -/** - * Allows credentials to be passed on a per user basis to a connector. = - * - * A CredentialsMap object is produced based on information provided in th= e JDBC - * URL. The static method parseCredentials() is used for this purpose. - * - * This CredentialMap serves as the session "trusted payload". - * - * It is the responsibility of a Connector to call - * {@link ExecutionContext#getTrustedPayload()} to retrieve the Credential= Map. - * = - * The system name should be the same as the Connector Binding Name retrie= ved from - * {@link ConnectorEnvironment#getConnectorName()}. - * = - * To get the keyword/value pairs use getSystemCredentials(systemName), th= is will - * return a Map that contains the properties for the specified system. - * = - * Specific user and password values can be retrieved with = - * getUser(systemName) and getPassword(systemName) - */ -public class CredentialMap implements Serializable { - //Parsing keywords for system, user, and password. Comparison is done - //ignoring case. - public final static String SYSTEM_KEYWORD =3D "system"; //$NON-NLS-1$ - public final static String USER_KEYWORD =3D "user"; //$NON-NLS-1$ - public final static String PASSWORD_KEYWORD =3D "password"; //$NON-NLS= -1$ - public final static String ESCAPE_CHAR =3D "\\"; //$NON-NLS-1$ - public final static String DEFAULT_SYSTEM =3D "default"; //$NON-NLS-1$ - - private final static String ESCAPE_SLASH =3D "ESCAPE_SLASH"; // forw= ard slash //$NON-NLS-1$ - private final static String ESCAPE_COMMA =3D "ESCAPE_COMMA"; // comma /= /$NON-NLS-1$ - private final static String ESCAPE_EQUAL =3D "ESCAPE_EQUAL"; // equals = //$NON-NLS-1$ -// private final static String ESCAPE_SEMI =3D "ESCAPE_SEMI"; // semico= lon -// private final static String ESCAPE_CLOSE_PAREN =3D "ESCAPE_CLOSE_PAREN"= ; // closing paren - - - private final static String[] escape_chars =3D { - ESCAPE_CHAR + "/", // forwar= d slash //$NON-NLS-1$ - ESCAPE_CHAR + ",", // comma = //$NON-NLS-1$ - ESCAPE_CHAR + "=3D"}; // equ= als //$NON-NLS-1$ -// ESCAPE_CHAR + ";", // semi= colon -// ESCAPE_CHAR + ")"}; // clo= sing paren - - private final static String[] escape_strings =3D { - ESCAPE_SLASH, // forward sl= ash - ESCAPE_COMMA, // comma - ESCAPE_EQUAL }; // equals -// ESCAPE_SEMI, // semicolon -// ESCAPE_CLOSE_PAREN }; // c= losing paren - - /** - * In this mode, the CredentialMap will ignore the default credentials - * and only credentials set for a system will be exposed. This is the = - * default setting for the CredentialMap. - */ - public static final short MODE_IGNORE_DEFAULTS =3D 0; - = - /** - * In this mode, the default credentials will be returned for any syst= em, = - * overlaid with any system-specific credentials. If a system is unkn= own, - * all default credentials are returned for that system. = - */ - public static final short MODE_USE_DEFAULTS_GLOBALLY =3D 1; - = - /** - * In this mode, the default credentials will be returned for any syst= em, - * overlaid with any system-specific credentials. If a system is unkn= own, - * the default credentials are NOT used. = - */ - public static final short MODE_USE_DEFAULTS_ON_EXISTING =3D 2; - - /** - * The map of map of credentials (keyed by system name, upper case). = - */ - private Map map =3D new HashMap(); - = - private short defaultCredentialMode =3D MODE_IGNORE_DEFAULTS; - private Map defaultCredentials; - - - /** - * Method to parse a credentials substring extracted from a JDBC URL. The - * presumed command line syntax is ...;credentials=3D(...);... - * Only the substring starting and ending with the parentheses is passed = to - * this method. That is, the first non-blank character must be a '(' and= the - * last non-blank character must be a ')', or an exception will be thrown. - * - * Syntax is: (credentialspec1/credentialspec2/.../credentialspecn) - * - * Any number one or greater of credential specifications may be included, - * separated by '/' characters. - * - * Each credentials spec will be specified in the following way: - * Keyword-specified, order-independent name-value pairs of the form - * keyword=3Dvalue. The only required keyword is "system", which must = be specified - * for each credentials spec, and must have a value corresponding to the= name of an EIS - * already known to the system. - * - * Ex: system=3Dsys1,user=3Dsys1un,pass=3Dsys1pw, whatever=3Dsomevalue. - * Each of the keywords must be unique. - * - * All blank space is ignored, except within a keyword or value. - * - * Any syntax error will cause an Exception to be thrown. - * - * @param inputStr the string to be parsed; first non-blank must be a '= (', last non-blank must be a ')' - * @return a CredentialMap containing the input - * @throws ConnectorException upon any syntax error; descriptive text = included - */ - public static CredentialMap parseCredentials(String inputStr) throws Conn= ectorException { - - for (int i =3D 0; i < escape_chars.length; i++) { - inputStr =3D StringUtil.replaceAll(inputStr, escape_chars[i], escape_st= rings[i]); - } - - if (inputStr =3D=3D null) { - throw new ConnectorException(DataPlugin.Util.getString("CredentialMap.N= ull_input")); //$NON-NLS-1$ - } - - inputStr =3D inputStr.trim(); - - CredentialMap credentialMap =3D new CredentialMap(); // map of maps keye= d on system - int strLen =3D inputStr.length(); - - //Check that not empty - - if (strLen =3D=3D 0) { - throw new ConnectorException(DataPlugin.Util.getString("CredentialMap.E= mpty_input")); //$NON-NLS-1$ - } - - //Check that first non-blank char is left paren - if (!inputStr.startsWith("(")|| !inputStr.endsWith(")")) { //$NON-NLS-1$= //$NON-NLS-2$ - throw new ConnectorException(DataPlugin.Util.getString("CredentialMap.M= issing_parens")); //$NON-NLS-1$ - } - - // strip of ()'s - inputStr =3D inputStr.substring(1, inputStr.length()-1); - - List credentials =3D StringUtil.getTokens(inputStr, "/"); //$NON-NLS-1$ - Iterator credentialIter =3D credentials.iterator(); - - while (credentialIter.hasNext()) { - String credential =3D (String) credentialIter.next(); - - // Convert the escaped "/" since we already parsed on the "/" - credential =3D StringUtil.replaceAll(credential, escape_strings[0], "/"= ); //$NON-NLS-1$ - - Map newMap =3D getCredentialMap(credential.trim()); - String system =3D (String) newMap.get(SYSTEM_KEYWORD); - if (system =3D=3D null || system.length() =3D=3D 0) { - throw new ConnectorException(DataPlugin.Util.getString("CredentialMap.= Missing_system_prop")); //$NON-NLS-1$ - } - credentialMap.addSystemCredentials(system, newMap); // add to Map of Ma= ps. - } - return credentialMap; - } - - - /** - * Takes a string containing key/value pairs. - * Example "propName1=3DpropValue1,propName2,propValue2,....." - * and returns a map of key/value pairs. - */ - private static Map getCredentialMap(String credential) { - List propList =3D StringUtil.getTokens(credential, ","); //$NON-NLS-1$ - Iterator propIter =3D propList.iterator(); - Map map =3D new HashMap(); - while (propIter.hasNext()) { - String propVal =3D (String) propIter.next(); - List pvList =3D StringUtil.getTokens(propVal, "=3D"); //$NON-NLS-1$ - String key =3D null; - String val =3D null; - if (pvList.size() > 0) { - key =3D (String) pvList.get(0); - key =3D key.trim(); - } - if (pvList.size() > 1) { - val =3D (String) pvList.get(1); - val =3D val.trim(); - // put back the escaped "," and "=3D" since we already parsed on these. - val =3D StringUtil.replaceAll(val, escape_strings[1], ","); //$NON-NLS= -1$ - val =3D StringUtil.replaceAll(val, escape_strings[2], "=3D"); //$NON-N= LS-1$ - } - map.put(key,val); - } - return map; - } - - public CredentialMap() { - super(); - } - - /** - * Method to return an array of systems that have been added to this - * CredentialMap. - * - * @return array of the systems that have been added using addSystemCred= entials() - always uppercase - */ - public String[] getSystems() { - Set keySet =3D map.keySet(); - String[] keys =3D new String[keySet.size()]; - Iterator it =3D keySet.iterator(); - for (int i =3D 0; it.hasNext(); i++) { - keys[i] =3D (String)it.next(); - } - return keys; - } - - /** - * Method to add a user name and credentials (e.g. password) for a system - * - * @param system system name corresponding to the user and credentials - * @param credentials Map containing name/val pairs - */ - public void addSystemCredentials(String system, Map credentials) { - map.put(system.toUpperCase(), credentials); - } - - /** - * Set the default credentials to use with this credential map. See t= he = - * various default credential modes to understand when and how these w= ill - * be returned. - * = - * @param defaultCredentials Map of credentials - * @since 4.3 - */ - public void setDefaultCredentials(Map defaultCredentials) { - this.defaultCredentials =3D defaultCredentials; - } - = - /** - * Set the default credential mode to determine when default credentia= ls should = - * be returned. - * = - * @param mode The mode - * @see #MODE_IGNORE_DEFAULTS - * @see #MODE_USE_DEFAULTS_GLOBALLY - * @see #MODE_USE_DEFAULTS_ON_EXISTING - * @since 4.3 - */ - public void setDefaultCredentialMode(short mode) { - this.defaultCredentialMode =3D mode; - } - = - /** - * Method to return the credentials map for a system - * - * @param systemName system name - * @return Map - */ - public Map getSystemCredentials(String systemName) { - Map systemCredentials =3D (Map)map.get(systemName.toUpperCase()); - = - // If ignoring defaults, return just as is = - if(this.defaultCredentialMode =3D=3D MODE_IGNORE_DEFAULTS) { - return systemCredentials; - } - = - // Pre-load the credential set to return with the defaults if - // 1. defaults exist = - // 2. AND using defaults globally - // 3. OR (using defaults on existing AND system credentials e= xist) = - Map workingMap =3D null; - if(this.defaultCredentials !=3D null && = - (this.defaultCredentialMode =3D=3D MODE_USE_DEFAUL= TS_GLOBALLY || = - (this.defaultCredentialMode =3D=3D= MODE_USE_DEFAULTS_ON_EXISTING && = - systemCredentials !=3D null))) { - = - workingMap =3D new HashMap(); - workingMap.putAll(defaultCredentials); - } - = - // Apply system credentials over the top if they exist - if(systemCredentials !=3D null) { - if(workingMap =3D=3D null) { - workingMap =3D new HashMap(); - } - workingMap.putAll(systemCredentials); - } - = - return workingMap; - } - = - /** - * Get the user property for the specified system, if it exists. The = - * user property is defined by the static constant {@link #USER_KEYWOR= D}. = - * = - * @param systemName The system to look up (case insensitive) - * @return The user name for this system if the system was found and t= he system had a user property = - * @since 4.3 - */ - public String getUser(String systemName) { - Map credentials =3D getSystemCredentials(systemName); - if(credentials !=3D null) { - return (String) credentials.get(USER_KEYWORD); - } - = - return null; - } - - /** - * Get the password property for the specified system, if it exists. = The = - * password property is defined by the static constant {@link #PASSWOR= D_KEYWORD}. = - * = - * @param systemName The system to look up (case insensitive) - * @return The password for this system if the system was found and th= e system had a password property = - * @since 4.3 - */ - public String getPassword(String systemName) { - Map credentials =3D getSystemCredentials(systemName); - if(credentials !=3D null) { - return (String) credentials.get(PASSWORD_KEYWORD); - } - = - return null; - } - - public String toString() { - StringBuffer b =3D new StringBuffer(); - String[] systems =3D this.getSystems(); - for (int i=3D0; i < systems.length; i++) { - String system =3D systems[i]; - Map map =3D this.getSystemCredentials(system); - b.append("\n"); //$NON-NLS-1$ - b.append(system); - b.append("\n"); //$NON-NLS-1$ - Iterator iter =3D map.keySet().iterator(); - while (iter.hasNext()) { - Object key =3D iter.next(); - b.append("\t"); //$NON-NLS-1$ - b.append(key); - b.append("=3D"); //$NON-NLS-1$ - b.append(map.get(key)); - b.append("\n"); //$NON-NLS-1$ - } - } - return b.toString(); - } - -}//end CredentialMap - - Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/pool/P= oolAwareConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/PoolAwa= reConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/pool/PoolAwa= reConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,18 +25,13 @@ package com.metamatrix.connector.pool; = import com.metamatrix.connector.api.Connection; +import com.metamatrix.connector.api.ConnectorException; = /** * Pooled Connections can optionally implement this interface to provide i= mplementations * for Connection testing and pool life-cycle events. */ public interface PoolAwareConnection extends Connection { - - /** - * Called by the pool to determine whether the connection is open - * @return True if open, false if closed or failed. - */ = - boolean isAlive(); = /** * Called by the pool to indicate that the connection was returned to = the pool. @@ -44,4 +39,12 @@ */ void closeCalled(); = + /** + * Called by the pool when an existing connection is leased so that th= e underlying + * Connection may have it's identity switched to a different user. + * @param identity + * @throws ConnectorException + */ + void setConnectorIdentity(ConnectorIdentity identity) throws ConnectorExc= eption; + = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/pool/S= ingleIdentity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/SingleI= dentity.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/pool/SingleI= dentity.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,25 +30,15 @@ * This class represents a single ConnectorIdentity. All the connections a= re treated the same. */ public class SingleIdentity implements ConnectorIdentity { - private ExecutionContext context; = /** * Construct with a context * @param context The context */ public SingleIdentity(ExecutionContext context){ - this.context =3D context; } = /** - * Get the original context - * @return The original context - */ - public ExecutionContext getSecurityContext() { - return this.context; - } - - /** * Return true for everything - all identities are identical. */ public boolean equals(Object obj){ @@ -56,9 +46,6 @@ } = public String toString(){ - if (context !=3D null) { - return "SingleIdentity: atomic-request=3D"+this.context.getReq= uestIdentifier()+"."+this.context.getPartIdentifier()+"."+this.context.getE= xecutionCountIdentifier(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } return "SingleIdentity"; //$NON-NLS-1$ } = = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/pool/S= ingleIdentityFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/SingleI= dentityFactory.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/pool/SingleI= dentityFactory.java 2009-02-16 21:35:21 UTC (rev 474) @@ -22,8 +22,8 @@ = package com.metamatrix.connector.pool; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; = public class SingleIdentityFactory implements ConnectorIdentityFactory { = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/pool/U= serIdentity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/UserIde= ntity.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/pool/UserIde= ntity.java 2009-02-16 21:35:21 UTC (rev 474) @@ -39,13 +39,6 @@ this.context =3D context; } = = - /* - * @see com.metamatrix.data.pool.ConnectorIdentity#getSecurityContext() - */ - public ExecutionContext getSecurityContext() { - return this.context; - } - /** * Implement equals based on the case-insensitive user name. * @param obj Other identity object @@ -58,7 +51,7 @@ = if (obj instanceof UserIdentity) { UserIdentity that =3D (UserIdentity)obj; - return this.context.getUser().toUpperCase().equals(that.contex= t.getUser().toUpperCase()); + return this.context.getUser().equals(that.context.getUser()); } = return false; = @@ -68,7 +61,7 @@ * Get hash code, based on user name */ public int hashCode(){ - return context.getUser().toUpperCase().hashCode(); + return context.getUser().hashCode(); } = = public String toString(){ Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/pool/U= serIdentityFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/UserIde= ntityFactory.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/pool/UserIde= ntityFactory.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,8 +23,8 @@ package com.metamatrix.connector.pool; = import com.metamatrix.connector.DataPlugin; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; = /** * Segregates connections by user. It is assumed that no single identity Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/framework/AbstractLanguageVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/AbstractLanguageVisitor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/AbstractLanguageVisitor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,9 +23,45 @@ package com.metamatrix.connector.visitor.framework; = import java.util.Collection; -import java.util.Iterator; = -import com.metamatrix.connector.language.*; +import com.metamatrix.connector.language.IAggregate; +import com.metamatrix.connector.language.IBatchedUpdates; +import com.metamatrix.connector.language.IBulkInsert; +import com.metamatrix.connector.language.ICaseExpression; +import com.metamatrix.connector.language.ICompareCriteria; +import com.metamatrix.connector.language.ICompoundCriteria; +import com.metamatrix.connector.language.IDelete; +import com.metamatrix.connector.language.IElement; +import com.metamatrix.connector.language.IExistsCriteria; +import com.metamatrix.connector.language.IFrom; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.IGroup; +import com.metamatrix.connector.language.IGroupBy; +import com.metamatrix.connector.language.IInCriteria; +import com.metamatrix.connector.language.IInlineView; +import com.metamatrix.connector.language.IInsert; +import com.metamatrix.connector.language.IIsNullCriteria; +import com.metamatrix.connector.language.IJoin; +import com.metamatrix.connector.language.ILanguageObject; +import com.metamatrix.connector.language.ILikeCriteria; +import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.INotCriteria; +import com.metamatrix.connector.language.IOrderBy; +import com.metamatrix.connector.language.IOrderByItem; +import com.metamatrix.connector.language.IParameter; +import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IQuery; +import com.metamatrix.connector.language.IScalarSubquery; +import com.metamatrix.connector.language.ISearchedCaseExpression; +import com.metamatrix.connector.language.ISelect; +import com.metamatrix.connector.language.ISelectSymbol; +import com.metamatrix.connector.language.ISetClause; +import com.metamatrix.connector.language.ISetClauseList; +import com.metamatrix.connector.language.ISetQuery; +import com.metamatrix.connector.language.ISubqueryCompareCriteria; +import com.metamatrix.connector.language.ISubqueryInCriteria; +import com.metamatrix.connector.language.IUpdate; = /** * Visitor that visits an instance of ILanguageObject and performs an oper= ation @@ -57,10 +93,10 @@ * can be used by subclasses to visit each ILanguageObject in the Coll= ection * @param nodes a Collection of ILanguageObjects */ - public void visitNodes(Collection nodes) { + public void visitNodes(Collection nodes) { if (nodes !=3D null && nodes.size() > 0) { - for (Iterator i =3D nodes.iterator(); i.hasNext();) { - visitNode((ILanguageObject)i.next()); + for (ILanguageObject node : nodes) { + visitNode(node); } } } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/framework/HierarchyVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/HierarchyVisitor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/HierarchyVisitor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -250,8 +250,4 @@ visitNode(obj.getValue()); } = - public void reset() { - - } - } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/util/CollectorVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /CollectorVisitor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /CollectorVisitor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -33,27 +33,22 @@ * tree. Each visit method does an instanceof method to check whether the= object * is of the expected type. */ -public class CollectorVisitor implements LanguageObjectVisitor { +public class CollectorVisitor implements LanguageObjectVisitor { = - private Class type; - private Collection objects; + private Class type; + private Collection objects =3D new ArrayList(); = - public CollectorVisitor(Class type) { + public CollectorVisitor(Class type) { this.type =3D type; - reset(); } = - public void reset() { - objects=3D new ArrayList(); - } - private void checkInstance(ILanguageObject obj) { if(type.isInstance(obj)) { - this.objects.add(obj); + this.objects.add((T)obj); } } = - public Collection getCollectedObjects() { + public Collection getCollectedObjects() { return this.objects; } = @@ -314,8 +309,8 @@ * @param object Root of the language object tree * @return Collection of ILanguageObject of the specified type */ - public static Collection collectObjects(Class type, ILanguageObject ob= ject) { - CollectorVisitor visitor =3D new CollectorVisitor(type); + public static Collection collectObjects(Class type, ILanguag= eObject object) { + CollectorVisitor visitor =3D new CollectorVisitor(type); DelegatingHierarchyVisitor hierarchyVisitor =3D new DelegatingHier= archyVisitor(visitor, null); object.acceptVisitor(hierarchyVisitor); return visitor.getCollectedObjects(); @@ -328,7 +323,7 @@ * @param object Root of the language object tree * @return Collection of IElement of the specified type */ - public static Collection collectElements(ILanguageObject object) { + public static Collection collectElements(ILanguageObject obj= ect) { return CollectorVisitor.collectObjects(IElement.class, object); } = @@ -339,7 +334,7 @@ * @param object Root of the language object tree * @return Collection of IGroup of the specified type */ - public static Collection collectGroups(ILanguageObject object) { + public static Collection collectGroups(ILanguageObject object)= { return CollectorVisitor.collectObjects(IGroup.class, object); } = @@ -350,17 +345,13 @@ * @param object Root of the language object tree * @return Set of IGroup */ - public static Set collectGroupsUsedByElements(ILanguageObject object) { - Collection elements =3D CollectorVisitor.collectElements(object); = = - Set groups =3D new HashSet(); - Iterator iter =3D elements.iterator(); - while(iter.hasNext()) { - IElement element =3D (IElement) iter.next(); + public static Set collectGroupsUsedByElements(ILanguageObject = object) { + Set groups =3D new HashSet(); + for (IElement element : CollectorVisitor.collectElements(object)) { if(element.getGroup() !=3D null) { groups.add(element.getGroup()); } } - = return groups; } = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/util/SQLStringVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /SQLStringVisitor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /SQLStringVisitor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,7 @@ import java.util.List; = import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IAggregate; import com.metamatrix.connector.language.IBulkInsert; import com.metamatrix.connector.language.ICaseExpression; @@ -69,6 +69,7 @@ import com.metamatrix.connector.language.ISubqueryCompareCriteria; import com.metamatrix.connector.language.ISubqueryInCriteria; import com.metamatrix.connector.language.IUpdate; +import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; @@ -131,7 +132,7 @@ * by creating a comma-separated list. * @param items a list of ILanguageObjects */ - protected void append(List items) { + protected void append(List items) { if (items !=3D null && items.size() !=3D 0) { append((ILanguageObject)items.get(0)); for (int i =3D 1; i < items.size(); i++) { @@ -276,14 +277,13 @@ append(obj.getLeftExpression()); buffer.append(SPACE); = - final int op =3D obj.getOperator(); - switch(op) { - case ICompareCriteria.EQ: buffer.append(EQ); break; - case ICompareCriteria.GE: buffer.append(GE); break; - case ICompareCriteria.GT: buffer.append(GT); break; - case ICompareCriteria.LE: buffer.append(LE); break; - case ICompareCriteria.LT: buffer.append(LT); break; - case ICompareCriteria.NE: buffer.append(NE); break; + switch(obj.getOperator()) { + case EQ: buffer.append(EQ); break; + case GE: buffer.append(GE); break; + case GT: buffer.append(GT); break; + case LE: buffer.append(LE); break; + case LT: buffer.append(LT); break; + case NE: buffer.append(NE); break; default: buffer.append(UNDEFINED); } buffer.append(SPACE); @@ -295,10 +295,9 @@ */ public void visit(ICompoundCriteria obj) { String opString =3D null; - final int op =3D obj.getOperator(); - switch(op) { - case ICompoundCriteria.AND: opString =3D AND; break; - case ICompoundCriteria.OR: opString =3D OR; break; + switch(obj.getOperator()) { + case AND: opString =3D AND; break; + case OR: opString =3D OR; break; default: opString =3D UNDEFINED; } = @@ -446,7 +445,7 @@ IParameter param =3D null; for (int i =3D 0; i < params.size(); i++) { param =3D (IParameter)params.get(i); - if (param.getDirection() =3D=3D IParameter.IN || param.get= Direction() =3D=3D IParameter.INOUT) { + if (param.getDirection() =3D=3D Direction.IN || param.getD= irection() =3D=3D Direction.INOUT) { if (i !=3D 0) { buffer.append(COMMA) .append(SPACE); @@ -745,25 +744,24 @@ } buffer.append(SPACE); = - final int type =3D obj.getJoinType(); - switch(type) { - case IJoin.CROSS_JOIN: + switch(obj.getJoinType()) { + case CROSS_JOIN: buffer.append(CROSS); break; - case IJoin.FULL_OUTER_JOIN: + case FULL_OUTER_JOIN: buffer.append(FULL) .append(SPACE) .append(OUTER); break; - case IJoin.INNER_JOIN: + case INNER_JOIN: buffer.append(INNER); break; - case IJoin.LEFT_OUTER_JOIN: + case LEFT_OUTER_JOIN: buffer.append(LEFT) .append(SPACE) .append(OUTER); break; - case IJoin.RIGHT_OUTER_JOIN: + case RIGHT_OUTER_JOIN: buffer.append(RIGHT) .append(SPACE) .append(OUTER); @@ -1053,28 +1051,25 @@ append(obj.getLeftExpression()); buffer.append(SPACE); = - final int op =3D obj.getOperator(); - switch(op) { - case ISubqueryCompareCriteria.EQ: buffer.append(EQ); break; - case ISubqueryCompareCriteria.GE: buffer.append(GE); break; - case ISubqueryCompareCriteria.GT: buffer.append(GT); break; - case ISubqueryCompareCriteria.LE: buffer.append(LE); break; - case ISubqueryCompareCriteria.LT: buffer.append(LT); break; - case ISubqueryCompareCriteria.NE: buffer.append(NE); break; + switch(obj.getOperator()) { + case EQ: buffer.append(EQ); break; + case GE: buffer.append(GE); break; + case GT: buffer.append(GT); break; + case LE: buffer.append(LE); break; + case LT: buffer.append(LT); break; + case NE: buffer.append(NE); break; default: buffer.append(UNDEFINED); } buffer.append(SPACE); switch(obj.getQuantifier()) { - case ISubqueryCompareCriteria.ALL: buffer.append(ALL); break; - case ISubqueryCompareCriteria.SOME: buffer.append(SOME); break; + case ALL: buffer.append(ALL); break; + case SOME: buffer.append(SOME); break; default: buffer.append(UNDEFINED); } buffer.append(SPACE); buffer.append(LPAREN); = append(obj.getQuery()); buffer.append(RPAREN); = - - } = /* = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api= /XAConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XACon= nection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XACon= nection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,7 +27,7 @@ import javax.transaction.xa.XAResource; = import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public interface XAConnection extends Connection{ /** Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api= /XAConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XACon= nector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XACon= nector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,7 +25,6 @@ package com.metamatrix.connector.xa.api; = import com.metamatrix.connector.api.*; -import com.metamatrix.connector.exception.ConnectorException; = = public interface XAConnector extends Connector{ @@ -36,7 +35,8 @@ * with a particular security context. The connection is assumed to be= pooled in = * the underlying source if pooling is necessary - the connection will= be closed = * when execution has completed against it. = - * @param executionContext The context of the current MetaMatrix user = that will be using this connection + * @param context The context of the current user that will be using t= his connection, = + * may be null if this connection is for an administrative operation. = * @param transactionContext The context of the transaction under whic= h the connection will be used. May be null. * @return A Connection, created by the Connector * @throws ConnectorException If an error occurred obtaining a connect= ion Modified: trunk/connector-api/src/test/java/com/metamatrix/data/pool/TestCr= edentialMap.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/test/java/com/metamatrix/data/pool/TestCredenti= alMap.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/test/java/com/metamatrix/data/pool/TestCredenti= alMap.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; = -import com.metamatrix.connector.pool.CredentialMap; +import com.metamatrix.connector.api.CredentialMap; = import junit.framework.TestCase; = Modified: trunk/connector-api/src/test/java/com/metamatrix/data/transform/T= estBasicValueTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/test/java/com/metamatrix/data/transform/TestBas= icValueTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-api/src/test/java/com/metamatrix/data/transform/TestBas= icValueTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,10 +26,10 @@ = import org.mockito.Mockito; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.basic.BasicValueTranslator; -import com.metamatrix.connector.exception.ConnectorException; = = /** = @@ -39,7 +39,7 @@ = = public void testExceptionFromTransform() throws Exception { - BasicValueTranslator adaptor =3D new BasicValueTranslator(String.clas= s, Short.class, new FakeTypeFacility()); + BasicValueTranslator adaptor =3D BasicValueTranslator.= createTranslator(String.class, Short.class, new FakeTypeFacility()); try { adaptor.translate("mmuuid:blah", Mockito.mock(ExecutionContext= .class)); //$NON-NLS-1$ fail("exceptoin expected"); //$NON-NLS-1$ Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/IndexConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/IndexConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/IndexConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,9 +23,9 @@ package com.metamatrix.connector.metadata; = import com.metamatrix.api.exception.MetaMatrixComponentException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.metadata.adapter.ObjectConnector; import com.metamatrix.connector.metadata.internal.IObjectSource; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/MetadataProcedureExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/MetadataProcedureExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/MetadataProcedureExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,12 +25,13 @@ import java.util.Iterator; import java.util.List; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.internal.IObjectSource; import com.metamatrix.connector.metadata.internal.ObjectProcedure; import com.metamatrix.connector.metadata.internal.ObjectProcedureProcessor; @@ -89,7 +90,7 @@ * @since 4.2 */ public Object getOutputValue(final IParameter parameter) throws Connec= torException { - if(parameter.getDirection() !=3D IParameter.OUT && parameter.getDi= rection() !=3D IParameter.INOUT && parameter.getDirection() !=3D IParamete= r.RETURN){ + if(parameter.getDirection() !=3D Direction.OUT && parameter.getDir= ection() !=3D Direction.INOUT && parameter.getDirection() !=3D Direction.R= ETURN){ throw new ConnectorException(MetadataConnectorPlugin.Util.getS= tring("ObjectProcedureExecution.0")); //$NON-NLS-1$ } //TODO: Output parameters are not currently handled Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/adapter/ObjectConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,11 +23,11 @@ package com.metamatrix.connector.metadata.adapter; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.IQueryCommand; Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/adapter/ObjectConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,8 +26,8 @@ import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.metadata.internal.IObjectSource; = /** Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/adapter/ObjectSynchExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectSynchExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectSynchExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,10 +25,10 @@ import java.util.Iterator; import java.util.List; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.MetadataConnectorPlugin; import com.metamatrix.connector.metadata.internal.IObjectQuery; Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/internal/MetadataSearchCriteriaBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/MetadataSearchCriteriaBuilder.java 2009-02-16 18:56:03 UTC (rev = 473) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/MetadataSearchCriteriaBuilder.java 2009-02-16 21:35:21 UTC (rev = 474) @@ -29,7 +29,7 @@ import java.util.Map; = import com.metamatrix.api.exception.query.CriteriaEvaluationException; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICompoundCriteria; import com.metamatrix.connector.language.ICriteria; @@ -39,6 +39,7 @@ import com.metamatrix.connector.language.ILikeCriteria; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IQuery; +import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.metadata.MetadataConnectorConstants; import com.metamatrix.connector.metadata.MetadataConnectorPlugin; import com.metamatrix.connector.metadata.index.MetadataInCriteria; @@ -195,7 +196,7 @@ * @since 4.3 */ private void buildMetadataCompareCriteria(ICompareCriteria criteria) t= hrows ConnectorException { - Assertion.assertTrue(criteria.getOperator() =3D=3D ICompareCriteri= a.EQ, "Only supports equals."); //$NON-NLS-1$ + Assertion.assertTrue(criteria.getOperator() =3D=3D Operator.EQ, "O= nly supports equals."); //$NON-NLS-1$ = = IExpression ltExpression =3D criteria.getLeftExpression(); @@ -283,7 +284,7 @@ * @since 4.3 */ private void buildMetadataCompoundCriteria(ICompoundCriteria compoundC= riteria) throws ConnectorException { - if (compoundCriteria.getOperator() =3D=3D ICompoundCriteria.AND) { + if (compoundCriteria.getOperator() =3D=3D com.metamatrix.connector= .language.ICompoundCriteria.Operator.AND) { for(final Iterator critIter =3D compoundCriteria.getCriteria()= .iterator(); critIter.hasNext();) { buildMetadataSearchCriteria((ICriteria)critIter.next()); } Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/internal/ObjectProcedure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/ObjectProcedure.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/ObjectProcedure.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,11 +29,12 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IMetadataReference; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.MetadataConnectorConstants; import com.metamatrix.connector.metadata.MetadataConnectorPlugin; import com.metamatrix.connector.metadata.index.MetadataLiteralCriteria; @@ -101,11 +102,11 @@ for(final Iterator iter =3D parameters.iterator(); iter.hasNex= t();) { IParameter parameter =3D (IParameter) iter.next(); // if there is one result set parameter - if(parameter.getDirection() =3D=3D IParameter.RESULT_SET) { + if(parameter.getDirection() =3D=3D Direction.RESULT_SET) { this.resultSetParameter =3D parameter; initResultSet(); } - if(parameter.getDirection() =3D=3D IParameter.IN || parame= ter.getDirection() =3D=3D IParameter.INOUT) { + if(parameter.getDirection() =3D=3D Direction.IN || paramet= er.getDirection() =3D=3D Direction.INOUT) { inParams.add(parameter); } = } Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/internal/ObjectProcedureProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/ObjectProcedureProcessor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/ObjectProcedureProcessor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -36,7 +36,7 @@ import com.metamatrix.common.types.ClobType; import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.common.vdb.api.VDBFile; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.MetadataConnectorConstants; import com.metamatrix.connector.metadata.ResultsIterator; import com.metamatrix.core.util.ArgCheck; Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/internal/ObjectQuery.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/ObjectQuery.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/ObjectQuery.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IExpression; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/TestIndexConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/TestIndexConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/TestIndexConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -36,10 +36,10 @@ import com.metamatrix.common.application.ApplicationService; import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.adapter.ObjectConnector; import com.metamatrix.connector.metadata.internal.IObjectSource; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/adapter/FakeObjectConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/adapter/FakeObjectConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/adapter/FakeObjectConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,8 +26,8 @@ import java.util.List; import java.util.Map; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.metadata.internal.IObjectSource; = public class FakeObjectConnector extends ObjectConnector { Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/adapter/TestObjectConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/adapter/TestObjectConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/adapter/TestObjectConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -33,9 +33,9 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.MetaMatrixRuntimeException; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/internal/FakeRuntimeMetadata.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/FakeRuntimeMetadata.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/FakeRuntimeMetadata.java 2009-02-16 21:35:21 UTC (rev 474) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.metadata.internal; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/internal/TestConnectorHost.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestConnectorHost.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestConnectorHost.java 2009-02-16 21:35:21 UTC (rev 474) @@ -32,7 +32,7 @@ import com.metamatrix.cdk.IConnectorHost; import com.metamatrix.cdk.api.ConnectorHost; import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.IndexConnector; import com.metamatrix.dqp.service.DQPServiceNames; import com.metamatrix.metadata.runtime.FakeMetadataService; Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShe= llCommandTarget.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShellComm= andTarget.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShellComm= andTarget.java 2009-02-16 21:35:21 UTC (rev 474) @@ -54,7 +54,7 @@ import com.metamatrix.common.config.xml.XMLConfigurationImportExportUtilit= y; import com.metamatrix.common.util.ByteArrayHelper; import com.metamatrix.connector.api.Connector; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IQuery; Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/IConnectorHo= st.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/IConnectorHost.jav= a 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/IConnectorHost.jav= a 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,7 @@ import java.util.List; import java.util.Properties; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICommand; = /** Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/Connecto= rHost.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.= java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.= java 2009-02-16 21:35:21 UTC (rev 474) @@ -35,12 +35,12 @@ import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.Execution; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCBaseExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCBaseExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCBaseExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -33,10 +33,10 @@ import java.util.Properties; = import com.metamatrix.common.util.PropertiesUtils; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.extension.ResultsTranslator; import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; @@ -283,7 +283,7 @@ if (logger.isDetailEnabled()) { logger.logDetail(context.getRequestIdentifier() + " Warning: ", war= ning); //$NON-NLS-1$ } - addWarning(toAdd); + context.addWarning(toAdd); } this.statement.clearWarnings(); } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,10 +28,10 @@ import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.pool.ConnectorIdentity; import com.metamatrix.connector.pool.ConnectorIdentityFactory; = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCProcedureExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCProcedureExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCProcedureExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -33,11 +33,11 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.extension.ResultsTranslator; import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; @@ -46,6 +46,7 @@ import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; @@ -124,7 +125,7 @@ Iterator iter =3D params.iterator(); while(iter.hasNext()){ IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() =3D=3D IParameter.RESULT_SET){ + if(param.getDirection() =3D=3D Direction.RESULT_SET){ resultSet =3D param; break; } @@ -164,7 +165,7 @@ Iterator iter =3D parameters.iterator(); while(iter.hasNext()){ IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() =3D=3D IParameter.RETURN){ + if(param.getDirection() =3D=3D Direction.RETURN){ paramsIndexes.put(param, new Integer(index++)); break; } @@ -173,7 +174,7 @@ iter =3D parameters.iterator(); while(iter.hasNext()){ IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() !=3D IParameter.RESULT_SET && param.ge= tDirection() !=3D IParameter.RETURN){ + if(param.getDirection() !=3D Direction.RESULT_SET && param.get= Direction() !=3D Direction.RETURN){ paramsIndexes.put(param, new Integer(index++)); } } @@ -184,7 +185,7 @@ * @see com.metamatrix.data.ProcedureExecution#getOutputValue(com.meta= matrix.data.language.IParameter) */ public Object getOutputValue(IParameter parameter) throws ConnectorExc= eption { - if(parameter.getDirection() !=3D IParameter.OUT && parameter.getDi= rection() !=3D IParameter.INOUT && parameter.getDirection() !=3D IParamete= r.RETURN){ + if(parameter.getDirection() !=3D Direction.OUT && parameter.getDir= ection() !=3D Direction.INOUT && parameter.getDirection() !=3D Direction.R= ETURN){ throw new ConnectorException(JDBCPlugin.Util.getString("JDBCPr= ocedureExecution.The_parameter_direction_must_be_out_or_inout_1")); //$NON-= NLS-1$ } = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCQueryExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCQueryExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCQueryExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -38,13 +38,13 @@ import java.util.TimeZone; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.api.ValueTranslator; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.extension.ResultsTranslator; import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCSingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSingleIdentityConnectionFactory.java 2009-02-16 18:56:03 UTC (rev = 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSingleIdentityConnectionFactory.java 2009-02-16 21:35:21 UTC (rev = 474) @@ -30,9 +30,9 @@ = import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.pool.SingleIdentityFactory; = /** Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCSourceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSourceConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSourceConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,13 +28,13 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.UpdateExecution; import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.extension.ResultsTranslator; import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.language.ICommand; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCSourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSourceConnectionFactory.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSourceConnectionFactory.java 2009-02-16 21:35:21 UTC (rev 474) @@ -32,8 +32,8 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.internal.ConnectorPropertyNames; import com.metamatrix.connector.pool.ConnectorIdentity; import com.metamatrix.connector.pool.ConnectorIdentityFactory; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCUpdateExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCUpdateExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCUpdateExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,11 +29,11 @@ import java.util.List; import java.util.Properties; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.extension.ResultsTranslator; import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCUserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCUserIdentityConnectionFactory.java 2009-02-16 18:56:03 UTC (rev 47= 3) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCUserIdentityConnectionFactory.java 2009-02-16 21:35:21 UTC (rev 47= 4) @@ -27,9 +27,9 @@ = import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; -import com.metamatrix.connector.pool.CredentialMap; import com.metamatrix.connector.pool.UserIdentityFactory; = /** Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/access/AccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/access/AccessSQLTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/access/AccessSQLTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,7 +27,7 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/db2/DB2ConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2ConvertModifier.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2ConvertModifier.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,6 +30,7 @@ import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; import com.metamatrix.connector.language.*; +import com.metamatrix.connector.language.ICompareCriteria.Operator; = /** */ @@ -127,7 +128,7 @@ // AFTER: CASE WHEN booleanExpression =3D 0 THEN 'false' ELSE= 'true' END = ILiteral literalZero =3D this.langFactory.createLiteral(new In= teger(0), TypeFacility.RUNTIME_TYPES.INTEGER); - ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(ICompareCriteria.EQ, expression, literalZero); + ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(Operator.EQ, expression, literalZero); List whens =3D new ArrayList(1); whens.add(when); = @@ -167,7 +168,7 @@ // BEFORE: convert(stringExpression, boolean) // AFTER: CASE WHEN stringExpression =3D 'true' THEN 1 ELSE 0= END ILiteral literalTrue =3D this.langFactory.createLiteral("true"= , TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(ICompareCriteria.EQ, expression, literalTrue); + ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(Operator.EQ, expression, literalTrue); List whens =3D new ArrayList(1); whens.add(when); = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/db2/DB2SQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLConversionVisitor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLConversionVisitor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,6 +26,7 @@ import com.metamatrix.connector.language.IFromItem; import com.metamatrix.connector.language.IJoin; import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.IJoin.JoinType; = /** = * @since 4.3 @@ -73,8 +74,7 @@ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IJoin) */ public void visit(IJoin obj) { - final int type =3D obj.getJoinType(); - if(type !=3D IJoin.CROSS_JOIN) { + if(obj.getJoinType() !=3D JoinType.CROSS_JOIN) { super.visit(obj); return; } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/db2/DB2SQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,8 +28,8 @@ import java.util.Map; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/derby/DerbyConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyConvertModifier.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyConvertModifier.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,6 +30,7 @@ import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; import com.metamatrix.connector.language.*; +import com.metamatrix.connector.language.ICompareCriteria.Operator; = /** */ @@ -146,7 +147,7 @@ // AFTER: CASE WHEN booleanExpression =3D 0 THEN 'false' ELSE= 'true' END = ILiteral literalZero =3D this.langFactory.createLiteral(new In= teger(0), TypeFacility.RUNTIME_TYPES.INTEGER); - ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(ICompareCriteria.EQ, expression, literalZero); + ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(Operator.EQ, expression, literalZero); List whens =3D new ArrayList(1); whens.add(when); = @@ -186,7 +187,7 @@ // BEFORE: convert(stringExpression, boolean) // AFTER: CASE WHEN stringExpression =3D 'true' THEN 1 ELSE 0= END ILiteral literalTrue =3D this.langFactory.createLiteral("true"= , TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(ICompareCriteria.EQ, expression, literalTrue); + ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(Operator.EQ, expression, literalTrue); List whens =3D new ArrayList(1); whens.add(when); = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/derby/DerbySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbySQLTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbySQLTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,7 +27,7 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/extension/ResultsTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/ResultsTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/ResultsTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -33,9 +33,9 @@ import java.util.TimeZone; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; = /** Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/extension/SQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/SQLConversionVisitor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/SQLConversionVisitor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -52,6 +52,7 @@ import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.IUpdate; +import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.visitor.util.SQLStringVisitor; = /** @@ -393,7 +394,7 @@ Iterator iter =3D params.iterator(); while(iter.hasNext()){ IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() =3D=3D IParameter.RETURN){ + if(param.getDirection() =3D=3D Direction.RETURN){ needQuestionMark =3D true; break; } @@ -413,7 +414,7 @@ iter =3D params.iterator(); while(iter.hasNext()){ IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() =3D=3D IParameter.IN || param.getDirec= tion() =3D=3D IParameter.OUT || param.getDirection() =3D=3D IParameter.INOU= T){ + if(param.getDirection() =3D=3D Direction.IN || param.getDirect= ion() =3D=3D Direction.OUT || param.getDirection() =3D=3D Direction.INOUT){ if(numberOfParameters > 0){ prepareCallBuffer.append(","); //$NON-NLS-1$ } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/extension/SQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/SQLTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/SQLTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,8 +27,8 @@ import java.util.Map; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/extension/TranslatedCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/TranslatedCommand.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/TranslatedCommand.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,14 +24,12 @@ */ package com.metamatrix.connector.jdbc.extension; = -import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Map; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ILiteral; @@ -131,10 +129,7 @@ * @return */ private boolean hasBindValue(ICommand command) { - Collection literals =3D CollectorVisitor.collectObjects(ILiteral.c= lass, command); - = - for (Iterator i =3D literals.iterator(); i.hasNext();) { - ILiteral l =3D (ILiteral)i.next(); + for (ILiteral l : CollectorVisitor.collectObjects(ILiteral.class, = command)) { if (l.isBindValue() || isBindEligible(l)) { return true; } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/extension/impl/BasicResultsTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/impl/BasicResultsTranslator.java 2009-02-16 18:56:03 UTC (re= v 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/impl/BasicResultsTranslator.java 2009-02-16 21:35:21 UTC (re= v 474) @@ -36,9 +36,9 @@ import java.util.TimeZone; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.internal.ConnectorPropertyNames; import com.metamatrix.connector.jdbc.JDBCPropertyNames; import com.metamatrix.connector.jdbc.extension.ResultsTranslator; @@ -46,6 +46,7 @@ import com.metamatrix.connector.jdbc.extension.ValueRetriever; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IParameter; +import com.metamatrix.connector.language.IParameter.Direction; = /** */ @@ -110,7 +111,7 @@ Iterator iter =3D params.iterator(); while(iter.hasNext()){ IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() =3D=3D IParameter.RETURN){ + if(param.getDirection() =3D=3D Direction.RETURN){ registerSpecificTypeOfOutParameter(statement,param, index+= +); } } @@ -121,13 +122,13 @@ while(iter.hasNext()){ IParameter param =3D (IParameter)iter.next(); = - if(param.getDirection() =3D=3D IParameter.INOUT){ + if(param.getDirection() =3D=3D Direction.INOUT){ registerSpecificTypeOfOutParameter(statement,param, index); - }else if(param.getDirection() =3D=3D IParameter.OUT){ + }else if(param.getDirection() =3D=3D Direction.OUT){ registerSpecificTypeOfOutParameter(statement,param, index+= +); } = - if(param.getDirection() =3D=3D IParameter.IN || param.getDirec= tion() =3D=3D IParameter.INOUT){ + if(param.getDirection() =3D=3D Direction.IN || param.getDirect= ion() =3D=3D Direction.INOUT){ bindValue(statement, param.getValue(), param.getType(), in= dex++, cal); } } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/extension/impl/BasicSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/impl/BasicSQLTranslator.java 2009-02-16 18:56:03 UTC (rev 47= 3) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/impl/BasicSQLTranslator.java 2009-02-16 21:35:21 UTC (rev 47= 4) @@ -29,8 +29,8 @@ import java.util.TimeZone; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.JDBCPropertyNames; import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.extension.SQLTranslator; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/informix/InformixSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixSQLTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixSQLTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,7 +27,7 @@ import java.util.*; = import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.extension.impl.*; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/mysql/MySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,7 +27,7 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/ConcatFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ConcatFunctionModifier.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ConcatFunctionModifier.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,12 +28,12 @@ = import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.language.ICompoundCriteria; import com.metamatrix.connector.language.ICriteria; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.ICompoundCriteria.Operator; = = /** @@ -81,7 +81,7 @@ } else if (crits.size() =3D=3D 1) { crit =3D (ICriteria)crits.get(0); } else { - crit =3D langFactory.createCompoundCriteria(ICompoundCriteria.OR,= crits); + crit =3D langFactory.createCompoundCriteria(Operator.OR, crits); } when.add(crit); List then =3D Arrays.asList(new IExpression[] {nullValue}); = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/OracleConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleConvertModifier.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleConvertModifier.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,9 +25,9 @@ import java.util.Iterator; import java.util.List; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.extension.FunctionModifier; import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/OracleSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLConversionVisitor.java 2009-02-16 18:56:03 UTC (rev 47= 3) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLConversionVisitor.java 2009-02-16 21:35:21 UTC (rev 47= 4) @@ -27,8 +27,8 @@ import java.sql.Time; import java.util.Iterator; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.IElement; @@ -143,14 +143,13 @@ append(leftExpression); buffer.append(SPACE); = - final int op =3D obj.getOperator(); - switch(op) { - case ICompareCriteria.EQ: buffer.append(EQ); break; - case ICompareCriteria.GE: buffer.append(GE); break; - case ICompareCriteria.GT: buffer.append(GT); break; - case ICompareCriteria.LE: buffer.append(LE); break; - case ICompareCriteria.LT: buffer.append(LT); break; - case ICompareCriteria.NE: buffer.append(NE); break; + switch(obj.getOperator()) { + case EQ: buffer.append(EQ); break; + case GE: buffer.append(GE); break; + case GT: buffer.append(GT); break; + case LE: buffer.append(LE); break; + case LT: buffer.append(LT); break; + case NE: buffer.append(NE); break; } buffer.append(SPACE); = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/OracleSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -35,18 +35,17 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICompoundCriteria; import com.metamatrix.connector.language.ICriteria; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IFrom; +import com.metamatrix.connector.language.IFromItem; import com.metamatrix.connector.language.IGroup; import com.metamatrix.connector.language.IInlineView; import com.metamatrix.connector.language.ILanguageFactory; @@ -59,6 +58,7 @@ import com.metamatrix.connector.language.ISelect; import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.connector.language.ISetQuery; +import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.visitor.util.CollectorVisitor; import com.metamatrix.connector.visitor.util.SQLStringVisitor; @@ -129,20 +129,20 @@ IGroup group =3D languageFactory.createGroup(INLINE_VIEW_ALIAS= , null, null); IElement eleRowNum =3D languageFactory.createElement(ROWNUM_AL= IAS, group, null, TypeFacility.RUNTIME_TYPES.INTEGER); ILiteral litOffset =3D languageFactory.createLiteral(new Integ= er( limit.getRowOffset() ), TypeFacility.RUNTIME_TYPES.INTEGER); - ICriteria criteria =3D languageFactory.createCompareCriteria(I= CompareCriteria.GT, eleRowNum, litOffset); + ICriteria criteria =3D languageFactory.createCompareCriteria(O= perator.GT, eleRowNum, litOffset); lstCriteria.add( criteria ); } = IGroup group =3D languageFactory.createGroup(INLINE_VIEW_ALIAS, nu= ll, null); IElement eleRowNum =3D languageFactory.createElement(ROWNUM_ALIAS,= group, null, TypeFacility.RUNTIME_TYPES.INTEGER); ILiteral litLimit =3D languageFactory.createLiteral(new Integer( l= imit.getRowOffset() + limit.getRowLimit() ),TypeFacility.RUNTIME_TYPES.INTE= GER); - ICriteria criteria =3D languageFactory.createCompareCriteria(IComp= areCriteria.LE, eleRowNum, litLimit); + ICriteria criteria =3D languageFactory.createCompareCriteria(Opera= tor.LE, eleRowNum, litLimit); lstCriteria.add( criteria ); = if ( lstCriteria.size() =3D=3D 1 ) { criteria =3D lstCriteria.get( 0 ); } else { - criteria =3D languageFactory.createCompoundCriteria(ICompoundC= riteria.AND, lstCriteria ); + criteria =3D languageFactory.createCompoundCriteria(com.metama= trix.connector.language.ICompoundCriteria.Operator.AND, lstCriteria ); } = IQuery intermediate =3D createLimitQuery(command, null, true); @@ -167,7 +167,7 @@ ICriteria criteria, boolean alias) { IInlineView view =3D languageFactory.createInlineView(query, INLIN= E_VIEW_ALIAS); = - IFrom from =3D languageFactory.createFrom(Arrays.asList(new Object= [] {view})); + IFrom from =3D languageFactory.createFrom(Arrays.asList(new IFromI= tem[] {view})); = LinkedHashMap> names =3D new LinkedHashMap>(); = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/postgresql/PostgreSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,7 +27,7 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/sqlserver/SqlServerSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerSQLTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerSQLTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,7 +29,7 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/ssl/JDBCSequeLinkSingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ssl/JDBCSequeLinkSingleIdentityConnectionFactory.java 2009-02-16 18:56= :03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ssl/JDBCSequeLinkSingleIdentityConnectionFactory.java 2009-02-16 21:35= :21 UTC (rev 474) @@ -32,7 +32,7 @@ import java.sql.SQLException; import java.util.Properties; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.ConnectionQueryStrategy; import com.metamatrix.connector.jdbc.ConnectionStrategy; import com.metamatrix.connector.jdbc.JDBCPropertyNames; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/sybase/SybaseSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseSQLTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseSQLTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,7 +29,7 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/util/JDBCExecutionHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/util/JDBCExecutionHelper.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/util/JDBCExecutionHelper.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,11 +27,11 @@ import java.util.Iterator; import java.util.List; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.api.ValueTranslator; import com.metamatrix.connector.basic.BasicValueTranslator; -import com.metamatrix.connector.exception.ConnectorException; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/xa/JDBCSingleIdentityDSConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/JDBCSingleIdentityDSConnectionFactory.java 2009-02-16 18:56:03 UTC = (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/JDBCSingleIdentityDSConnectionFactory.java 2009-02-16 21:35:21 UTC = (rev 474) @@ -34,8 +34,8 @@ import javax.sql.XAConnection; import javax.sql.XADataSource; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.JDBCPlugin; import com.metamatrix.connector.jdbc.JDBCPropertyNames; import com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/xa/JDBCSourceXAConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/JDBCSourceXAConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/JDBCSourceXAConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -32,7 +32,7 @@ import javax.transaction.xa.XAResource; = import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.ConnectionListener; import com.metamatrix.connector.jdbc.ConnectionStrategy; import com.metamatrix.connector.jdbc.JDBCSourceConnection; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/xa/JDBCXAConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/JDBCXAConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/JDBCXAConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,9 +29,9 @@ = import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.JDBCConnector; import com.metamatrix.connector.jdbc.JDBCPropertyNames; import com.metamatrix.connector.xa.api.TransactionContext; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/access/TestAccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/access/TestAccessSQLTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/access/TestAccessSQLTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,7 +28,7 @@ = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; import com.metamatrix.connector.language.ICommand; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/db2/TestDB2SqlTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/db2/TestDB2SqlTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/db2/TestDB2SqlTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,8 +30,8 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; import com.metamatrix.connector.language.ICommand; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/mysql/TestMySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/mysql/TestMySQLTranslator.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/mysql/TestMySQLTranslator.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,7 +28,7 @@ import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.MetadataFactory; import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/postgresql/TestPostgreSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/postgresql/TestPostgreSQLTranslator.java 2009-02-16 18:56:03 UTC (rev = 473) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/postgresql/TestPostgreSQLTranslator.java 2009-02-16 21:35:21 UTC (rev = 474) @@ -28,7 +28,7 @@ import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.MetadataFactory; import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/sqlserver/TestSqlServerConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sqlserver/TestSqlServerConversionVisitor.java 2009-02-16 18:56:03 UTC = (rev 473) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sqlserver/TestSqlServerConversionVisitor.java 2009-02-16 21:35:21 UTC = (rev 474) @@ -29,7 +29,7 @@ = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.MetadataFactory; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/sybase/TestSybaseSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestSybaseSQLConversionVisitor.java 2009-02-16 18:56:03 UTC (re= v 473) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestSybaseSQLConversionVisitor.java 2009-02-16 21:35:21 UTC (re= v 474) @@ -28,7 +28,7 @@ import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.MetadataFactory; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/userpool/MockExampleConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/userpool/MockExampleConnectionFactory.java 2009-02-16 18:56:03 UTC (re= v 473) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/userpool/MockExampleConnectionFactory.java 2009-02-16 21:35:21 UTC (re= v 474) @@ -26,7 +26,7 @@ import java.util.Properties; = import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.JDBCUserIdentityConnectionFactory; = /** Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/userpool/MockSourceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/userpool/MockSourceConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/userpool/MockSourceConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -22,18 +22,16 @@ = package com.metamatrix.connector.jdbc.userpool; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.Execution; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.basic.BasicConnection; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.pool.PoolAwareConnection; = /** */ -public class MockSourceConnection implements PoolAwareConnection, Connecti= on { +public class MockSourceConnection extends BasicConnection { = private String url; private int transLevel; @@ -76,18 +74,8 @@ } = @Override - public ConnectorCapabilities getCapabilities() { - return null; - } - - @Override public void close() { = } = - @Override - public void closeCalled() { - = - } - = } Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/userpool/TestPerUserPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/userpool/TestPerUserPool.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/userpool/TestPerUserPool.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,12 +30,12 @@ import org.mockito.Mockito; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.internal.ConnectorPropertyNames; import com.metamatrix.connector.jdbc.JDBCPropertyNames; import com.metamatrix.connector.jdbc.JDBCSourceConnectionFactory; -import com.metamatrix.connector.pool.CredentialMap; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; = /** Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/IQueryToLdapSearchParser.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/IQueryToLdapSearchParser.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/IQueryToLdapSearchParser.java 2009-02-16 21:35:21 UTC (rev 474) @@ -50,8 +50,8 @@ import javax.naming.ldap.SortKey; import javax.naming.NamingException; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IAggregate; import com.metamatrix.connector.language.ICaseExpression; import com.metamatrix.connector.language.ICompareCriteria; @@ -73,6 +73,7 @@ import com.metamatrix.connector.language.IScalarSubquery; import com.metamatrix.connector.language.ISearchedCaseExpression; import com.metamatrix.connector.language.ISelectSymbol; +import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.Group; import com.metamatrix.connector.metadata.runtime.MetadataID; @@ -359,11 +360,11 @@ * @param op operator to evaluate * @return LDAP-specific string equivalent of the operator */ - private String parseCompoundCriteriaOp(int op) throws ConnectorException { + private String parseCompoundCriteriaOp(ICompoundCriteria.Operator op) thr= ows ConnectorException { switch(op) { - case ICompoundCriteria.AND: + case AND: return "&"; //$NON-NLS-1$ - case ICompoundCriteria.OR: + case OR: return "|"; //$NON-NLS-1$ default: final String msg =3D LDAPPlugin.Util.getString("IQueryToLdapS= earchParser.criteriaNotParsableError"); //$NON-NLS-1$ @@ -469,7 +470,7 @@ // Recursive case: compound criteria if(criteria instanceof ICompoundCriteria) { logger.logTrace("Parsing compound criteria."); //$NON-NLS-1$ - int op =3D ((ICompoundCriteria) criteria).getOperator(); + ICompoundCriteria.Operator op =3D ((ICompoundCriteria) criteria).getOpe= rator(); List criteriaList =3D ((ICompoundCriteria) criteria).getCriteria(); String stringOp =3D parseCompoundCriteriaOp(op); = @@ -486,7 +487,8 @@ // Base case } else if(criteria instanceof ICompareCriteria) { logger.logTrace("Parsing compare criteria."); //$NON-NLS-1$ - int op =3D ((ICompareCriteria) criteria).getOperator(); + ICompareCriteria.Operator op =3D ((ICompareCriteria) criteria).getOpera= tor(); + = IExpression lhs =3D ((ICompareCriteria) criteria).getLeftExpression(); IExpression rhs =3D ((ICompareCriteria) criteria).getRightExpression(); = @@ -496,8 +498,8 @@ final String msg =3D LDAPPlugin.Util.getString("IQueryToLdapS= earchParser.missingNISError"); //$NON-NLS-1$ throw new ConnectorException(msg); = } + = addCompareCriteriaToList(filterList, op, lhsString, rhsString); - // Base case } else if(criteria instanceof IExistsCriteria) { logger.logTrace("Parsing EXISTS criteria: NOT IMPLEMENTED YET"); //$NON= -NLS-1$ @@ -506,7 +508,7 @@ } else if(criteria instanceof ILikeCriteria) { logger.logTrace("Parsing LIKE criteria."); //$NON-NLS-1$ // Convert LIKE to Equals, where any "%" symbol is replaced with "*". - int op =3D ICompareCriteria.EQ; + ICompareCriteria.Operator op =3D Operator.EQ; IExpression lhs =3D ((ILikeCriteria) criteria).getLeftExpression(); IExpression rhs =3D ((ILikeCriteria) criteria).getRightExpression(); = @@ -536,10 +538,10 @@ return; } filterList.add("("); //$NON-NLS-1$ - filterList.add(parseCompoundCriteriaOp(ICompoundCriteria.OR)); + filterList.add(parseCompoundCriteriaOp(com.metamatrix.connector.language= .ICompoundCriteria.Operator.OR)); Iterator rhsItr =3D rhsList.iterator(); while(rhsItr.hasNext()) { - addCompareCriteriaToList(filterList, ICompareCriteria.EQ, getExpression= String(lhs), = + addCompareCriteriaToList(filterList, Operator.EQ, getExpressionString(l= hs), = getExpressionString((IExpression)rhsItr.next())); } filterList.add(")"); //$NON-NLS-1$ @@ -552,11 +554,11 @@ * @param lhs left hand side expression * @param rhs right hand side expression */ - private void addCompareCriteriaToList(List filterList, int op, String lhs= , String rhs) throws ConnectorException { + private void addCompareCriteriaToList(List filterList, ICompareCriteria.O= perator op, String lhs, String rhs) throws ConnectorException { // Push the comparison statement into the list, e.g.: // (sn=3DMike) // !(empNum>=3D100) - if(op =3D=3D ICompareCriteria.NE) { + if(op =3D=3D Operator.NE || op =3D=3D Operator.GT || op =3D=3D Operator.= LT) { filterList.add("("); //$NON-NLS-1$ filterList.add("!"); //$NON-NLS-1$ } @@ -564,26 +566,18 @@ filterList.add(lhs); = switch(op) { - case ICompareCriteria.EQ: + case NE: + case EQ: filterList.add("=3D"); //$NON-NLS-1$ break; - case ICompareCriteria.GE: + case LT: + case GE: filterList.add(">=3D"); //$NON-NLS-1$ break; - // Arguably, this is not correct, but LDAP doesn't support GT, and = - // we want to support pushdown in this case, to make things uniform. - case ICompareCriteria.GT: - filterList.add(">=3D"); //$NON-NLS-1$ - break; - case ICompareCriteria.LE: + case GT: + case LE: filterList.add("<=3D"); //$NON-NLS-1$ break; - case ICompareCriteria.LT: - filterList.add("<=3D"); //$NON-NLS-1$ - break; - case ICompareCriteria.NE: - filterList.add("=3D"); //$NON-NLS-1$ - break; default: final String msg =3D LDAPPlugin.Util.getString("IQueryToLdapS= earchParser.criteriaNotSupportedError"); //$NON-NLS-1$ throw new ConnectorException(msg); = @@ -591,7 +585,7 @@ } filterList.add(rhs); filterList.add(")"); //$NON-NLS-1$ - if(op =3D=3D ICompareCriteria.NE) { + if(op =3D=3D Operator.NE || op =3D=3D Operator.GT || op =3D=3D Operator.= LT) { filterList.add(")"); //$NON-NLS-1$ } } Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,12 +29,12 @@ import javax.naming.NamingException; import javax.naming.ldap.InitialLdapContext; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.UpdateExecution; import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.IQueryCommand; Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,9 +27,9 @@ import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; = /** = * LDAPConnector. This is responsible for initializing = Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPSyncQueryExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPSyncQueryExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPSyncQueryExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -94,12 +94,11 @@ import javax.naming.ldap.SortControl; import javax.naming.ldap.SortKey; = -import com.metamatrix.connector.api.ConnectorCapabilities; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPUpdateExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPUpdateExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPUpdateExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -33,12 +33,12 @@ import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.LdapContext; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.UpdateExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICriteria; @@ -49,6 +49,7 @@ import com.metamatrix.connector.language.ILiteral; import com.metamatrix.connector.language.ISetClause; import com.metamatrix.connector.language.IUpdate; +import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; @@ -368,7 +369,7 @@ throw new ConnectorException(msg); } ICompareCriteria compareCriteria =3D (ICompareCriteria)criteria; = - if (compareCriteria.getOperator() !=3D ICompareCriteria.EQ) { + if (compareCriteria.getOperator() !=3D Operator.EQ) { final String msg =3D LDAPPlugin.Util.getString("LDAPUpdateExec= ution.criteriaNotEqualsError"); //$NON-NLS-1$ throw new ConnectorException(msg); } Modified: trunk/connectors/connector-ldap/src/test/java/com/metamatrix/conn= ector/ldap/TestIQueryToLdapSearchParser.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/= ldap/TestIQueryToLdapSearchParser.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/= ldap/TestIQueryToLdapSearchParser.java 2009-02-16 21:35:21 UTC (rev 474) @@ -35,6 +35,7 @@ import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.SysLogger; import com.metamatrix.common.types.DataTypeManager; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IQuery; @@ -90,8 +91,8 @@ SortKey[] sortKeys =3D searchDetails.getSortKeys(); = // Compare actual with Expected - assertEquals(contextName, expectedContextName); - assertEquals(contextFilter, expectedContextFilter); + assertEquals(expectedContextName, contextName); + assertEquals(expectedContextFilter, contextFilter); = assertEquals(attrList.size(),expectedAttrNameList.size()); Iterator iter =3D attrList.iterator(); @@ -102,25 +103,16 @@ assertEquals(actualName, expectedName); } = - assertEquals(countLimit, expectedCountLimit); - assertEquals(searchScope, expectedSearchScope); - assertEquals(sortKeys, expectedSortKeys); + assertEquals(expectedCountLimit, countLimit); + assertEquals(expectedSearchScope, searchScope); + assertEquals(expectedSortKeys, sortKeys); } = /** * Test a Query without criteria */ public void testSelectFrom1() throws Exception { - ConnectorLogger logger =3D new SysLogger(false); - QueryMetadataInterface metadata =3D exampleLdap(); - RuntimeMetadata rm =3D new MetadataFactory(metadata).createRuntimeMet= adata(); - Properties props =3D new Properties(); - = - IQueryToLdapSearchParser searchParser =3D new IQueryToLdapSearchParse= r(logger,rm,props); - = - IQuery query =3D (IQuery)getCommand("SELECT UserID, Name FROM Ldap= Model.People", metadata); //$NON-NLS-1$ - - LDAPSearchDetails searchDetails =3D searchParser.translateSQLQuery= ToLDAPSearch(query); + LDAPSearchDetails searchDetails =3D helpGetSearchDetails("SELECT U= serID, Name FROM LdapModel.People"); //$NON-NLS-1$ = //----------------------------------- // Set Expected SearchDetails Values @@ -145,16 +137,7 @@ * Test a Query with a criteria */ public void testSelectFromWhere1() throws Exception { - ConnectorLogger logger =3D new SysLogger(false); - QueryMetadataInterface metadata =3D exampleLdap(); - RuntimeMetadata rm =3D new MetadataFactory(metadata).createRuntimeMet= adata(); - Properties props =3D new Properties(); - = - IQueryToLdapSearchParser searchParser =3D new IQueryToLdapSearchParse= r(logger,rm,props); - = - IQuery query =3D (IQuery)getCommand("SELECT UserID, Name FROM Ldap= Model.People WHERE Name =3D 'R%'", metadata); //$NON-NLS-1$ - - LDAPSearchDetails searchDetails =3D searchParser.translateSQLQuery= ToLDAPSearch(query); + LDAPSearchDetails searchDetails =3D helpGetSearchDetails("SELECT User= ID, Name FROM LdapModel.People WHERE Name =3D 'R%'"); //$NON-NLS-1$ = //----------------------------------- // Set Expected SearchDetails Values @@ -175,7 +158,63 @@ = } = + public void testGT() throws Exception { + LDAPSearchDetails searchDetails =3D helpGetSearchDetails("SELECT User= ID, Name FROM LdapModel.People WHERE Name > 'R'"); //$NON-NLS-1$ + = + //----------------------------------- + // Set Expected SearchDetails Values + //----------------------------------- + String expectedContextName =3D "ou=3Dpeople,dc=3Dmetamatrix,dc=3Dc= om"; //$NON-NLS-1$ + String expectedContextFilter =3D "(!(cn<=3DR))"; //$NON-NLS-1$ + = + List expectedAttrNameList =3D new ArrayList(); + expectedAttrNameList.add("uid"); //$NON-NLS-1$ + expectedAttrNameList.add("cn"); //$NON-NLS-1$ + = + long expectedCountLimit =3D -1; + int expectedSearchScope =3D SearchControls.ONELEVEL_SCOPE; + SortKey[] expectedSortKeys =3D null; + = + helpTestSearchDetails(searchDetails, expectedContextName, expected= ContextFilter, expectedAttrNameList, + expectedCountLimit, expectedSearchScope, expectedSortKeys); + } = + public void testLT() throws Exception { + LDAPSearchDetails searchDetails =3D helpGetSearchDetails("SELECT User= ID, Name FROM LdapModel.People WHERE Name < 'R'"); //$NON-NLS-1$ + = + //----------------------------------- + // Set Expected SearchDetails Values + //----------------------------------- + String expectedContextName =3D "ou=3Dpeople,dc=3Dmetamatrix,dc=3Dc= om"; //$NON-NLS-1$ + String expectedContextFilter =3D "(!(cn>=3DR))"; //$NON-NLS-1$ + = + List expectedAttrNameList =3D new ArrayList(); + expectedAttrNameList.add("uid"); //$NON-NLS-1$ + expectedAttrNameList.add("cn"); //$NON-NLS-1$ + = + long expectedCountLimit =3D -1; + int expectedSearchScope =3D SearchControls.ONELEVEL_SCOPE; + SortKey[] expectedSortKeys =3D null; + = + helpTestSearchDetails(searchDetails, expectedContextName, expected= ContextFilter, expectedAttrNameList, + expectedCountLimit, expectedSearchScope, expectedSortKeys); + } + + private LDAPSearchDetails helpGetSearchDetails(String queryString) throws= ConnectorException { + ConnectorLogger logger =3D new SysLogger(false); + QueryMetadataInterface metadata =3D exampleLdap(); + RuntimeMetadata rm =3D new MetadataFactory(metadata).createRuntimeMet= adata(); + Properties props =3D new Properties(); + = + IQueryToLdapSearchParser searchParser =3D new IQueryToLdapSearchParse= r(logger,rm,props); + = + IQuery query =3D (IQuery)getCommand(queryString, metadata); + + LDAPSearchDetails searchDetails =3D searchParser.translateSQLQuery= ToLDAPSearch(query); + return searchDetails; + } + = + = public static FakeMetadataFacade exampleLdap() { = // Create models FakeMetadataObject ldapModel =3D FakeMetadataFactory.createPhysica= lModel("LdapModel"); //$NON-NLS-1$ Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/= connector/loopback/LoopbackConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,7 +23,7 @@ package com.metamatrix.connector.loopback; = import com.metamatrix.connector.api.*; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.basic.BasicConnection; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = @@ -31,7 +31,7 @@ * Serves as a connection for the Loopback connector. Since there is no a= ctual * data source, this "connection" doesn't really have any state. = */ -public class LoopbackConnection implements Connection { +public class LoopbackConnection extends BasicConnection { = private ConnectorEnvironment env; = @@ -42,14 +42,6 @@ this.env =3D env; } = - /* = - * @see com.metamatrix.data.Connection#getCapabilities() - */ - public ConnectorCapabilities getCapabilities() { - return null; - } - - = @Override public Execution createExecution(ICommand command, ExecutionContext executionContext, RuntimeMetadata metadata) Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/= connector/loopback/LoopbackConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,7 +23,6 @@ package com.metamatrix.connector.loopback; = import com.metamatrix.connector.api.*; -import com.metamatrix.connector.exception.ConnectorException; = /** * Starting point for the Loopback connector. Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/= connector/loopback/LoopbackExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -35,12 +35,12 @@ import java.util.Random; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.api.UpdateExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IQueryCommand; Modified: trunk/connectors/connector-loopback/src/test/java/com/metamatrix/= connector/loopback/TestLoopbackExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connec= tor/loopback/TestLoopbackExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connec= tor/loopback/TestLoopbackExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -32,7 +32,7 @@ import com.metamatrix.cdk.api.ConnectorHost; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public class TestLoopbackExecution extends TestCase { = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/Connector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/Connector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/Connector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,13 +29,13 @@ import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; +import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.pool.ConnectorIdentity; import com.metamatrix.connector.pool.ConnectorIdentityFactory; -import com.metamatrix.connector.pool.CredentialMap; import com.metamatrix.connector.pool.SingleIdentityFactory; import com.metamatrix.connector.pool.UserIdentityFactory; import com.metamatrix.connector.salesforce.connection.SalesforceConnection; Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/ConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/ConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/ConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,8 +25,8 @@ import java.net.URL; import java.util.Properties; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; = public class ConnectorState { = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/Util.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/Util.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/Util.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public class Util { = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/connection/SalesforceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/connection/SalesforceConnection.java 2009-02-16 18:56:03 U= TC (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/connection/SalesforceConnection.java 2009-02-16 21:35:21 U= TC (rev 474) @@ -25,11 +25,11 @@ import java.util.List; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.UpdateExecution; import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/connection/impl/ConnectionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/connection/impl/ConnectionImpl.java 2009-02-16 18:56:03 UT= C (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/connection/impl/ConnectionImpl.java 2009-02-16 21:35:21 UT= C (rev 474) @@ -37,8 +37,8 @@ import org.apache.axis.transport.http.CommonsHTTPSender; import org.apache.axis.transport.http.HTTPTransport; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.salesforce.execution.DataPayload; import com.sforce.soap.partner.CallOptions; import com.sforce.soap.partner.DeleteResult; Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/DeleteExecutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/DeleteExecutionImpl.java 2009-02-16 18:56:03 UTC= (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/DeleteExecutionImpl.java 2009-02-16 21:35:21 UTC= (rev 474) @@ -21,7 +21,7 @@ */ package com.metamatrix.connector.salesforce.execution; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IDelete; import com.metamatrix.connector.salesforce.execution.visitors.DeleteVisito= r; = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/InsertExecutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/InsertExecutionImpl.java 2009-02-16 18:56:03 UTC= (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/InsertExecutionImpl.java 2009-02-16 21:35:21 UTC= (rev 474) @@ -22,7 +22,7 @@ package com.metamatrix.connector.salesforce.execution; = = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IInsert; import com.metamatrix.connector.salesforce.execution.visitors.InsertVisito= r; = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/QueryExecutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/QueryExecutionImpl.java 2009-02-16 18:56:03 UTC = (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/QueryExecutionImpl.java 2009-02-16 21:35:21 UTC = (rev 474) @@ -32,12 +32,12 @@ import org.apache.axis.message.MessageElement; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/UpdateExecutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/UpdateExecutionImpl.java 2009-02-16 18:56:03 UTC= (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/UpdateExecutionImpl.java 2009-02-16 21:35:21 UTC= (rev 474) @@ -28,7 +28,7 @@ = import org.apache.axis.message.MessageElement; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.ILiteral; import com.metamatrix.connector.language.ISetClause; Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/UpdateExecutionParent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/UpdateExecutionParent.java 2009-02-16 18:56:03 U= TC (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/UpdateExecutionParent.java 2009-02-16 21:35:21 U= TC (rev 474) @@ -24,11 +24,11 @@ import java.util.ArrayList; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.UpdateExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICriteria; Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/CriteriaVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/CriteriaVisitor.java 2009-02-16 18:56:0= 3 UTC (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/CriteriaVisitor.java 2009-02-16 21:35:2= 1 UTC (rev 474) @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IExpression; @@ -37,6 +37,7 @@ import com.metamatrix.connector.language.IInCriteria; import com.metamatrix.connector.language.ILikeCriteria; import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.Group; import com.metamatrix.connector.metadata.runtime.MetadataID; @@ -67,7 +68,7 @@ protected static final String CLOSE =3D ")"; = protected RuntimeMetadata metadata; - private HashMap comparisonOperators; + private HashMap comparisonOperators; protected List criteriaList =3D new ArrayList(); protected boolean hasCriteria; protected Map columnElementsByName =3D new HashMap(); @@ -77,13 +78,13 @@ = public CriteriaVisitor(RuntimeMetadata metadata) { this.metadata =3D metadata; - comparisonOperators =3D new HashMap(); - comparisonOperators.put(ICompareCriteria.EQ, "=3D"); - comparisonOperators.put(ICompareCriteria.GE, ">=3D"); - comparisonOperators.put(ICompareCriteria.GT, ">"); - comparisonOperators.put(ICompareCriteria.LE, "<=3D"); - comparisonOperators.put(ICompareCriteria.LT, "<"); - comparisonOperators.put(ICompareCriteria.NE, "!=3D"); = + comparisonOperators =3D new HashMap(); + comparisonOperators.put(Operator.EQ, "=3D"); + comparisonOperators.put(Operator.GE, ">=3D"); + comparisonOperators.put(Operator.GT, ">"); + comparisonOperators.put(Operator.LE, "<=3D"); + comparisonOperators.put(Operator.LT, "<"); + comparisonOperators.put(Operator.NE, "!=3D"); = } = @Override @@ -91,7 +92,7 @@ super.visit(criteria); try { addCompareCriteria(criteriaList, criteria); - boolean isAcceptableID =3D (ICompareCriteria.EQ =3D=3D criteria.getOper= ator() && + boolean isAcceptableID =3D (Operator.EQ =3D=3D criteria.getOperator() && isIdColumn(criteria.getLeftExpression())); setHasCriteria(true, isAcceptableID); } catch (ConnectorException e) { Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/DeleteVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/DeleteVisitor.java 2009-02-16 18:56:03 = UTC (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/DeleteVisitor.java 2009-02-16 21:35:21 = UTC (rev 474) @@ -23,7 +23,7 @@ = import java.util.Iterator; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IDelete; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/ICriteriaVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/ICriteriaVisitor.java 2009-02-16 18:56:= 03 UTC (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/ICriteriaVisitor.java 2009-02-16 21:35:= 21 UTC (rev 474) @@ -21,7 +21,7 @@ */ package com.metamatrix.connector.salesforce.execution.visitors; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public interface ICriteriaVisitor { = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/IQueryProvidingVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/IQueryProvidingVisitor.java 2009-02-16 = 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/IQueryProvidingVisitor.java 2009-02-16 = 21:35:21 UTC (rev 474) @@ -21,7 +21,7 @@ */ package com.metamatrix.connector.salesforce.execution.visitors; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public interface IQueryProvidingVisitor extends ICriteriaVisitor { = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/InsertVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/InsertVisitor.java 2009-02-16 18:56:03 = UTC (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/InsertVisitor.java 2009-02-16 21:35:21 = UTC (rev 474) @@ -28,8 +28,9 @@ = import org.apache.axis.message.MessageElement; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IElement; +import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IInsert; import com.metamatrix.connector.language.ILiteral; import com.metamatrix.connector.metadata.runtime.Element; @@ -51,7 +52,7 @@ loadColumnMetadata(insert.getGroup()); = List columns =3D insert.getElements(); - List values =3D insert.getValues(); + List values =3D insert.getValues(); if(columns.size() !=3D values.size()) { throw new ConnectorException("Error: columns.size and values.size are= not the same."); } Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/SelectVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/SelectVisitor.java 2009-02-16 18:56:03 = UTC (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/SelectVisitor.java 2009-02-16 21:35:21 = UTC (rev 474) @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFrom; Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/UpdateVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/UpdateVisitor.java 2009-02-16 18:56:03 = UTC (rev 473) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/UpdateVisitor.java 2009-02-16 21:35:21 = UTC (rev 474) @@ -23,7 +23,7 @@ = import java.util.Iterator; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IUpdate; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = Modified: trunk/connectors/connector-salesforce/src/test/java/com/metamatri= x/connector/salesforce/TestConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/conn= ector/salesforce/TestConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/conn= ector/salesforce/TestConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,8 +24,8 @@ import junit.framework.TestCase; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.salesforce.connection.SalesforceConnection; import com.metamatrix.connector.salesforce.test.util.ObjectFactory; = @@ -52,14 +52,10 @@ noCredConnector.start(env2); } = - public void testGetConnection() { + public void testGetConnection() throws Exception { ExecutionContext secContext =3D ObjectFactory.getDefaultSecurityContext(= ); - try { - SalesforceConnection connection =3D (SalesforceConnection) connector.ge= tConnection(secContext); - assertNotNull("the connection is null", connection); - } catch (ConnectorException e) { - fail(e.getMessage()); - } + SalesforceConnection connection =3D (SalesforceConnection) connector.get= Connection(secContext); + assertNotNull("the connection is null", connection); } = /* @@ -80,11 +76,10 @@ try { localConnector.start(env); localConnector.getConnection(secContext); + fail("should have produced an exception"); } catch (ConnectorException e) { assertFalse("There is no error message", e.getMessage().length() =3D=3D= 0); - return; } - fail("should have produced an exception"); } = public void testGetConnectionEmptyUser() { @@ -94,11 +89,10 @@ try { localConnector.start(env); localConnector.getConnection(secContext); + fail("should have produced an exception"); } catch (ConnectorException e) { assertTrue("Wrong error message", e.getMessage().contains("Invalid")); - return; } - fail("should have produced an exception"); } = public void testGetConnectionBadPass() { @@ -108,11 +102,10 @@ try { localConnector.start(env); localConnector.getConnection(secContext); + fail("should have produced an exception"); } catch (ConnectorException e) { assertFalse("There is no error message", e.getMessage().length() =3D=3D= 0); - return; } - fail("should have produced an exception"); } = public void testGetConnectionEmptyPass() { @@ -122,31 +115,22 @@ try { localConnector.start(env); localConnector.getConnection(secContext); + fail("should have produced an exception"); } catch (ConnectorException e) { assertTrue("Wrong error message", e.getMessage().contains("Invalid cred= ential configuration")); - return; } - fail("should have produced an exception"); } = - public void testInitialize() { + public void testInitialize() throws Exception { Connector localConnector =3D new Connector(); - try { - localConnector.start(ObjectFactory.getDefaultTestConnectorEnvironment()= ); - assertEquals(ObjectFactory.VALID_PASSWORD, connector.getState().getPass= word()); - assertEquals(ObjectFactory.VALID_USERNAME, connector.getState().getUser= name()); - } catch (ConnectorException e) { - fail(e.getMessage()); - } + localConnector.start(ObjectFactory.getDefaultTestConnectorEnvironment()); + assertEquals(ObjectFactory.VALID_PASSWORD, connector.getState().getPassw= ord()); + assertEquals(ObjectFactory.VALID_USERNAME, connector.getState().getUsern= ame()); } = = - public void testGetLogger() { - try { - assertNotNull(connector.getLogger()); - } catch (ConnectorException e) { - fail(e.getMessage()); - } + public void testGetLogger() throws Exception { + assertNotNull(connector.getLogger()); } = public void testGetState() { Modified: trunk/connectors/connector-salesforce/src/test/java/com/metamatri= x/connector/salesforce/test/util/ObjectFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/conn= ector/salesforce/test/util/ObjectFactory.java 2009-02-16 18:56:03 UTC (rev = 473) +++ trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/conn= ector/salesforce/test/util/ObjectFactory.java 2009-02-16 21:35:21 UTC (rev = 474) @@ -27,8 +27,8 @@ = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.pool.CredentialMap; import com.metamatrix.connector.salesforce.ConnectorState; = public class ObjectFactory { Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/conn= ector/text/TextConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,10 +26,10 @@ import java.util.Map; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/conn= ector/text/TextConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -38,9 +38,9 @@ import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; = /** * Implementation of text connector. Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/conn= ector/text/TextSynchExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextSynchExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextSynchExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -38,12 +38,12 @@ import java.util.Properties; = import com.metamatrix.connector.api.Connection; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IFrom; Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/conn= ector/text/TestMultiFileTextSynchExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestMultiFileTextSynchExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestMultiFileTextSynchExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,7 +30,7 @@ import junit.framework.TestCase; = import com.metamatrix.cdk.api.ConnectorHost; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.UnitTestUtil; import com.metamatrix.query.unittest.TimestampUtil; = Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/conn= ector/text/TestRowHeaderTextSynchExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestRowHeaderTextSynchExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestRowHeaderTextSynchExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,7 @@ = import junit.framework.TestCase; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = = public class TestRowHeaderTextSynchExecution extends TestCase { Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/conn= ector/text/TestTextConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestTextConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestTextConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,7 +29,7 @@ = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.UnitTestUtil; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/AbstractCachingConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/AbstractCachingConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/AbstractCachingConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,7 +28,7 @@ import java.util.Map; = import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.base.LoggingConnector; import com.metamatrix.connector.xml.cache.DocumentCache; import com.metamatrix.connector.xml.cache.IDocumentCache; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/AsynchronousDocumentProducer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/AsynchronousDocumentProducer.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/AsynchronousDocumentProducer.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,7 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public interface AsynchronousDocumentProducer extends DocumentProducer { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/BaseXMLConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/BaseXMLConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/BaseXMLConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,8 +26,8 @@ = = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; = public interface BaseXMLConnectorState { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/CachingConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/CachingConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/CachingConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,7 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.base.StatefulConnector; import com.metamatrix.connector.xml.cache.IDocumentCache; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/DocumentProducer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/DocumentProducer.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/DocumentProducer.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,7 +25,7 @@ = import java.io.Serializable; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.base.Response; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/NamedDocumentExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/NamedDocumentExecutor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/NamedDocumentExecutor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,7 +23,7 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public interface NamedDocumentExecutor { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/SecureConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/SecureConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/SecureConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,7 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public interface SecureConnectorState { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/XMLConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/XMLConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/XMLConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,7 @@ = import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public interface XMLConnection extends Connection { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/XMLConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/XMLConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/XMLConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,8 +26,8 @@ import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; = public interface XMLConnectorState extends BaseXMLConnectorState { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/BaseBatchProducer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/BaseBatchProducer.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/BaseBatchProducer.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,8 +26,8 @@ import java.util.List; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; = public class BaseBatchProducer { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/BaseResultsProducer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/BaseResultsProducer.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/BaseResultsProducer.java 2009-02-16 21:35:21 UTC (rev 474) @@ -50,8 +50,8 @@ import org.jdom.input.SAXBuilder; import org.jdom.output.XMLOutputter; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.cache.IDocumentCache; import com.metamatrix.connector.xml.http.Messages; /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/CriteriaDesc.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/CriteriaDesc.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/CriteriaDesc.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,7 +27,7 @@ import java.util.List; import java.util.Properties; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IBaseInCriteria; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICriteria; @@ -37,6 +37,7 @@ import com.metamatrix.connector.language.ILiteral; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.LanguageUtil; +import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.metadata.runtime.Element; = /** @@ -380,7 +381,7 @@ ICriteria criteriaSeg =3D (ICriteria) criteriaIter.next(); if (criteriaSeg instanceof ICompareCriteria) { ICompareCriteria compCriteria =3D (ICompareCriteria) c= riteriaSeg; = - if (compCriteria.getOperator() =3D=3D ICompareCriteria= .EQ) { = + if (compCriteria.getOperator() =3D=3D Operator.EQ) { = = IExpression lExpr =3D compCriteria.getLeftExpressi= on(); IExpression rExpr =3D compCriteria.getRightExpress= ion(); handleCompareCriteria(lExpr, rExpr, fullName, parm= Pair); Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/DocumentBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/DocumentBuilder.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/DocumentBuilder.java 2009-02-16 21:35:21 UTC (rev 474) @@ -36,7 +36,7 @@ import org.jdom.Namespace; import org.jdom.output.XMLOutputter; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.soap.SOAPDocBuilder; = public class DocumentBuilder { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/FileBackedValueReference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/FileBackedValueReference.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/FileBackedValueReference.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,7 @@ import java.io.RandomAccessFile; import java.lang.Long; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public class FileBackedValueReference implements LargeTextValueReference { private RandomAccessFile file; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/LargeOrSmallString.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LargeOrSmallString.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LargeOrSmallString.java 2009-02-16 21:35:21 UTC (rev 474) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.xml.base; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = = public class LargeOrSmallString Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/LargeTextExtractingXmlFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LargeTextExtractingXmlFilter.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LargeTextExtractingXmlFilter.java 2009-02-16 21:35:21 UTC (rev 474) @@ -36,8 +36,8 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.XMLFilterImpl; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; = class LargeTextExtractingXmlFilter extends XMLFilterImpl { LargeTextExtractingXmlFilter(int maxInMemoryStringSize, Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/LargeTextValueReference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LargeTextValueReference.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LargeTextValueReference.java 2009-02-16 21:35:21 UTC (rev 474) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.xml.base; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public interface LargeTextValueReference { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/LoggingConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LoggingConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LoggingConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,8 +23,8 @@ package com.metamatrix.connector.xml.base; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.XMLConnectorState; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/OutputXPathDesc.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/OutputXPathDesc.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/OutputXPathDesc.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,7 +25,7 @@ = import java.text.MessageFormat; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ILiteral; import com.metamatrix.connector.metadata.runtime.Element; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/ParameterDescriptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/ParameterDescriptor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/ParameterDescriptor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,7 +23,7 @@ = package com.metamatrix.connector.xml.base; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.Element; = = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/QueryAnalyzer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/QueryAnalyzer.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/QueryAnalyzer.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,9 +28,9 @@ import java.util.List; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFrom; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/RequestResponseDocumentProducer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/RequestResponseDocumentProducer.java 2009-02-16 18:56:03 UTC (rev 4= 73) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/RequestResponseDocumentProducer.java 2009-02-16 21:35:21 UTC (rev 4= 74) @@ -32,8 +32,8 @@ import java.util.Iterator; import java.util.List; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLConnectorState; import com.metamatrix.connector.xml.XMLExecution; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/Response.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/Response.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/Response.java 2009-02-16 21:35:21 UTC (rev 474) @@ -33,7 +33,7 @@ = import org.apache.commons.codec.binary.Base64; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.cache.DocumentCache; import com.metamatrix.connector.xml.cache.IDocumentCache; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/SecureConnectorStateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/SecureConnectorStateImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/SecureConnectorStateImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,7 +27,7 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.SecureConnectorState; import com.metamatrix.connector.xml.TrustedPayloadHandler; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/TrustedPayloadBridge.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/TrustedPayloadBridge.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/TrustedPayloadBridge.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,7 +28,7 @@ = import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.pool.CredentialMap; +import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.connector.xml.TrustedPayloadHandler; = public abstract class TrustedPayloadBridge implements TrustedPayloadHandle= r { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/ValueConvertor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/ValueConvertor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/ValueConvertor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,9 +28,9 @@ import java.util.ArrayList; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.metadata.runtime.Element; = public class ValueConvertor { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/XMLConnectionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLConnectionImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLConnectionImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,11 +26,11 @@ import java.io.Serializable; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/XMLConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,10 +26,10 @@ import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.AbstractCachingConnector; = @ConnectionPooling(enabled=3Dfalse) Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/XMLConnectorStateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLConnectorStateImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLConnectorStateImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,8 +27,8 @@ = import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.IQueryPreprocessor; import com.metamatrix.connector.xml.SAXFilterProvider; import com.metamatrix.connector.xml.XMLConnectorState; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/XMLExecutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLExecutionImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLExecutionImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,12 +29,12 @@ import java.util.List; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xml.DocumentProducer; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/XMLExtractor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLExtractor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLExtractor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -41,8 +41,8 @@ import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.XMLFilterImpl; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.SAXFilterProvider; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/cache/DocumentCache.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/DocumentCache.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/DocumentCache.java 2009-02-16 21:35:21 UTC (rev 474) @@ -40,8 +40,8 @@ import java.util.Set; import java.util.Vector; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.base.XMLDocument; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/cache/IDocumentCache.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/IDocumentCache.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/IDocumentCache.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,7 +23,7 @@ = package com.metamatrix.connector.xml.cache; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public interface IDocumentCache { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/cache/RequestRecord.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/RequestRecord.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/RequestRecord.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,8 +27,8 @@ import java.util.HashMap; import java.util.Map; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.CachingConnector; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/file/FileConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/file/FileConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/file/FileConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,8 +27,8 @@ = import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLExecution; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/file/FileExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/file/FileExecutor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/file/FileExecutor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -34,9 +34,9 @@ = import org.jdom.Document; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.NamedDocumentExecutor; import com.metamatrix.connector.xml.SAXFilterProvider; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/http/DefaultTrustDeserializer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/DefaultTrustDeserializer.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/DefaultTrustDeserializer.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,7 +29,7 @@ import org.apache.commons.httpclient.UsernamePasswordCredentials; import org.apache.commons.httpclient.auth.AuthScope; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.XMLConnectorState; import com.metamatrix.connector.xml.base.TrustedPayloadBridge; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/http/HTTPConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -40,8 +40,8 @@ = import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLExecution; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/http/HTTPExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPExecutor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPExecutor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -43,8 +43,8 @@ import org.apache.commons.httpclient.util.ParameterParser; import org.jdom.Document; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.SAXFilterProvider; import com.metamatrix.connector.xml.XMLConnection; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/http/HTTPRequestor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPRequestor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPRequestor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -38,8 +38,8 @@ import org.jdom.Document; import org.jdom.output.XMLOutputter; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; = = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/http/HTTPTrustDeserializer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPTrustDeserializer.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPTrustDeserializer.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,8 +29,8 @@ import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.TrustedPayloadHandler; import com.metamatrix.connector.xml.XMLConnectorState; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/jms/JMSConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -36,10 +36,10 @@ import javax.naming.NamingException; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/jms/JMSExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -34,12 +34,12 @@ import javax.jms.Session; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xml.SOAPConnectorState; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/jms/JMSRequestExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSRequestExecutor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSRequestExecutor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -41,9 +41,9 @@ = import org.jdom.Document; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.AsynchronousDocumentProducer; import com.metamatrix.connector.xml.SOAPConnectorState; import com.metamatrix.connector.xml.base.CriteriaDesc; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/jms/JMSSOAPConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSSOAPConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSSOAPConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,8 +27,8 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.SOAPConnectorState; import com.metamatrix.connector.xml.soap.SOAPConnectorStateImpl; import com.metamatrix.connector.xmlsource.soap.SecurityToken; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/jms/JMSXMLConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSXMLConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSXMLConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -31,8 +31,8 @@ = import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLExecution; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/soap/SOAPConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,8 +27,8 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLExecution; import com.metamatrix.connector.xml.http.HTTPConnectorState; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/soap/SOAPConnectorStateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPConnectorStateImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPConnectorStateImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -31,8 +31,8 @@ import javax.net.ssl.HttpsURLConnection; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.SOAPConnectorState; import com.metamatrix.connector.xml.base.Messages; import com.metamatrix.connector.xml.http.HTTPConnectorState; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/soap/SOAPDocBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPDocBuilder.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPDocBuilder.java 2009-02-16 21:35:21 UTC (rev 474) @@ -35,7 +35,7 @@ import org.jdom.Element; import org.jdom.Namespace; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.SOAPConnectorState; import com.metamatrix.connector.xml.base.CriteriaDesc; import com.metamatrix.connector.xml.base.DocumentBuilder; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/soap/SOAPExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPExecutor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPExecutor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -57,8 +57,8 @@ import org.w3c.dom.NodeList; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.SOAPConnectorState; import com.metamatrix.connector.xml.TrustedPayloadHandler; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/XMLConnectionFacory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLConnectionFacory.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLConnectionFacory.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,8 +26,8 @@ = import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; = = /** = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/XMLSourceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,8 +23,8 @@ package com.metamatrix.connector.xmlsource; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.exception.ConnectorException; = /** * A Base XML Connection to an XML Source Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/XMLSourceConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,9 +26,9 @@ import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.exception.ConnectorException; = /** * XML Source connector, will give provide a XML document as source to Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/XMLSourceExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,10 +30,10 @@ = import com.metamatrix.connector.DataPlugin; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IParameter; = = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/file/FileConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/file/FileConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/file/FileConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,9 +26,9 @@ import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xmlsource.XMLSourceConnection; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/file/FileExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/file/FileExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/file/FileExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -32,8 +32,8 @@ import javax.xml.transform.stream.StreamSource; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/soap/SoapConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/SoapConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/SoapConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -50,9 +50,9 @@ import org.apache.axis.wsdl.symbolTable.SymbolTable; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xmlsource.XMLSourceConnection; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/soap/SoapExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/SoapExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/SoapExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,10 +30,11 @@ import javax.xml.transform.Source; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xmlsource.XMLSourceExecution; @@ -88,10 +89,10 @@ // extract all the input parameters to send to the service for (Iterator i =3D procedure.getParameters().iterator(); i.hasNex= t();) { IParameter param =3D (IParameter)i.next(); - if (param.getDirection() =3D=3D IParameter.IN ) { + if (param.getDirection() =3D=3D Direction.IN ) { argsList.add(param.getValue()); } - else if (param.getDirection() =3D=3D IParameter.INOUT) { + else if (param.getDirection() =3D=3D Direction.INOUT) { argsList.add(param.getValue()); } = } Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/MockCachingConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/MockCachingConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/MockCachingConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,9 +26,9 @@ import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.cache.IDocumentCache; import com.metamatrix.connector.xml.cache.MockDocumentCache; = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/ProxyObjectFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/ProxyObjectFactory.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/ProxyObjectFactory.java 2009-02-16 21:35:21 UTC (rev 474) @@ -34,8 +34,8 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xml.SecureConnectorState; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestCriteriaDesc.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestCriteriaDesc.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestCriteriaDesc.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,7 +29,7 @@ = import junit.framework.TestCase; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IBaseInCriteria; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICriteria; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestExecutionInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestExecutionInfo.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestExecutionInfo.java 2009-02-16 21:35:21 UTC (rev 474) @@ -32,9 +32,9 @@ = import com.metamatrix.cdk.api.SysLogger; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xml.IQueryPreprocessor; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestOutputXPathDesc.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestOutputXPathDesc.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestOutputXPathDesc.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,7 @@ = import junit.framework.TestCase; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICriteria; import com.metamatrix.connector.language.IElement; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestParameterDescriptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestParameterDescriptor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestParameterDescriptor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,7 @@ = import junit.framework.TestCase; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IQuery; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestQueryAnalyzer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestQueryAnalyzer.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestQueryAnalyzer.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,9 +30,9 @@ = import com.metamatrix.cdk.api.SysLogger; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xml.IQueryPreprocessor; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestStringBackedValueReference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestStringBackedValueReference.java 2009-02-16 18:56:03 UTC (rev 47= 3) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestStringBackedValueReference.java 2009-02-16 21:35:21 UTC (rev 47= 4) @@ -24,7 +24,7 @@ = import junit.framework.TestCase; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = public class TestStringBackedValueReference extends TestCase { = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,8 +26,8 @@ = import junit.framework.TestCase; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; = = public class TestXMLConnection extends TestCase { Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,8 +29,8 @@ = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.XMLConnectorState; import com.metamatrix.connector.xml.file.FileConnectorState; = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,9 +30,9 @@ import com.metamatrix.cdk.api.SysLogger; import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.Execution; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLConnectorState; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,7 @@ = import junit.framework.TestCase; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IQuery; = /** Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLExtractor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLExtractor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLExtractor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,8 +30,8 @@ import org.jdom.Document; = import com.metamatrix.cdk.api.SysLogger; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.exception.ConnectorException; = public class TestXMLExtractor extends TestCase { = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/cache/TestCache.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/cache/TestCache.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/cache/TestCache.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,7 +30,7 @@ import junit.framework.TestSuite; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.UnitTestUtil; = /** Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/file/TestFileConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/file/TestFileConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/file/TestFileConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,7 +28,7 @@ = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.base.ProxyObjectFactory; import com.metamatrix.connector.xml.base.XMLExecutionImpl; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/file/TestFileExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/file/TestFileExecutor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/file/TestFileExecutor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -32,7 +32,7 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IQuery; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/http/TestHTTPConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/http/TestHTTPConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/http/TestHTTPConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,7 +28,7 @@ = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.base.ProxyObjectFactory; = /** Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/jms/TestJMSConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/jms/TestJMSConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/jms/TestJMSConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -32,7 +32,7 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.base.ProxyObjectFactory; = public class TestJMSConnectorState extends TestCase { Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/jms/TestJMSSOAPConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/jms/TestJMSSOAPConnectorState.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/jms/TestJMSSOAPConnectorState.java 2009-02-16 21:35:21 UTC (rev 474) @@ -32,7 +32,7 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.base.ProxyObjectFactory; import com.metamatrix.connector.xml.soap.SOAPConnectorStateImpl; = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xmlsource/FakeRuntimeMetadata.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/FakeRuntimeMetadata.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/FakeRuntimeMetadata.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,7 @@ = import java.util.Properties; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xmlsource/file/TestFileConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/file/TestFileConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/file/TestFileConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,7 +28,7 @@ = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.UnitTestUtil; = = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xmlsource/file/TestFileExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/file/TestFileExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/file/TestFileExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -32,13 +32,12 @@ = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; import com.metamatrix.connector.xmlsource.FakeRuntimeMetadata; import com.metamatrix.core.util.UnitTestUtil; = @@ -68,8 +67,9 @@ List result =3D exec.next(); assertNotNull(result); assertNull(exec.next()); + IParameter returnParam =3D fact.createParameter(0, Direction.R= ETURN, null, null, null); try { - exec.getOutputValue(getReturnParameter()); + exec.getOutputValue(returnParam); fail("should have thrown error in returning a return"); //= $NON-NLS-1$ }catch(Exception e) { = } @@ -109,37 +109,6 @@ } = } = = - = - IParameter getReturnParameter() { - return new IParameter() { - public int getIndex() { - return 0; - } - public int getDirection() { - return IParameter.RETURN; - } - public Class getType() { - return null; - } - public Object getValue() { - return null; - } - public boolean getValueSpecified() { - return false; - } - public void setIndex(int index) {} - public void setDirection(int direction) {} - public void setType(Class type) {} - public void setValue(Object value) {} - public void setValueSpecified(boolean specified) {} - public void acceptVisitor(LanguageObjectVisitor visitor) {} - public MetadataID getMetadataID() { - return null; - } - public void setMetadataID(MetadataID metadataID) {} = - }; = - } = - = String readFile(String filename) throws Exception { Reader reader =3D new FileReader(filename); = StringBuffer fileContents =3D new StringBuffer(); Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xmlsource/soap/TestSoapConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/soap/TestSoapConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/soap/TestSoapConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,7 +29,7 @@ = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.UnitTestUtil; = = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xmlsource/soap/TestSoapExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/soap/TestSoapExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/soap/TestSoapExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -40,9 +40,8 @@ import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; import com.metamatrix.connector.xmlsource.FakeRuntimeMetadata; import com.metamatrix.connector.xmlsource.soap.service.WebServiceServer; import com.metamatrix.core.util.UnitTestUtil; @@ -548,7 +547,7 @@ List parameters =3D new ArrayList(); if (args !=3D null && args.length > 0) { for (int i =3D 0; i < args.length; i++) { - IParameter param =3D fact.createParameter(i+1, IParameter.= IN, args[i], args[i].getClass(), null); = + IParameter param =3D fact.createParameter(i+1, Direction.I= N, args[i], args[i].getClass(), null); = parameters.add(param); } } @@ -560,9 +559,9 @@ List result =3D exec.next(); assertNotNull(result); assertNull(exec.next()); - = + IParameter returnParam =3D fact.createParameter(0, Direction.RETUR= N, null, null, null); try { - exec.getOutputValue(getReturnParameter()); + exec.getOutputValue(returnParam); fail("should have thrown error in returning a return"); //$NON= -NLS-1$ = }catch(Exception e) { = } @@ -577,34 +576,4 @@ // System.out.println(xmlString); } = - IParameter getReturnParameter() { - return new IParameter() { - public int getIndex() { - return 0; - } - public int getDirection() { - return IParameter.RETURN; - } - public Class getType() { - return null; - } - public Object getValue() { - return null; - } - public boolean getValueSpecified() { - return false; - } - public void setIndex(int index) {} - public void setDirection(int direction) {} - public void setType(Class type) {} - public void setValue(Object value) {} - public void setValueSpecified(boolean specified) {} - public void acceptVisitor(LanguageObjectVisitor visitor) {} - public MetadataID getMetadataID() { - return null; - } - public void setMetadataID(MetadataID metadataID) {} = - }; = - } = - = } Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamat= rix/connector/exec/ExecAntExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecAntExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecAntExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -49,11 +49,11 @@ import com.metamatrix.common.util.CommonPropertyNames; import com.metamatrix.common.util.OSPlatformUtil; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.util.Assertion; Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamat= rix/connector/exec/ExecConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,11 +25,11 @@ = import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamat= rix/connector/exec/ExecConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -35,9 +35,9 @@ import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.core.util.ObjectConverterUtil; = /** Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamat= rix/connector/exec/ExecVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecVisitor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecVisitor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,7 @@ import java.util.Map; = = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICriteria; import com.metamatrix.connector.language.IElement; Modified: trunk/connectors/sandbox/connector-exec/src/test/java/com/metamat= rix/connector/exec/FakeExecConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/co= nnector/exec/FakeExecConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/co= nnector/exec/FakeExecConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,7 +28,7 @@ import java.util.List; import java.util.Properties; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = /** * Implmentation of text connector. Modified: trunk/connectors/sandbox/connector-exec/src/test/java/com/metamat= rix/connector/exec/TestsExec.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/co= nnector/exec/TestsExec.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/co= nnector/exec/TestsExec.java 2009-02-16 21:35:21 UTC (rev 474) @@ -33,8 +33,8 @@ import junit.framework.TestCase; = import com.metamatrix.cdk.api.ConnectorHost; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.core.util.UnitTestUtil; = /** Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/ObjectConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,11 +25,11 @@ = import com.metamatrix.admin.api.exception.AdminException; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.object.extension.IObjectSource; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/ObjectConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,9 +26,9 @@ import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.object.util.ObjectConnectorUtil; import com.metamatrix.connector.pool.ConnectorIdentity; import com.metamatrix.connector.pool.ConnectorIdentityFactory; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/ObjectProcedureExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectProcedureExecution.java 2009-02-16 18:56:03 UTC (rev= 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectProcedureExecution.java 2009-02-16 21:35:21 UTC (rev= 474) @@ -25,11 +25,11 @@ import java.util.List; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/SourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/SourceConnectionFactory.java 2009-02-16 18:56:03 UTC (rev = 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/SourceConnectionFactory.java 2009-02-16 21:35:21 UTC (rev = 474) @@ -2,8 +2,8 @@ = import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.pool.ConnectorIdentity; import com.metamatrix.connector.pool.SingleIdentity; import com.metamatrix.connector.pool.UserIdentity; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/IObjectSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/IObjectSource.java 2009-02-16 18:56:03 UTC (rev = 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/IObjectSource.java 2009-02-16 21:35:21 UTC (rev = 474) @@ -24,7 +24,7 @@ = import java.util.List; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.object.ObjectProcedureExecution; = /** Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/ISourceTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/ISourceTranslator.java 2009-02-16 18:56:03 UTC (= rev 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/ISourceTranslator.java 2009-02-16 21:35:21 UTC (= rev 474) @@ -28,8 +28,8 @@ import java.util.TimeZone; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/command/ObjectCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/command/ObjectCommand.java 2009-02-16 18:56:03 U= TC (rev 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/command/ObjectCommand.java 2009-02-16 21:35:21 U= TC (rev 474) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.object.extension.command; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IMetadataReference; import com.metamatrix.connector.metadata.runtime.MetadataID; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/command/ProcedureCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/command/ProcedureCommand.java 2009-02-16 18:56:0= 3 UTC (rev 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/command/ProcedureCommand.java 2009-02-16 21:35:2= 1 UTC (rev 474) @@ -29,9 +29,10 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; @@ -167,13 +168,13 @@ for(final Iterator iter =3D parameters.iterator(); iter.hasNex= t();) { IParameter parameter =3D (IParameter) iter.next(); // if there is one result set parameter - if(parameter.getDirection() =3D=3D IParameter.RESULT_SET) { + if(parameter.getDirection() =3D=3D Direction.RESULT_SET) { this.resultSetParameter =3D parameter; initResultSet(); - } else if(parameter.getDirection() =3D=3D IParameter.IN ||= parameter.getDirection() =3D=3D IParameter.INOUT) { + } else if(parameter.getDirection() =3D=3D Direction.IN || = parameter.getDirection() =3D=3D Direction.INOUT) { initCriteria(parameter); // inParams.add(parameter); - } else if (parameter.getDirection() =3D=3D IParameter.RETU= RN && this.resultSetParameter=3D=3Dnull) { = + } else if (parameter.getDirection() =3D=3D Direction.RETUR= N && this.resultSetParameter=3D=3Dnull) { = this.resultSetParameter =3D parameter; initResultReturn(); } Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/source/BaseObjectSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BaseObjectSource.java 2009-02-16 18:56:03= UTC (rev 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BaseObjectSource.java 2009-02-16 21:35:21= UTC (rev 474) @@ -30,7 +30,7 @@ import java.util.Collections; import java.util.List; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.object.ObjectSourceMethodManager; import com.metamatrix.connector.object.extension.IObjectCommand; import com.metamatrix.connector.object.extension.IObjectSource; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/source/BaseSourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BaseSourceConnectionFactory.java 2009-02-= 16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BaseSourceConnectionFactory.java 2009-02-= 16 21:35:21 UTC (rev 474) @@ -26,8 +26,8 @@ = import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.object.ObjectConnection; import com.metamatrix.connector.object.SourceConnectionFactory; import com.metamatrix.connector.object.extension.IObjectSource; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/source/BasicSourceTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BasicSourceTranslator.java 2009-02-16 18:= 56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BasicSourceTranslator.java 2009-02-16 21:= 35:21 UTC (rev 474) @@ -29,9 +29,9 @@ import java.util.TimeZone; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.api.ValueTranslator; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/value/BasicValueRetriever.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/value/BasicValueRetriever.java 2009-02-16 18:56:= 03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/value/BasicValueRetriever.java 2009-02-16 21:35:= 21 UTC (rev 474) @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Properties; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.object.ObjectSourceMethodManager; import com.metamatrix.connector.object.extension.IObjectCommand; import com.metamatrix.connector.object.extension.IValueRetriever; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/value/JavaUtilDateValueTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/value/JavaUtilDateValueTranslator.java 2009-02-1= 6 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/value/JavaUtilDateValueTranslator.java 2009-02-1= 6 21:35:21 UTC (rev 474) @@ -27,9 +27,9 @@ import java.sql.Timestamp; import java.util.Date; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ValueTranslator; -import com.metamatrix.connector.exception.ConnectorException; = /** */ Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/util/ObjectConnectorUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/util/ObjectConnectorUtil.java 2009-02-16 18:56:03 UTC (rev= 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/util/ObjectConnectorUtil.java 2009-02-16 21:35:21 UTC (rev= 474) @@ -26,7 +26,7 @@ = import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IMetadataReference; import com.metamatrix.connector.metadata.runtime.MetadataID; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/util/ObjectExecutionHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/util/ObjectExecutionHelper.java 2009-02-16 18:56:03 UTC (r= ev 473) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/util/ObjectExecutionHelper.java 2009-02-16 21:35:21 UTC (r= ev 474) @@ -36,11 +36,11 @@ import java.util.TimeZone; = import com.metamatrix.common.util.TimestampWithTimezone; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.api.ValueTranslator; import com.metamatrix.connector.basic.BasicValueTranslator; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.object.ObjectPlugin; import com.metamatrix.connector.object.extension.IObjectCommand; import com.metamatrix.connector.object.extension.ISourceTranslator; Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java 2009-02-1= 6 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java 2009-02-1= 6 21:35:21 UTC (rev 474) @@ -30,7 +30,7 @@ = import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.JDBCConnector; = public class OracleSpatialConnector extends JDBCConnector { Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-= 02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-= 02-16 21:35:21 UTC (rev 474) @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.oracle.OracleSQLTranslator; import com.metamatrix.connector.language.ICommand; Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metama= trix/connector/yahoo/TickerCollectorVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/TickerCollectorVisitor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/TickerCollectorVisitor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,7 @@ = import java.util.*; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.*; import com.metamatrix.connector.visitor.framework.HierarchyVisitor; = Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metama= trix/connector/yahoo/YahooConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooConnection.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooConnection.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,10 +23,10 @@ package com.metamatrix.connector.yahoo; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metama= trix/connector/yahoo/YahooConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,7 +23,6 @@ package com.metamatrix.connector.yahoo; = import com.metamatrix.connector.api.*; -import com.metamatrix.connector.exception.ConnectorException; = public class YahooConnector implements Connector { = Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metama= trix/connector/yahoo/YahooExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -40,11 +40,11 @@ import java.util.StringTokenizer; = import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICriteria; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IExpression; Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/Ba= seAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmi= n.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmi= n.java 2009-02-16 21:35:21 UTC (rev 474) @@ -62,7 +62,6 @@ import com.metamatrix.common.util.crypto.CryptoException; import com.metamatrix.common.util.crypto.CryptoUtil; import com.metamatrix.common.vdb.api.VDBArchive; -import com.metamatrix.connector.monitor.AliveStatus; import com.metamatrix.dqp.embedded.DQPEmbeddedManager; import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.service.ConfigurationService; @@ -320,12 +319,12 @@ // Binding state needs to be converted into pool state; until then= we use // binding state as pool state. try { - AliveStatus status =3D getDataService().getConnectorBindingSta= te(src.getDeployedName()); = - if (status =3D=3D AliveStatus.ALIVE) { + Boolean status =3D getDataService().getConnectorBindingState(s= rc.getDeployedName()); = + if (status =3D=3D Boolean.TRUE) { binding.setState(com.metamatrix.admin.api.objects.Connecto= rBinding.STATE_OPEN); } - else if (status =3D=3D AliveStatus.DEAD) { - binding.setState(com.metamatrix.admin.api.objects.Connecto= rBinding.STATE_CLOSED); + else if (status =3D=3D Boolean.FALSE) { + binding.setState(com.metamatrix.admin.api.objects.Connecto= rBinding.STATE_DATA_SOURCE_UNAVAILABLE); } else { binding.setState(com.metamatrix.admin.api.objects.Connecto= rBinding.STATE_DATA_SOURCE_UNAVAILABLE); Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services= /EmbeddedDataService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embed= dedDataService.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embed= dedDataService.java 2009-02-16 21:35:21 UTC (rev 474) @@ -48,9 +48,8 @@ import com.metamatrix.common.util.crypto.CryptoUtil; import com.metamatrix.common.vdb.api.VDBArchive; import com.metamatrix.common.vdb.api.VDBDefn; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.internal.ConnectorPropertyNames; -import com.metamatrix.connector.monitor.AliveStatus; import com.metamatrix.core.vdb.VDBStatus; import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.embedded.configuration.ExtensionModuleReader; @@ -291,13 +290,13 @@ * @see com.metamatrix.dqp.service.DataService#getConnectorBindingStat= e(java.lang.String) * @since 4.3 */ - public AliveStatus getConnectorBindingState(String deployedConnectorBi= ndingName) = + public Boolean getConnectorBindingState(String deployedConnectorBindin= gName) = throws MetaMatrixComponentException { ConnectorBinding binding =3D getConnectorBinding(deployedConnector= BindingName); if (binding !=3D null) { ConnectorManager mgr =3D getConnectorManager(binding); if (mgr !=3D null) { - return mgr.getStatus().getStatus(); + return mgr.getStatus(); } } throw new MetaMatrixComponentException(DQPEmbeddedPlugin.Util.getS= tring("DataService.Unable_to_find_connector", deployedConnectorBindingName)= ); //$NON-NLS-1$ Modified: trunk/engine/src/main/java/com/metamatrix/common/comm/ClientServi= ceRegistry.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/common/comm/ClientServiceRegi= stry.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/common/comm/ClientServiceRegi= stry.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,14 +24,12 @@ = import java.util.concurrent.ConcurrentHashMap; = -public class ClientServiceRegistry { +public class ClientServiceRegistry { = private ConcurrentHashMap localServices =3D new Concur= rentHashMap(); private ConcurrentHashMap loggingContext =3D new Concu= rrentHashMap(); - private S sessionServiceProxy; = - public ClientServiceRegistry(S sessionService) { - this.sessionServiceProxy =3D sessionService; + public ClientServiceRegistry() { } = public T getClientService(Class iface) { @@ -42,10 +40,6 @@ return localServices.get(iface); } = - public S getSessionService() { - return this.sessionServiceProxy; - } - = public void registerClientService(Class iface, Object instance, String= loggingContext) { this.localServices.put(iface.getName(), instance); this.loggingContext.put(iface.getName(), loggingContext); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ConnectorManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorManager.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorManager.java 2009-02-16 21:35:21 UTC (rev 474) @@ -54,12 +54,11 @@ import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; import com.metamatrix.connector.api.ConnectorAnnotations.SynchronousWorker= s; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.internal.ConnectorPropertyNames; -import com.metamatrix.connector.monitor.ConnectionStatus; import com.metamatrix.connector.xa.api.XAConnection; import com.metamatrix.connector.xa.api.XAConnector; import com.metamatrix.core.util.Assertion; @@ -270,7 +269,7 @@ /** * @see com.metamatrix.dqp.internal.datamgr.ConnectorManager#isAlive() */ - public ConnectionStatus getStatus() { + public Boolean getStatus() { ClassLoader contextloader =3D Thread.currentThread().getContextCla= ssLoader(); try { Thread.currentThread().setContextClassLoader(classloader); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ConnectorWorkItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWorkItem.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWorkItem.java 2009-02-16 21:35:21 UTC (rev 474) @@ -34,12 +34,12 @@ import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.Connector; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.Execution; import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IQueryCommand; @@ -331,10 +331,6 @@ } return null; } - @Override - public List getWarnings() { - return exec.getWarnings(); - } }; } = @@ -406,7 +402,7 @@ // implicit close. response.setSupportsImplicitClose(!this.securityContext.keepEx= ecutionAlive()); response.setTransactional(this.securityContext.isTransactional= ()); - response.setWarnings(this.execution.getWarnings()); + response.setWarnings(this.securityContext.getWarnings()); = if ( lastBatch ) { response.setFinalRow(rowCount); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ConnectorWrapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWrapper.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWrapper.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,11 +26,8 @@ import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; -import com.metamatrix.connector.monitor.AliveStatus; -import com.metamatrix.connector.monitor.ConnectionStatus; -import com.metamatrix.connector.monitor.MonitoredConnector; import com.metamatrix.connector.pool.ConnectorIdentity; import com.metamatrix.connector.pool.ConnectorIdentityFactory; import com.metamatrix.connector.pool.SingleIdentity; @@ -41,7 +38,7 @@ /** * ConnectorWrapper adds default behavior to the wrapped connector. */ -public class ConnectorWrapper implements XAConnector, MonitoredConnector, = ConnectorIdentityFactory { +public class ConnectorWrapper implements XAConnector, ConnectorIdentityFac= tory { = private Connector actualConnector; = @@ -94,17 +91,20 @@ return actualConnector.getCapabilities(); } = - @Override - public final ConnectionStatus getStatus() { - if(actualConnector instanceof MonitoredConnector){ - return ((MonitoredConnector)actualConnector).getStatus(); + public final Boolean getStatus() { + if (supportsSingleIdentity()) { + Connection conn =3D null; + try { + conn =3D this.getConnection(null); + return conn.isAlive(); + } catch (ConnectorException e) { + return Boolean.FALSE; + } finally { + conn.close(); + } } - return getStatusDirect(); + return null; } - - protected ConnectionStatus getStatusDirect() { - return new ConnectionStatus(AliveStatus.UNKNOWN); - } = public Connector getActualConnector() { return actualConnector; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ExecutionContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Exe= cutionContextImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Exe= cutionContextImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,6 +23,9 @@ package com.metamatrix.dqp.internal.datamgr.impl; = import java.io.Serializable; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; = import com.metamatrix.common.buffer.impl.BufferConfig; import com.metamatrix.connector.api.ExecutionContext; @@ -63,6 +66,7 @@ private ConnectorIdentity connectorIdentity; = private int batchSize =3D BufferConfig.DEFAULT_CONNECTOR_BATCH_SIZE; + private List warnings =3D new LinkedList(); = public ExecutionContextImpl(String vdbName, String vdbVersion, String = userName, Serializable trustedPayload, Serializable = executionPayload, = @@ -189,4 +193,21 @@ public void setBatchSize(int batchSize) { this.batchSize =3D batchSize; } + = + /** + * Add an exception as a warning to this Execution. + */ + @Override + public void addWarning(Exception ex) { + if (ex =3D=3D null) { + return; + } + this.warnings.add(ex); + } + = + public List getWarnings() { + List result =3D new ArrayList(warnings); + warnings.clear(); + return result; + } } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ProcedureBatchHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Pro= cedureBatchHandler.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Pro= cedureBatchHandler.java 2009-02-16 21:35:21 UTC (rev 474) @@ -31,10 +31,11 @@ import java.util.Iterator; import java.util.List; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.dqp.DQPPlugin; = class ProcedureBatchHandler { @@ -53,9 +54,9 @@ Iterator iter =3D params.iterator(); while(iter.hasNext()){ IParameter param =3D (IParameter)iter.next(); - if (param.getDirection() =3D=3D IParameter.RESULT_SET) { + if (param.getDirection() =3D=3D Direction.RESULT_SET) { resultSetCols =3D param.getMetadataID().getChildIDs().= size(); - } else if(param.getDirection() =3D=3D IParameter.RETURN ||= param.getDirection() =3D=3D IParameter.OUT || param.getDirection() =3D=3D = IParameter.INOUT){ + } else if(param.getDirection() =3D=3D Direction.RETURN || = param.getDirection() =3D=3D Direction.OUT || param.getDirection() =3D=3D Di= rection.INOUT){ paramCols +=3D 1; } } @@ -89,7 +90,7 @@ //return while(iter.hasNext()){ IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() =3D=3D IParameter.RETURN){ + if(param.getDirection() =3D=3D Direction.RETURN){ outParamValues.set(index++, procExec.getOutputValue(param)= ); } } @@ -97,7 +98,7 @@ iter =3D params.iterator(); while(iter.hasNext()){ IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() =3D=3D IParameter.OUT || param.getDire= ction() =3D=3D IParameter.INOUT){ + if(param.getDirection() =3D=3D Direction.OUT || param.getDirec= tion() =3D=3D Direction.INOUT){ outParamValues.set(index++, procExec.getOutputValue(param)= ); } } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/SynchConnectorWorkItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Syn= chConnectorWorkItem.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Syn= chConnectorWorkItem.java 2009-02-16 21:35:21 UTC (rev 474) @@ -33,7 +33,7 @@ import com.metamatrix.common.comm.api.ResultsReceiver; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.xa.XATransactionException; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xa.api.XAConnection; import com.metamatrix.dqp.message.AtomicRequestMessage; import com.metamatrix.dqp.message.AtomicResultsMessage; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/TypeFacilityImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Typ= eFacilityImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Typ= eFacilityImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,8 +23,8 @@ package com.metamatrix.dqp.internal.datamgr.impl; = import com.metamatrix.common.types.*; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.exception.ConnectorException; = /** */ Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/CompareCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /CompareCriteriaImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /CompareCriteriaImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,9 +30,9 @@ = private IExpression leftExpression =3D null; private IExpression rightExpression =3D null; - private int operator; + private Operator operator; = - public CompareCriteriaImpl(IExpression left, IExpression right, int op= erator) { + public CompareCriteriaImpl(IExpression left, IExpression right, Operat= or operator) { leftExpression =3D left; rightExpression =3D right; this.operator =3D operator; @@ -54,7 +54,7 @@ /** * @see com.metamatrix.connector.language.ICompareCriteria#getOperator= () */ - public int getOperator() { + public Operator getOperator() { return this.operator; } = @@ -75,7 +75,7 @@ /* = * @see com.metamatrix.data.language.ICompareCriteria#setOperator(int) */ - public void setOperator(int operator) { + public void setOperator(Operator operator) { this.operator =3D operator; } = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/CompoundCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /CompoundCriteriaImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /CompoundCriteriaImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,9 +30,9 @@ public class CompoundCriteriaImpl extends BaseLanguageObject implements IC= ompoundCriteria { = private List criteria =3D null; - private int operator =3D AND; + private Operator operator =3D Operator.AND; = - public CompoundCriteriaImpl(List nestedCriteria, int operator) { + public CompoundCriteriaImpl(List nestedCriteria, Operator operator) { criteria =3D nestedCriteria; this.operator =3D operator; = } @@ -40,7 +40,7 @@ /** * @see com.metamatrix.connector.language.ICompoundCriteria#getOperato= r() */ - public int getOperator() { + public Operator getOperator() { return this.operator; } = @@ -61,7 +61,7 @@ /* = * @see com.metamatrix.data.language.ICompoundCriteria#setOperator(int) */ - public void setOperator(int operator) { + public void setOperator(Operator operator) { this.operator =3D operator; } = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/JoinImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /JoinImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /JoinImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -32,10 +32,10 @@ = private IFromItem leftItem =3D null; private IFromItem rightItem =3D null; - private int joinType; + private JoinType joinType; private List criteria =3D null; = - public JoinImpl(IFromItem left, IFromItem right, int joinType, List cr= iteria) { + public JoinImpl(IFromItem left, IFromItem right, JoinType joinType, Li= st criteria) { this.leftItem =3D left; this.rightItem =3D right; this.joinType =3D joinType; @@ -58,7 +58,7 @@ /** * @see com.metamatrix.connector.language.IJoin#getJoinType() */ - public int getJoinType() { + public JoinType getJoinType() { return this.joinType; } = @@ -90,7 +90,7 @@ /* = * @see com.metamatrix.data.language.IJoin#setJoinType(int) */ - public void setJoinType(int type) { + public void setJoinType(JoinType type) { this.joinType =3D type; } /* = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/LanguageBridgeFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageBridgeFactory.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageBridgeFactory.java 2009-02-16 21:35:21 UTC (rev 474) @@ -67,6 +67,9 @@ import com.metamatrix.connector.language.ISubqueryCompareCriteria; import com.metamatrix.connector.language.ISubqueryInCriteria; import com.metamatrix.connector.language.IUpdate; +import com.metamatrix.connector.language.ICompareCriteria.Operator; +import com.metamatrix.connector.language.IParameter.Direction; +import com.metamatrix.connector.language.ISubqueryCompareCriteria.Quantifi= er; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.dqp.DQPPlugin; import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; @@ -250,17 +253,17 @@ criteria.add(translate((Criteria)i.next())); } = - int joinType =3D IJoin.INNER_JOIN; + IJoin.JoinType joinType =3D IJoin.JoinType.INNER_JOIN; if(join.getJoinType().equals(JoinType.JOIN_INNER)) { - joinType =3D IJoin.INNER_JOIN; + joinType =3D IJoin.JoinType.INNER_JOIN; } else if(join.getJoinType().equals(JoinType.JOIN_LEFT_OUTER)) { - joinType =3D IJoin.LEFT_OUTER_JOIN; + joinType =3D IJoin.JoinType.LEFT_OUTER_JOIN; } else if(join.getJoinType().equals(JoinType.JOIN_RIGHT_OUTER)) { - joinType =3D IJoin.RIGHT_OUTER_JOIN; + joinType =3D IJoin.JoinType.RIGHT_OUTER_JOIN; } else if(join.getJoinType().equals(JoinType.JOIN_FULL_OUTER)) { - joinType =3D IJoin.FULL_OUTER_JOIN; + joinType =3D IJoin.JoinType.FULL_OUTER_JOIN; } else if(join.getJoinType().equals(JoinType.JOIN_CROSS)) { - joinType =3D IJoin.CROSS_JOIN; + joinType =3D IJoin.JoinType.CROSS_JOIN; } = return new JoinImpl(translate(join.getLeftClause()), @@ -302,25 +305,25 @@ } = ICompareCriteria translate(CompareCriteria criteria) throws MetaMatrix= ComponentException { - int operator =3D ICompareCriteria.EQ; + ICompareCriteria.Operator operator =3D Operator.EQ; switch(criteria.getOperator()) { case CompareCriteria.EQ: = - operator =3D ICompareCriteria.EQ; + operator =3D Operator.EQ; break; case CompareCriteria.NE: = - operator =3D ICompareCriteria.NE; + operator =3D Operator.NE; break; case CompareCriteria.LT: = - operator =3D ICompareCriteria.LT; + operator =3D Operator.LT; break; case CompareCriteria.LE: = - operator =3D ICompareCriteria.LE; + operator =3D Operator.LE; break; case CompareCriteria.GT: = - operator =3D ICompareCriteria.GT; + operator =3D Operator.GT; break; case CompareCriteria.GE: = - operator =3D ICompareCriteria.GE; + operator =3D Operator.GE; break; = } @@ -336,14 +339,7 @@ translatedCriteria.add(translate((Criteria)i.next())); } = - int operator =3D 0; - if(criteria.getOperator() =3D=3D CompoundCriteria.AND) { - operator =3D ICompoundCriteria.AND; - } else { - operator =3D ICompoundCriteria.OR; - } - = - return new CompoundCriteriaImpl(translatedCriteria, operator); + return new CompoundCriteriaImpl(translatedCriteria, criteria.getOp= erator() =3D=3D CompoundCriteria.AND?ICompoundCriteria.Operator.AND:ICompou= ndCriteria.Operator.OR); } = IExistsCriteria translate(ExistsCriteria criteria) throws MetaMatrixCo= mponentException { @@ -377,38 +373,38 @@ } = ISubqueryCompareCriteria translate(SubqueryCompareCriteria criteria) t= hrows MetaMatrixComponentException { - int quantifier =3D 0; + Quantifier quantifier =3D Quantifier.ALL; switch(criteria.getPredicateQuantifier()) { case SubqueryCompareCriteria.ALL: = - quantifier =3D ISubqueryCompareCriteria.ALL; + quantifier =3D Quantifier.ALL; break; case SubqueryCompareCriteria.ANY: - quantifier =3D ISubqueryCompareCriteria.SOME; + quantifier =3D Quantifier.SOME; break; case SubqueryCompareCriteria.SOME: - quantifier =3D ISubqueryCompareCriteria.SOME; + quantifier =3D Quantifier.SOME; break; } = - int operator =3D 0; + ICompareCriteria.Operator operator =3D ICompareCriteria.Operator.E= Q; switch(criteria.getOperator()) { case SubqueryCompareCriteria.EQ: - operator =3D ISubqueryCompareCriteria.EQ; + operator =3D ICompareCriteria.Operator.EQ; break; case SubqueryCompareCriteria.NE: - operator =3D ISubqueryCompareCriteria.NE; + operator =3D ICompareCriteria.Operator.NE; break; case SubqueryCompareCriteria.LT: - operator =3D ISubqueryCompareCriteria.LT; + operator =3D ICompareCriteria.Operator.LT; break; case SubqueryCompareCriteria.LE: - operator =3D ISubqueryCompareCriteria.LE; + operator =3D ICompareCriteria.Operator.LE; break; case SubqueryCompareCriteria.GT: - operator =3D ISubqueryCompareCriteria.GT; + operator =3D ICompareCriteria.Operator.GT; break; case SubqueryCompareCriteria.GE: - operator =3D ISubqueryCompareCriteria.GE; + operator =3D ICompareCriteria.Operator.GE; break; = } = @@ -664,28 +660,28 @@ } = IParameter translate(SPParameter param, ProcedureIDImpl procID) throws= MetaMatrixComponentException { - int direction =3D IParameter.IN; + Direction direction =3D Direction.IN; switch(param.getParameterType()) { case ParameterInfo.IN: = - direction =3D IParameter.IN; + direction =3D Direction.IN; break; case ParameterInfo.INOUT: = - direction =3D IParameter.INOUT; + direction =3D Direction.INOUT; break; case ParameterInfo.OUT: = - direction =3D IParameter.OUT; + direction =3D Direction.OUT; break; case ParameterInfo.RESULT_SET: = - direction =3D IParameter.RESULT_SET; + direction =3D Direction.RESULT_SET; break; case ParameterInfo.RETURN_VALUE: = - direction =3D IParameter.RETURN; + direction =3D Direction.RETURN; break; } = try { MetadataID metadataID =3D null; = - if(direction =3D=3D IParameter.RESULT_SET) { + if(direction =3D=3D Direction.RESULT_SET) { metadataID =3D metadataFactory.createResultSetID(procID, p= aram.getMetadataID(), param.getResultSetIDs()); return new ParameterImpl(param.getIndex(), direction, para= m.getValue(), param.getClassType(), metadataID); = = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/LanguageFactoryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageFactoryImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageFactoryImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -61,7 +61,7 @@ * @see com.metamatrix.data.language.ILanguageFactory#createCompareCri= teria(int, com.metamatrix.data.language.IExpression, com.metamatrix.data.la= nguage.IExpression) */ public ICompareCriteria createCompareCriteria( - int operator, + ICompareCriteria.Operator operator, IExpression leftExpression, IExpression rightExpression) { return new CompareCriteriaImpl(leftExpression, rightExpression, op= erator); @@ -70,7 +70,7 @@ /* = * @see com.metamatrix.data.language.ILanguageFactory#createCompoundCr= iteria(int, java.util.List) */ - public ICompoundCriteria createCompoundCriteria(int operator, List inn= erCriteria) { + public ICompoundCriteria createCompoundCriteria(ICompoundCriteria.Oper= ator operator, List innerCriteria) { return new CompoundCriteriaImpl(innerCriteria, operator); } = @@ -154,7 +154,7 @@ /* = * @see com.metamatrix.data.language.ILanguageFactory#createJoin(int, = com.metamatrix.data.language.IFromItem, com.metamatrix.data.language.IFromI= tem, java.util.List) */ - public IJoin createJoin(int joinType, IFromItem leftItem, IFromItem ri= ghtItem, List criteria) { + public IJoin createJoin(IJoin.JoinType joinType, IFromItem leftItem, I= FromItem rightItem, List criteria) { return new JoinImpl(leftItem, rightItem, joinType, criteria); } = @@ -200,7 +200,7 @@ /* = * @see com.metamatrix.data.language.ILanguageFactory#createParameter(= int, int, java.lang.Object, java.lang.Class) */ - public IParameter createParameter(int index, int direction, Object val= ue, Class type, MetadataID metadataReference) { + public IParameter createParameter(int index, IParameter.Direction dire= ction, Object value, Class type, MetadataID metadataReference) { return new ParameterImpl(index, direction, value, type, metadataRe= ference); } = @@ -261,8 +261,8 @@ */ public ISubqueryCompareCriteria createSubqueryCompareCriteria( IExpression leftExpression, - int operator, - int quantifier, + ICompareCriteria.Operator operator, + ISubqueryCompareCriteria.Quantifier quantifier, IQuery subquery) { return new SubqueryCompareCriteriaImpl(leftExpression, operator, q= uantifier, subquery); } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/ParameterImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ParameterImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ParameterImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,13 +29,13 @@ public class ParameterImpl extends BaseLanguageObject implements IParamete= r { = private int index; - private int direction; + private Direction direction; private Object value; private boolean valueSpecified; private Class type; private MetadataID metadataID; = - public ParameterImpl(int index, int direction, Object value, Class typ= e, MetadataID metadataID) { + public ParameterImpl(int index, Direction direction, Object value, Cla= ss type, MetadataID metadataID) { setIndex(index); setDirection(direction); setValue(value); @@ -53,7 +53,7 @@ /** * @see com.metamatrix.connector.language.IParameter#getDirection() */ - public int getDirection() { + public Direction getDirection() { return this.direction; } = @@ -88,7 +88,7 @@ /* = * @see com.metamatrix.data.language.IParameter#setDirection(int) */ - public void setDirection(int direction) { + public void setDirection(Direction direction) { this.direction =3D direction; } = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/SubqueryCompareCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SubqueryCompareCriteriaImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SubqueryCompareCriteriaImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -23,6 +23,7 @@ package com.metamatrix.dqp.internal.datamgr.language; = import com.metamatrix.connector.language.*; +import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; = /** @@ -30,14 +31,14 @@ public class SubqueryCompareCriteriaImpl extends BaseLanguageObject implem= ents ISubqueryCompareCriteria { = private IExpression leftExpr; - private int operator; - private int quantifier; + private Operator operator; + private Quantifier quantifier; private IQueryCommand query; = /** * = */ - public SubqueryCompareCriteriaImpl(IExpression leftExpr, int operator,= int quantifier, IQueryCommand query) { + public SubqueryCompareCriteriaImpl(IExpression leftExpr, Operator oper= ator, Quantifier quantifier, IQueryCommand query) { this.leftExpr =3D leftExpr; this.operator =3D operator; this.quantifier =3D quantifier; @@ -54,14 +55,14 @@ /* = * @see com.metamatrix.data.language.ISubqueryCompareCriteria#getOpera= tor() */ - public int getOperator() { + public Operator getOperator() { return this.operator; } = /* = * @see com.metamatrix.data.language.ISubqueryCompareCriteria#getQuant= ifier() */ - public int getQuantifier() { + public Quantifier getQuantifier() { return this.quantifier; } = @@ -89,14 +90,14 @@ /* = * @see com.metamatrix.data.language.ISubqueryCompareCriteria#setOpera= tor(int) */ - public void setOperator(int operator) { + public void setOperator(Operator operator) { this.operator =3D operator; } = /* = * @see com.metamatrix.data.language.ISubqueryCompareCriteria#setQuant= ifier(int) */ - public void setQuantifier(int quantifier) { + public void setQuantifier(Quantifier quantifier) { this.quantifier =3D quantifier; } = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/ElementImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ElementImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ElementImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -27,7 +27,7 @@ import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.query.metadata.SupportConstants; = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/MetadataFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataFactory.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataFactory.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,7 +28,7 @@ = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.*; import com.metamatrix.core.util.ArgCheck; import com.metamatrix.query.metadata.QueryMetadataInterface; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/MetadataIDImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataIDImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataIDImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,7 +28,7 @@ = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.query.metadata.QueryMetadataInterface; = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/MetadataObjectImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataObjectImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataObjectImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,7 +28,7 @@ = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.query.metadata.QueryMetadataInterface; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/ParameterIDImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ParameterIDImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ParameterIDImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,7 +25,7 @@ import java.util.*; = import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.query.metadata.QueryMetadataInterface; = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/ParameterImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ParameterImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ParameterImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,7 @@ = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.Parameter; import com.metamatrix.dqp.DQPPlugin; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/ProcedureIDImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ProcedureIDImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ProcedureIDImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,7 @@ = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.dqp.message.ParameterInfo; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.metadata.StoredProcedureInfo; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/RuntimeMetadataImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /RuntimeMetadataImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /RuntimeMetadataImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,7 @@ = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.*; = /** Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/TypeModelImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /TypeModelImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /TypeModelImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,7 @@ = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.TypeModel; import com.metamatrix.query.metadata.SupportConstants; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/co= nnector/ConnectionPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionPool.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionPool.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Date; import java.util.HashMap; import java.util.IdentityHashMap; import java.util.Iterator; @@ -42,10 +41,8 @@ import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.connector.DataPlugin; import com.metamatrix.connector.api.Connection; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; -import com.metamatrix.connector.monitor.AliveStatus; -import com.metamatrix.connector.monitor.ConnectionStatus; import com.metamatrix.connector.pool.ConnectorIdentity; import com.metamatrix.connector.pool.PoolAwareConnection; import com.metamatrix.connector.pool.SingleIdentity; @@ -135,14 +132,6 @@ = private volatile boolean shuttingDownPool; = - protected volatile boolean lastConnectionAttemptFailed =3D false; - - /**Exception received during last failed connection attempt*/ - private volatile Exception lastConnectionAttemptException =3D null; - - /**Time of last failed connection attempt*/ - private volatile Date lastConnectionAttemptDate =3D null; - = /** * Construct the connection pool with a connection factory * @@ -261,10 +250,15 @@ = ConnectionWrapper conn =3D connLists.unused.removeFirs= t(); if ( conn.isAlive() ) { = - LogManager.logTrace(CTX_CONNECTOR, new Object[] {= "Existing connection leased for", id}); //$NON-NLS-1$ - connLists.used.addLast(conn); - success =3D true; - return conn; + try { + conn.setConnectorIdentity(id); + LogManager.logDetail(CTX_CONNECTOR, new Object[]= {"Existing connection leased for", id}); //$NON-NLS-1$ + connLists.used.addLast(conn); + success =3D true; + return conn; + } catch (ConnectorException e) { + LogManager.logDetail(CTX_CONNECTOR, new Object[] {"Existing connec= tion failed to have identity updated", id}); //$NON-NLS-1$ + } } closeSourceConnection(conn, id); } @@ -351,12 +345,8 @@ sourceConnection =3D new ConnectionWrapper(connection, this, test= ConnectInterval); LogManager.logTrace(CTX_CONNECTOR, new Object[] {"Connection pool= created a connection for", id}); //$NON-NLS-1$ } catch (ConnectorException e) { - lastConnectionAttemptFailed =3D true; - lastConnectionAttemptException =3D e; - lastConnectionAttemptDate =3D new Date(); throw new ConnectionPoolException(e); } - lastConnectionAttemptFailed =3D false; return sourceConnection; } = @@ -398,103 +388,6 @@ } = /** - * Check the status of connections in this pool. - * The pool is operational if it has at least one live - * connection available to it. - * - * @return AliveStatus.ALIVE if there are any connections in use, or a= ny live unused connections. - *

AliveStatus.DEAD if there are no live connections, and the conne= ction pool cannot create a new connection. - *

AliveStatus.UNKNOWN if there are no live connections, and we don= 't have the ability to test getting a new connection. = - */ - public ConnectionStatus getStatus() { - AliveStatus poolStatus; - - Collection values =3D null; - synchronized (this.lock) { - values =3D new LinkedList(this.idConnections.values()); - } - = - poolStatus =3D checkStatusOfUsedConnections(values); - - if (poolStatus.equals(AliveStatus.UNKNOWN)) { - poolStatus =3D checkStatusOfUnusedConnections(values); - } - - if (poolStatus.equals(AliveStatus.UNKNOWN)) { - poolStatus =3D testGetConnection(); - } - - if (poolStatus.equals(AliveStatus.UNKNOWN) && lastConnectionAttemp= tFailed) { - poolStatus =3D AliveStatus.DEAD; - } - = - //never set the status of "UserIdentity" connectors to DEAD. - if (poolStatus.equals(AliveStatus.DEAD) && (!connectionFactory.sup= portsSingleIdentity())) { - poolStatus =3D AliveStatus.UNKNOWN; - } - = - return new ConnectionStatus(poolStatus, getTotalConnectionCount(),= lastConnectionAttemptException, = - lastConnectionAttemptDate); - } - - private AliveStatus checkStatusOfUsedConnections(Collection connection= Infos) { - // Check size of all used pools. If any > 0, pool is alive. - // Note that this only proves pool is alive for one ConnectorIdent= ity. - = - for (Iterator i =3D connectionInfos.iterator(); i.hasNext(); ) { - ConnectionsForId connLists =3D (ConnectionsForId) i.next(); - = - synchronized (connLists) { - // check size of this used conn list for one identity - if ( connLists.used.size() > 0 ) { - return AliveStatus.ALIVE; = - } - } - } - return AliveStatus.UNKNOWN; - } - - private AliveStatus checkStatusOfUnusedConnections(Collection connecti= onInfos) { - // If we're here, we haven't found a live connection yet. - // Must query unused connections. - for (Iterator i =3D connectionInfos.iterator(); i.hasNext(); ) { - ConnectionsForId connLists =3D (ConnectionsForId)i.next(); - - synchronized (connLists) { - // check size of this used conn list for one identity - Iterator unusedConnItr =3D connLists.unused.iterator(); - while (unusedConnItr.hasNext()) { - if (((ConnectionWrapper)unusedConnItr.next()).isAlive(= )) { - return AliveStatus.ALIVE; - } = - //TODO: remove connection - } - } - } - return AliveStatus.UNKNOWN; - } - = - /** - * Test datasource availability by getting a connection. - * @return - * @since 4.3 - */ - private AliveStatus testGetConnection() { - if (connectionFactory.supportsSingleIdentity()) { = - try { - ConnectionWrapper connection =3D obtain(null); - boolean alive =3D connection.isAlive(); - release(connection, !alive); - return (alive ? AliveStatus.ALIVE : AliveStatus.DEAD); - } catch (ConnectionPoolException e) { - return AliveStatus.DEAD; - } = - } - = - return AliveStatus.UNKNOWN; - } - = - /** * Shut down the pool. */ public void shutDown() { @@ -553,11 +446,11 @@ = //log that we removed a connection if (LogManager.isMessageToBeRecorded(CTX_CONNECTOR, MessageLev= el.TRACE)) { - LogManager.logTrace(CTX_CONNECTOR, DataPlugin.Util.getStri= ng("ConnectionPool.Removed_conn", id)); //$NON-NLS-1$ + LogManager.logDetail(CTX_CONNECTOR, DataPlugin.Util.getStr= ing("ConnectionPool.Removed_conn", id)); //$NON-NLS-1$ } = } catch (Exception e) { - LogManager.logError(CTX_CONNECTOR, DataPlugin.Util.getString("= ConnectionPool.Failed_close_a_connection__2", id)); //$NON-NLS-1$ + LogManager.logWarning(CTX_CONNECTOR, DataPlugin.Util.getString= ("ConnectionPool.Failed_close_a_connection__2", id)); //$NON-NLS-1$ } } = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/co= nnector/ConnectionPoolException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionPoolException.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionPoolException.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,7 @@ */ package com.metamatrix.dqp.internal.pooling.connector; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; = /** * This class is for exceptions occurring within the connection pool. Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/co= nnector/ConnectionWrapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionWrapper.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionWrapper.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,11 +26,12 @@ = import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorCapabilities; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.Execution; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.pool.ConnectorIdentity; import com.metamatrix.connector.pool.PoolAwareConnection; import com.metamatrix.connector.xa.api.XAConnection; = @@ -137,5 +138,13 @@ public void setTestInterval(long testInterval) { this.testInterval =3D testInterval; } + = + @Override + public void setConnectorIdentity(ConnectorIdentity context) + throws ConnectorException { + if (this.connection instanceof PoolAwareConnection) { + ((PoolAwareConnection)this.connection).setConnectorIdentity(context); + } + } = } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/co= nnector/PooledConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/PooledConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/PooledConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -34,9 +34,8 @@ import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; -import com.metamatrix.connector.monitor.ConnectionStatus; import com.metamatrix.connector.xa.api.TransactionContext; import com.metamatrix.connector.xa.api.XAConnection; import com.metamatrix.connector.xa.api.XAConnector; @@ -166,9 +165,4 @@ return conn; } = - @Override - public ConnectionStatus getStatusDirect() { - return pool.getStatus(); - } - = } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResul= tsMessage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMess= age.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMess= age.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,7 +29,7 @@ import java.util.List; = import com.metamatrix.common.batch.BatchSerializer; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.ExternalizeUtil; = public class AtomicResultsMessage implements Externalizable { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/DataService= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/service/DataService.java = 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/main/java/com/metamatrix/dqp/service/DataService.java = 2009-02-16 21:35:21 UTC (rev 474) @@ -31,7 +31,6 @@ import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; import com.metamatrix.common.comm.api.ResultsReceiver; import com.metamatrix.common.config.api.ConnectorBinding; -import com.metamatrix.connector.monitor.AliveStatus; import com.metamatrix.dqp.internal.datamgr.ConnectorID; import com.metamatrix.dqp.internal.process.DQPWorkContext; import com.metamatrix.dqp.message.AtomicRequestID; @@ -122,7 +121,7 @@ * @throws MetaMatrixComponentException * @since 4.3 */ - AliveStatus getConnectorBindingState(String connectorBindingName) = + Boolean getConnectorBindingState(String connectorBindingName) = throws MetaMatrixComponentException; = /** Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/im= pl/FakeConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fak= eConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fak= eConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -33,25 +33,23 @@ import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.Execution; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.UpdateExecution; +import com.metamatrix.connector.basic.BasicConnection; import com.metamatrix.connector.basic.BasicConnectorCapabilities; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.monitor.AliveStatus; -import com.metamatrix.connector.monitor.ConnectionStatus; -import com.metamatrix.connector.monitor.MonitoredConnector; import com.metamatrix.connector.xa.api.TransactionContext; import com.metamatrix.connector.xa.api.XAConnection; import com.metamatrix.connector.xa.api.XAConnector; = -public class FakeConnector implements Connector, XAConnector, MonitoredCon= nector { +public class FakeConnector implements Connector, XAConnector { private static final int RESULT_SIZE =3D 5; = private boolean executeBlocks; @@ -78,7 +76,7 @@ return new FakeXAConnection(); } = - private class FakeConnection implements Connection { + private class FakeConnection extends BasicConnection { public boolean released =3D false; public Execution createExecution(ICommand command, ExecutionContex= t executionContext, RuntimeMetadata metadata) throws ConnectorException { return new FakeBlockingExecution(executionContext); @@ -131,7 +129,7 @@ } @Override public void execute() throws ConnectorException { - this.addWarning(new Exception("Some warning")); //$NON-NLS-1$ + ec.addWarning(new Exception("Some warning")); //$NON-NLS-1$ } @Override public List next() throws ConnectorException, DataNotAvailableExce= ption { @@ -193,11 +191,6 @@ this.simulatedBatchRetrievalTime =3D simulatedBatchRetrievalTime; } = - @Override - public ConnectionStatus getStatus() { - return new ConnectionStatus(AliveStatus.DEAD); - } - public void setClassloader(ClassLoader classloader) { this.classloader =3D classloader; } Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/im= pl/FakeProcedureExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fak= eProcedureExecution.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fak= eProcedureExecution.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,10 +25,10 @@ import java.util.Arrays; import java.util.List; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IParameter; = final class FakeProcedureExecution extends BasicExecution implements Proce= dureExecution { Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/im= pl/TestConnectorManagerImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Tes= tConnectorManagerImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Tes= tConnectorManagerImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -38,7 +38,6 @@ import com.metamatrix.common.application.ApplicationEnvironment; import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; import com.metamatrix.connector.internal.ConnectorPropertyNames; -import com.metamatrix.connector.monitor.AliveStatus; import com.metamatrix.dqp.internal.datamgr.impl.TestConnectorWorkItem.Queu= eResultsReceiver; import com.metamatrix.dqp.internal.pooling.connector.FakeSourceConnectionF= actory; import com.metamatrix.dqp.internal.process.DQPWorkContext; @@ -149,16 +148,6 @@ cm.stop(); } = - public void testMonitoredConnector() throws Exception { - ConnectorManager cm =3D new ConnectorManager(); - Properties props =3D new Properties(); - props.setProperty(ConnectorPropertyNames.CONNECTOR_CLASS, FakeConn= ector.class.getName()); - props.put(ConnectorPropertyNames.CONNECTOR_CLASS_LOADER, this.getC= lass().getClassLoader()); - startConnectorManager(cm, props); - assertTrue(cm.getStatus().getStatus() =3D=3D AliveStatus.DEAD); - cm.stop(); - } - = public void testDefect19049() throws Exception { ConnectorManager cm =3D new ConnectorManager(); Properties props =3D new Properties(); Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/im= pl/TestConnectorWorkItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Tes= tConnectorWorkItem.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Tes= tConnectorWorkItem.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,8 +30,8 @@ import junit.framework.TestCase; = import com.metamatrix.common.comm.api.ResultsReceiver; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.dqp.client.ResultsFuture; import com.metamatrix.dqp.internal.datamgr.ConnectorID; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestCompareCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestCompareCriteriaImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestCompareCriteriaImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -22,7 +22,7 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.ICompareCriteria; +import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.query.sql.lang.CompareCriteria; import com.metamatrix.query.sql.symbol.Constant; = @@ -62,12 +62,12 @@ } = public void testGetOperator() throws Exception { - assertEquals(ICompareCriteria.EQ, example(CompareCriteria.EQ, 200,= 100).getOperator()); - assertEquals(ICompareCriteria.GE, example(CompareCriteria.GE, 200,= 100).getOperator()); - assertEquals(ICompareCriteria.GT, example(CompareCriteria.GT, 200,= 100).getOperator()); - assertEquals(ICompareCriteria.LE, example(CompareCriteria.LE, 200,= 100).getOperator()); - assertEquals(ICompareCriteria.LT, example(CompareCriteria.LT, 200,= 100).getOperator()); - assertEquals(ICompareCriteria.NE, example(CompareCriteria.NE, 200,= 100).getOperator()); + assertEquals(Operator.EQ, example(CompareCriteria.EQ, 200, 100).ge= tOperator()); + assertEquals(Operator.GE, example(CompareCriteria.GE, 200, 100).ge= tOperator()); + assertEquals(Operator.GT, example(CompareCriteria.GT, 200, 100).ge= tOperator()); + assertEquals(Operator.LE, example(CompareCriteria.LE, 200, 100).ge= tOperator()); + assertEquals(Operator.LT, example(CompareCriteria.LT, 200, 100).ge= tOperator()); + assertEquals(Operator.NE, example(CompareCriteria.NE, 200, 100).ge= tOperator()); } = } Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestCompoundCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestCompoundCriteriaImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestCompoundCriteriaImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,6 +25,7 @@ import java.util.Iterator; = import com.metamatrix.connector.language.ICriteria; +import com.metamatrix.connector.language.ICompoundCriteria.Operator; import com.metamatrix.query.sql.lang.CompareCriteria; import com.metamatrix.query.sql.lang.CompoundCriteria; = @@ -51,8 +52,8 @@ } = public void testGetOperator() throws Exception { - assertEquals(CompoundCriteriaImpl.AND, example(CompoundCriteria.AN= D).getOperator()); - assertEquals(CompoundCriteriaImpl.OR, example(CompoundCriteria.OR)= .getOperator()); + assertEquals(Operator.AND, example(CompoundCriteria.AND).getOperat= or()); + assertEquals(Operator.OR, example(CompoundCriteria.OR).getOperator= ()); } = public void testGetCriteria() throws Exception { Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestJoinImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestJoinImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestJoinImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -26,7 +26,6 @@ import java.util.Iterator; = import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IJoin; import com.metamatrix.query.sql.lang.CompareCriteria; import com.metamatrix.query.sql.lang.JoinPredicate; import com.metamatrix.query.sql.lang.JoinType; @@ -69,11 +68,11 @@ } = public void testGetJoinType() throws Exception { - assertEquals(IJoin.CROSS_JOIN, example(JoinType.JOIN_CROSS).getJoi= nType()); - assertEquals(IJoin.FULL_OUTER_JOIN, example(JoinType.JOIN_FULL_OUT= ER).getJoinType()); - assertEquals(IJoin.INNER_JOIN, example(JoinType.JOIN_INNER).getJoi= nType()); - assertEquals(IJoin.LEFT_OUTER_JOIN, example(JoinType.JOIN_LEFT_OUT= ER).getJoinType()); - assertEquals(IJoin.RIGHT_OUTER_JOIN, example(JoinType.JOIN_RIGHT_O= UTER).getJoinType()); + assertEquals(com.metamatrix.connector.language.IJoin.JoinType.CROS= S_JOIN, example(JoinType.JOIN_CROSS).getJoinType()); + assertEquals(com.metamatrix.connector.language.IJoin.JoinType.FULL= _OUTER_JOIN, example(JoinType.JOIN_FULL_OUTER).getJoinType()); + assertEquals(com.metamatrix.connector.language.IJoin.JoinType.INNE= R_JOIN, example(JoinType.JOIN_INNER).getJoinType()); + assertEquals(com.metamatrix.connector.language.IJoin.JoinType.LEFT= _OUTER_JOIN, example(JoinType.JOIN_LEFT_OUTER).getJoinType()); + assertEquals(com.metamatrix.connector.language.IJoin.JoinType.RIGH= T_OUTER_JOIN, example(JoinType.JOIN_RIGHT_OUTER).getJoinType()); } = public void testGetCriteria() throws Exception { Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestParameterImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestParameterImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestParameterImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,7 +24,7 @@ = import java.sql.ResultSet; = -import com.metamatrix.connector.language.IParameter; +import com.metamatrix.connector.language.IParameter.Direction; = import junit.framework.TestCase; = @@ -48,9 +48,9 @@ } = public void testGetDirection() throws Exception { - assertEquals(ParameterImpl.RESULT_SET, example(0).getDirection()); - assertEquals(ParameterImpl.IN, example(1).getDirection()); - assertEquals(ParameterImpl.IN, example(2).getDirection()); + assertEquals(Direction.RESULT_SET, example(0).getDirection()); + assertEquals(Direction.IN, example(1).getDirection()); + assertEquals(Direction.IN, example(2).getDirection()); } = public void testGetType() throws Exception { @@ -67,7 +67,7 @@ public void testGetValueSpecified() throws Exception { assertEquals(false, example(0).getValueSpecified()); = - ParameterImpl param =3D new ParameterImpl(1, IParameter.IN, null, = String.class, null); + ParameterImpl param =3D new ParameterImpl(1, Direction.IN, null, S= tring.class, null); // Test construction state (null value) assertEquals(false, param.getValueSpecified()); // Test value specified not set on null Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestSubqueryCompareCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestSubqueryCompareCriteriaImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestSubqueryCompareCriteriaImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -22,12 +22,15 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.ISubqueryCompareCriteria; -import com.metamatrix.query.sql.lang.*; +import junit.framework.TestCase; + +import com.metamatrix.connector.language.ICompareCriteria; +import com.metamatrix.connector.language.ISubqueryCompareCriteria.Quantifi= er; +import com.metamatrix.query.sql.lang.CompareCriteria; +import com.metamatrix.query.sql.lang.Query; +import com.metamatrix.query.sql.lang.SubqueryCompareCriteria; import com.metamatrix.query.sql.symbol.ElementSymbol; = -import junit.framework.TestCase; - /** */ public class TestSubqueryCompareCriteriaImpl extends TestCase { @@ -60,11 +63,11 @@ } = public void testOperator() throws Exception { - assertEquals("Wrong operator", ISubqueryCompareCriteria.GT, exampl= e().getOperator()); //$NON-NLS-1$ + assertEquals("Wrong operator", ICompareCriteria.Operator.GT, examp= le().getOperator()); //$NON-NLS-1$ } = public void testQuantifier() throws Exception { - assertEquals("Wrong quantifier", ISubqueryCompareCriteria.SOME, ex= ample().getQuantifier()); //$NON-NLS-1$ + assertEquals("Wrong quantifier", Quantifier.SOME, example().getQua= ntifier()); //$NON-NLS-1$ } = } Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/FakeSourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeSourceConnectionFactory.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeSourceConnectionFactory.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,12 +28,12 @@ import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.Execution; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.basic.BasicConnection; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.pool.PoolAwareConnection; = /** */ @@ -42,7 +42,7 @@ = static boolean alive =3D true; = - class FakeSourceConnection implements Connection, PoolAwareConnection { + class FakeSourceConnection extends BasicConnection { int id; = FakeSourceConnection(int id){ @@ -78,10 +78,6 @@ = } = - @Override - public void closeCalled() { - = - } } = @Override Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/FakeUserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeUserIdentityConnectionFactory.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeUserIdentityConnectionFactory.java 2009-02-16 21:35:21 UTC (rev 474) @@ -24,8 +24,8 @@ */ package com.metamatrix.dqp.internal.pooling.connector; = +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.pool.ConnectorIdentity; import com.metamatrix.connector.pool.ConnectorIdentityFactory; import com.metamatrix.connector.pool.UserIdentity; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/TestConnectionPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionPool.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionPool.java 2009-02-16 21:35:21 UTC (rev 474) @@ -29,7 +29,6 @@ import junit.framework.TestCase; = import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.monitor.AliveStatus; import com.metamatrix.connector.pool.UserIdentity; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorWrapper; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; @@ -169,7 +168,7 @@ singleIDPool.obtain(context); fail("No exception received when maxing out the pool"); //$NON= -NLS-1$ } catch(ConnectionPoolException e) { - assertEquals("The connection pool for identity \"SingleIdentit= y: atomic-request=3Dnull.null.null\" is at the maximum connection count \"5= \" and no connection became available in the timeout period. Consider incr= easing the number of connections allowed per identity or the wait time.", e= .getMessage()); //$NON-NLS-1$ + assertEquals("The connection pool for identity \"SingleIdentit= y\" is at the maximum connection count \"5\" and no connection became avail= able in the timeout period. Consider increasing the number of connections = allowed per identity or the wait time.", e.getMessage()); //$NON-NLS-1$ } } = @@ -197,7 +196,7 @@ = fail("No exception received on pool timeout"); //$NON-NLS-1$ = = } catch (ConnectionPoolException e) { - assertEquals("The connection pool for identity \"SingleIdentit= y: atomic-request=3Dnull.null.null\" exceeded wait time for connection, \"1= \" ms, and no connection became available in the timeout period. Consider = increasing the number of connections allowed per identity or the wait time.= ", e.getMessage()); //$NON-NLS-1$ + assertEquals("The connection pool for identity \"SingleIdentit= y\" exceeded wait time for connection, \"1\" ms, and no connection became a= vailable in the timeout period. Consider increasing the number of connecti= ons allowed per identity or the wait time.", e.getMessage()); //$NON-NLS-1$ } } = @@ -279,49 +278,6 @@ assertEquals(1, usedConns2.size()); = } = - /** - * Tests ConnectionPool.getStatus() with a SingleIdentity = - * @since 4.3 - */ - public void testGetStatusSingleIdentity() throws Exception { - //connection is open: status should be ALIVE - singleIDPool.lastConnectionAttemptFailed =3D false; - FakeSourceConnectionFactory.alive =3D true; - assertEquals(AliveStatus.ALIVE, singleIDPool.getStatus().aliveStat= us); = - = - //connection can't be reached: status should be DEAD - singleIDPool.lastConnectionAttemptFailed =3D false; - FakeSourceConnectionFactory.alive =3D false; - assertEquals(AliveStatus.DEAD, singleIDPool.getStatus().aliveStatu= s); = - = - //connection can't be reached: status should be DEAD = - singleIDPool.lastConnectionAttemptFailed =3D true; - assertEquals(AliveStatus.DEAD, singleIDPool.getStatus().aliveStatu= s); - } - = - /** - * Tests ConnectionPool.getStatus() with a UserIdentity = - * @since 4.3 - */ - public void testGetStatusUserIdentity() throws Exception { - userIDPool.lastConnectionAttemptFailed =3D false; - - //status should always be UNKNOWN - userIDPool.lastConnectionAttemptFailed =3D false; - FakeSourceConnectionFactory.alive =3D true; - assertEquals(AliveStatus.UNKNOWN, userIDPool.getStatus().aliveStat= us); = - = - //status should always be UNKNOWN - userIDPool.lastConnectionAttemptFailed =3D false; - FakeSourceConnectionFactory.alive =3D false; - assertEquals(AliveStatus.UNKNOWN, userIDPool.getStatus().aliveStat= us); - = - //status should always be UNKNOWN - userIDPool.lastConnectionAttemptFailed =3D true; - assertEquals(AliveStatus.UNKNOWN, userIDPool.getStatus().aliveStat= us); - - } - = static class LoadRunner extends Thread { = ConnectionPool pool; private int n; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/Te= stDataTierManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestData= TierManager.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/TestData= TierManager.java 2009-02-16 21:35:21 UTC (rev 474) @@ -43,7 +43,6 @@ import com.metamatrix.common.buffer.TupleSourceID; import com.metamatrix.common.comm.api.ResultsReceiver; import com.metamatrix.common.config.api.ConnectorBinding; -import com.metamatrix.connector.monitor.AliveStatus; import com.metamatrix.dqp.internal.datamgr.ConnectorID; import com.metamatrix.dqp.message.AtomicRequestID; import com.metamatrix.dqp.message.AtomicRequestMessage; @@ -371,7 +370,7 @@ public void startConnectorBinding(String connectorBindingName) thr= ows ApplicationLifecycleException,ComponentNotFoundException {} public void stopConnectorBinding(String connectorBindingName) thro= ws ApplicationLifecycleException,ComponentNotFoundException {} public List getConnectorBindings() throws ComponentNotFoundExcepti= on {return null;} - public AliveStatus getConnectorBindingState(String connectorBindin= gName) throws MetaMatrixComponentException {return null;} + public Boolean getConnectorBindingState(String connectorBindingNam= e) throws MetaMatrixComponentException {return null;} public ConnectorBinding getConnectorBinding(String connectorBindin= gName) throws MetaMatrixComponentException {return null;} public Collection getConnectorBindingStatistics(String connectorBi= ndingName) throws MetaMatrixComponentException {return null;} public void clearConnectorBindingCache(String connectorBindingName= ) throws MetaMatrixComponentException {} Modified: trunk/engine/src/test/java/com/metamatrix/dqp/service/AutoGenData= Service.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/service/AutoGenDataServic= e.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/engine/src/test/java/com/metamatrix/dqp/service/AutoGenDataServic= e.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,15 +28,12 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import java.util.Map; = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; import com.metamatrix.common.comm.api.ResultsReceiver; import com.metamatrix.common.config.api.ConnectorBinding; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.monitor.AliveStatus; -import com.metamatrix.connector.monitor.ConnectionStatus; import com.metamatrix.dqp.internal.datamgr.ConnectorID; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorWorkItem; import com.metamatrix.dqp.internal.process.DQPWorkContext; @@ -170,34 +167,6 @@ return caps; } = - /* - * @see com.metamatrix.dqp.service.DataService#getConnectorStatus() - */ - public Map getConnectorStatus() { - throw new UnsupportedOperationException(); - } - - /* = - * @see com.metamatrix.dqp.service.DataService#getConnectorStatus() - */ - public ConnectionStatus getConnectorStatus(String connectorName) { - throw new UnsupportedOperationException(); - } - = - /* - * @see com.metamatrix.dqp.service.DataService#getConnectorNames() - */ - public String[] getConnectorNames() { - throw new UnsupportedOperationException(); - } - = - /* - * @see com.metamatrix.dqp.service.DataService#restartConnector(java.l= ang.String) - */ - public void restartConnector(String connectorName) throws ApplicationL= ifecycleException { - throw new UnsupportedOperationException(); - } - /** = * @see com.metamatrix.dqp.service.DataService#startConnectorBinding(j= ava.lang.String) * @since 4.3 @@ -226,7 +195,7 @@ * @see com.metamatrix.dqp.service.DataService#getConnectorBindingStat= e(java.lang.String) * @since 4.3 */ - public AliveStatus getConnectorBindingState(String connectorBindingNam= e) throws MetaMatrixComponentException { + public Boolean getConnectorBindingState(String connectorBindingName) t= hrows MetaMatrixComponentException { return null; } = Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/so= cket/SocketVMController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/S= ocketVMController.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/S= ocketVMController.java 2009-02-16 21:35:21 UTC (rev 474) @@ -42,6 +42,7 @@ import com.metamatrix.common.util.VMNaming; import com.metamatrix.platform.PlatformPlugin; import com.metamatrix.platform.registry.ClusteredRegistryState; +import com.metamatrix.platform.util.PlatformProxyHelper; import com.metamatrix.platform.vm.controller.ServerEvents; import com.metamatrix.platform.vm.controller.SocketListenerStats; import com.metamatrix.platform.vm.controller.VMController; @@ -140,7 +141,7 @@ ServerSocketConfiguration helper =3D new ServerSocketConfiguration= (); try { helper.init(); - listener =3D new SocketListener(socketPort, bindaddress, this.cli= entServices, inputBufferSize, outputBufferSize, workerPool, helper.getServe= rSSLEngine(), helper.isClientEncryptionEnabled()); + listener =3D new SocketListener(socketPort, bindaddress, this.cli= entServices, inputBufferSize, outputBufferSize, workerPool, helper.getServe= rSSLEngine(), helper.isClientEncryptionEnabled(), PlatformProxyHelper.getSe= ssionServiceProxy(PlatformProxyHelper.ROUND_ROBIN_LOCAL)); } catch (Exception e) { LogManager.logCritical(LogCommonConstants.CTX_CONTROLLER, e, Plat= formPlugin.Util.getString("SocketVMController.2",param)); //$NON-NLS-1$ System.exit(1); = Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/so= cket/server/LogonImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/LogonImpl.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/LogonImpl.java 2009-02-16 21:35:21 UTC (rev 474) @@ -35,8 +35,8 @@ import com.metamatrix.api.exception.security.SessionServiceException; import com.metamatrix.common.api.MMURL; import com.metamatrix.common.log.LogManager; -import com.metamatrix.connector.exception.ConnectorException; -import com.metamatrix.connector.pool.CredentialMap; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.dqp.client.ResultsFuture; import com.metamatrix.dqp.internal.process.DQPWorkContext; import com.metamatrix.jdbc.api.ConnectionProperties; Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/so= cket/server/ServerWorkItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/ServerWorkItem.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/ServerWorkItem.java 2009-02-16 21:35:21 UTC (rev 474) @@ -57,15 +57,17 @@ private final ClientInstance socketClientInstance; private final Serializable messageKey; private final Message message; - private final ClientServiceRegistry server; + private final ClientServiceRegistry server; + private final SessionServiceInterface sessionService; = public ServerWorkItem(ClientInstance socketClientInstance, Serializable messageKey, Message message, - ClientServiceRegistry server) { + ClientServiceRegistry server, SessionServiceInterface sessionService) { this.socketClientInstance =3D socketClientInstance; this.messageKey =3D messageKey; this.message =3D message; this.server =3D server; + this.sessionService =3D sessionService; } = /** @@ -103,7 +105,7 @@ } if (!(instance instanceof ILogon)) { DQPWorkContext workContext =3D this.socketClientInstance.getWorkConte= xt(); - server.getSessionService().validateSession(workContext.getSessionId()= ); + sessionService.validateSession(workContext.getSessionId()); } service =3D serviceStruct.targetClass; ReflectionHelper helper =3D new ReflectionHelper(instance.getClass()); Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/so= cket/server/SocketClientInstance.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/SocketClientInstance.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/SocketClientInstance.java 2009-02-16 21:35:21 UTC (rev 474) @@ -41,6 +41,7 @@ import com.metamatrix.common.util.crypto.NullCryptor; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.dqp.internal.process.DQPWorkContext; +import com.metamatrix.platform.security.api.service.SessionServiceInterfac= e; = /** * Sockets implementation of the communication framework class representin= g the server's view of a client connection. @@ -59,12 +60,14 @@ private boolean usingEncryption; = private DhKeyGenerator keyGen; private DQPWorkContext workContext =3D new DQPWorkContext(); + private SessionServiceInterface sessionService; = - public SocketClientInstance(ObjectChannel objectSocket, WorkerPool wor= kerPool, ClientServiceRegistry server, boolean isClientEncryptionEnabled) { + public SocketClientInstance(ObjectChannel objectSocket, WorkerPool wor= kerPool, ClientServiceRegistry server, boolean isClientEncryptionEnabled, S= essionServiceInterface sessionService) { this.objectSocket =3D objectSocket; this.workerPool =3D workerPool; this.server =3D server; this.usingEncryption =3D isClientEncryptionEnabled; + this.sessionService =3D sessionService; } = public void send(Message message, Serializable messageKey) { @@ -135,7 +138,7 @@ if (LogManager.isMessageToBeRecorded(SocketVMController.SOCKET_CONTEXT, = SocketLog.DETAIL)) { = LogManager.logDetail(SocketVMController.SOCKET_CONTEXT, "processing mes= sage:" + packet); //$NON-NLS-1$ } - workerPool.execute(new ServerWorkItem(this, packet.getMessageKey(), pack= et, this.server)); + workerPool.execute(new ServerWorkItem(this, packet.getMessageKey(), pack= et, this.server, this.sessionService)); } = public void shutdown() throws CommunicationException { Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/so= cket/server/SocketListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/SocketListener.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/SocketListener.java 2009-02-16 21:35:21 UTC (rev 474) @@ -45,6 +45,7 @@ import com.metamatrix.common.queue.WorkerPool; import com.metamatrix.common.queue.WorkerPoolFactory; import com.metamatrix.core.util.MetaMatrixProductVersion; +import com.metamatrix.platform.security.api.service.SessionServiceInterfac= e; import com.metamatrix.platform.vm.controller.SocketListenerStats; = /** @@ -56,6 +57,7 @@ private SSLAwareChannelHandler channelHandler; private Channel serverChanel; private boolean isClientEncryptionEnabled; + private SessionServiceInterface sessionService; = /** * = @@ -69,9 +71,9 @@ */ public SocketListener(int port, String bindAddress, ClientServiceRegistry server, int inputBufferSize, - int outputBufferSize, WorkerPool workerPool, SSLEngine engine, boolean = isClientEncryptionEnabled) { + int outputBufferSize, WorkerPool workerPool, SSLEngine engine, boolean = isClientEncryptionEnabled, SessionServiceInterface sessionService) { this.isClientEncryptionEnabled =3D isClientEncryptionEnabled; - + this.sessionService =3D sessionService; if (port < 0 || port > 0xFFFF) { throw new IllegalArgumentException("port out of range:" + port= ); //$NON-NLS-1$ } @@ -122,7 +124,7 @@ } = public ChannelListener createChannelListener(ObjectChannel channel) { - return new SocketClientInstance(channel, this.workerPool, this.server, t= his.isClientEncryptionEnabled); + return new SocketClientInstance(channel, this.workerPool, this.server, t= his.isClientEncryptionEnabled, this.sessionService); } = } \ No newline at end of file Modified: trunk/server/src/main/java/com/metamatrix/platform/vm/controller/= VMController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/platform/vm/controller/VMCont= roller.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/server/src/main/java/com/metamatrix/platform/vm/controller/VMCont= roller.java 2009-02-16 21:35:21 UTC (rev 474) @@ -169,7 +169,7 @@ // Server events that are being generated ServerEvents events; = - protected ClientServiceRegistry clientService= s; + protected ClientServiceRegistry clientServices; private Map defaultPropertiesCache =3D ne= w HashMap(); private Properties hostProperties; = @@ -206,7 +206,7 @@ //Register with registry logMessage(PlatformPlugin.Util.getString(LogMessageKeys.VM_0006, i= d)); = - this.clientServices =3D new ClientServiceRegistry(PlatformProxyHel= per.getSessionServiceProxy(PlatformProxyHelper.ROUND_ROBIN_LOCAL)); + this.clientServices =3D new ClientServiceRegistry(); = RuntimeMetadataCatalog.getInstance().init(CurrentConfiguration.get= Instance().getProperties(), ResourceFinder.getMessageBus(), ResourceFinder.= getCacheFactory()); = Modified: trunk/server/src/main/java/com/metamatrix/server/connector/servic= e/ConnectorService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/connector/service/Conn= ectorService.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/server/src/main/java/com/metamatrix/server/connector/service/Conn= ectorService.java 2009-02-16 21:35:21 UTC (rev 474) @@ -70,10 +70,8 @@ import com.metamatrix.common.util.VMNaming; import com.metamatrix.common.util.crypto.CryptoException; import com.metamatrix.common.util.crypto.CryptoUtil; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.internal.ConnectorPropertyNames; -import com.metamatrix.connector.monitor.AliveStatus; -import com.metamatrix.connector.monitor.ConnectionStatus; import com.metamatrix.core.MetaMatrixCoreException; import com.metamatrix.core.event.EventObjectListener; import com.metamatrix.core.util.ReflectionHelper; @@ -349,24 +347,20 @@ public void checkState() throws ServiceStateException { = if (monitoringEnabled) { - ConnectionStatus status =3D connectorMgr.getStatus(); + Boolean status =3D connectorMgr.getStatus(); int state =3D getCurrentState(); - if (state =3D=3D ServiceState.STATE_OPEN) { - if (status.getStatus().equals(AliveStatus.DEAD)) { - updateState(ServiceState.STATE_DATA_SOURCE_UNAVAILABLE= ); - = - logOK("ConnectorService.Change_state_to_data_source_un= available", connectorMgrName); //$NON-NLS-1$ - = - //TODO: store the exception in the registry - } + if (state =3D=3D ServiceState.STATE_OPEN && status =3D=3D Bool= ean.FALSE) { + updateState(ServiceState.STATE_DATA_SOURCE_UNAVAILABLE); + = + logOK("ConnectorService.Change_state_to_data_source_unavai= lable", connectorMgrName); //$NON-NLS-1$ + = + //TODO: store the exception in the registry } = - if (state =3D=3D ServiceState.STATE_DATA_SOURCE_UNAVAILABLE) {= = - if (status.getStatus().equals(AliveStatus.ALIVE)) { - this.updateState(ServiceState.STATE_OPEN); - = - logOK("ConnectorService.Change_state_to_open", connect= orMgrName); //$NON-NLS-1$ = - } = + if (state =3D=3D ServiceState.STATE_DATA_SOURCE_UNAVAILABLE &&= status =3D=3D Boolean.TRUE) { + this.updateState(ServiceState.STATE_OPEN); + = + logOK("ConnectorService.Change_state_to_open", connectorMg= rName); //$NON-NLS-1$ = } } = Modified: trunk/server/src/main/java/com/metamatrix/server/connector/servic= e/ConnectorServiceInterface.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/connector/service/Conn= ectorServiceInterface.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/server/src/main/java/com/metamatrix/server/connector/service/Conn= ectorServiceInterface.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,7 +30,7 @@ = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.comm.api.ResultsReceiver; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.dqp.internal.datamgr.ConnectorID; import com.metamatrix.dqp.internal.process.DQPWorkContext; import com.metamatrix.dqp.message.AtomicRequestID; Modified: trunk/server/src/main/java/com/metamatrix/server/dqp/service/Plat= formDataService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDa= taService.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDa= taService.java 2009-02-16 21:35:21 UTC (rev 474) @@ -28,7 +28,6 @@ = import java.util.Collection; import java.util.List; -import java.util.Map; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; = @@ -39,12 +38,8 @@ import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; import com.metamatrix.common.comm.api.ResultsReceiver; import com.metamatrix.common.config.api.ConnectorBinding; -import com.metamatrix.common.config.api.ConnectorBindingType; -import com.metamatrix.connector.exception.ConnectorException; -import com.metamatrix.connector.monitor.AliveStatus; -import com.metamatrix.connector.monitor.ConnectionStatus; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.ArgCheck; -import com.metamatrix.server.ResourceFinder; import com.metamatrix.dqp.internal.datamgr.ConnectorID; import com.metamatrix.dqp.internal.process.DQPWorkContext; import com.metamatrix.dqp.message.AtomicRequestID; @@ -54,6 +49,7 @@ import com.metamatrix.dqp.service.DataService; import com.metamatrix.platform.util.PlatformProxyHelper; import com.metamatrix.query.optimizer.capabilities.SourceCapabilities; +import com.metamatrix.server.ResourceFinder; import com.metamatrix.server.ServerPlugin; import com.metamatrix.server.connector.service.ConnectorServiceInterface; = @@ -165,27 +161,6 @@ // that the client is shutting down } = - /* = - * @see com.metamatrix.dqp.service.DataService#getConnectorStatus() - */ - public Map getConnectorStatus() { - throw new UnsupportedOperationException(); - } - = - /* = - * @see com.metamatrix.dqp.service.DataService#getConnectorStatus() - */ - public ConnectionStatus getConnectorStatus(String connectorName) { - throw new UnsupportedOperationException(); - } - = - /* - * @see com.metamatrix.dqp.service.DataService#getConnectorNames() - */ - public String[] getConnectorNames() { - throw new UnsupportedOperationException(); - } - = /** = * @see com.metamatrix.dqp.service.DataService#startConnectorBinding(j= ava.lang.String) * @since 4.3 @@ -213,34 +188,10 @@ } = /** = - * @see com.metamatrix.dqp.service.DataService#addConnectorType(java.l= ang.String, com.metamatrix.common.config.api.ConnectorBindingType) - * @since 4.3 - */ - public void addConnectorType(String name, ConnectorBindingType type) { - throw new UnsupportedOperationException(); - } - - /** = - * @see com.metamatrix.dqp.service.DataService#deleteConnectorType(jav= a.lang.String) - * @since 4.3 - */ - public void deleteConnectorType(String name) { - throw new UnsupportedOperationException(); - } - - /** = - * @see com.metamatrix.dqp.service.DataService#getConnectorTypes() - * @since 4.3 - */ - public List getConnectorTypes() { - throw new UnsupportedOperationException(); - } - - /** = * @see com.metamatrix.dqp.service.DataService#getConnectorBindingStat= e(java.lang.String) * @since 4.3 */ - public AliveStatus getConnectorBindingState(String connectorBindingNam= e) throws MetaMatrixComponentException { + public Boolean getConnectorBindingState(String connectorBindingName) t= hrows MetaMatrixComponentException { throw new UnsupportedOperationException(); } = Modified: trunk/server/src/test/java/com/metamatrix/common/comm/platform/so= cket/server/TestCommSockets.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/s= erver/TestCommSockets.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/s= erver/TestCommSockets.java 2009-02-16 21:35:21 UTC (rev 474) @@ -62,12 +62,12 @@ = public void testFailedConnect() throws Exception { InetSocketAddress addr =3D new InetSocketAddress(0); - ClientServiceRegistry csr =3D new ClientService= Registry( - mock(SessionServiceInterface.class)); - csr.registerClientService(ILogon.class, new LogonImpl(csr.getSessionServ= ice(), "fakeCluster"), "foo"); //$NON-NLS-1$ //$NON-NLS-2$ + ClientServiceRegistry csr =3D new ClientServiceRegistry(); + SessionServiceInterface sessionService =3D mock(SessionServiceInterface.= class); + csr.registerClientService(ILogon.class, new LogonImpl(sessionService, "f= akeCluster"), "foo"); //$NON-NLS-1$ //$NON-NLS-2$ listener =3D new SocketListener(addr.getPort(), addr.getAddress().getHos= tAddress(), csr, 1024, 1024, WorkerPoolFactory.newWorkerPool( - "testIO", 1, 120000), null, true); //$NON-NLS-1$ + "testIO", 1, 120000), null, true, sessionService); //$NON-NLS-1$ = try { Properties p =3D new Properties(); @@ -114,10 +114,9 @@ SSLEngine serverSSL, boolean isClientEncryptionEnabled, Properties sock= etConfig) throws CommunicationException, ConnectionException { InetSocketAddress addr =3D new InetSocketAddress(0); - ClientServiceRegistry csr =3D new ClientService= Registry( - mock(SessionServiceInterface.class)); - csr.registerClientService(ILogon.class, new LogonImpl(csr - .getSessionService(), "fakeCluster") { //$NON-NLS-1$ + SessionServiceInterface sessionService =3D mock(SessionServiceInterface.= class); + ClientServiceRegistry csr =3D new ClientServiceRegistry(); + csr.registerClientService(ILogon.class, new LogonImpl(sessionService, "f= akeCluster") { //$NON-NLS-1$ @Override public LogonResult logon(Properties connProps) throws LogonException, ComponentNotFoundException { @@ -126,7 +125,7 @@ }, "foo"); //$NON-NLS-1$ listener =3D new SocketListener(addr.getPort(), addr.getAddress().getHos= tAddress(), csr, 1024, 1024, WorkerPoolFactory.newWorkerPool( - "testIO", 1, 120000), serverSSL, isClientEncryptionEnabled); //$NON-= NLS-1$ + "testIO", 1, 120000), serverSSL, isClientEncryptionEnabled, sessionS= ervice); //$NON-NLS-1$ = SocketListenerStats stats =3D listener.getStats(); assertEquals(0, stats.maxSockets); Modified: trunk/server/src/test/java/com/metamatrix/common/comm/platform/so= cket/server/TestSocketRemoting.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/s= erver/TestSocketRemoting.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/s= erver/TestSocketRemoting.java 2009-02-16 21:35:21 UTC (rev 474) @@ -106,7 +106,7 @@ = public void send(Message message, MessageListener listener, Serializable messageKey) throws CommunicationException { - ServerWorkItem workItem =3D new ServerWorkItem(this, messageKey, messag= e, clientServiceRegistry); + ServerWorkItem workItem =3D new ServerWorkItem(this, messageKey, messag= e, clientServiceRegistry, SimpleMock.createSimpleMock(SessionServiceInterfa= ce.class)); this.listener =3D listener; workItem.run(); } @@ -143,7 +143,7 @@ } = public void testMethodInvocation() throws Exception { - ClientServiceRegistry csr =3D new ClientServiceRegistry(SimpleMock.creat= eSimpleMock(SessionServiceInterface.class)); + ClientServiceRegistry csr =3D new ClientServiceRegistry(); csr.registerClientService(ILogon.class, new ILogon() { = public ResultsFuture logoff() Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/extension/TestSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -30,8 +30,8 @@ = import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.JDBCPropertyNames; import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/oracle/TestOracleSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/orac= le/TestOracleSQLConversionVisitor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/orac= le/TestOracleSQLConversionVisitor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -32,8 +32,8 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.common.types.DataTypeManager; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/util/TestJDBCExecutionHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util= /TestJDBCExecutionHelper.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util= /TestJDBCExecutionHelper.java 2009-02-16 21:35:21 UTC (rev 474) @@ -31,8 +31,8 @@ import junit.framework.TestCase; = import com.metamatrix.common.types.DataTypeManager; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.ISelect; import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl; Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/MockConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/MockConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/MockConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -10,12 +10,12 @@ import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicConnection; import com.metamatrix.connector.basic.BasicConnectorCapabilities; -import com.metamatrix.connector.exception.ConnectorException; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IGroup; import com.metamatrix.connector.language.IProcedure; Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestMetadataInConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestMetadataInConnector.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestMetadataInConnector.java 2009-02-16 21:35:21 UTC (rev 474) @@ -1,6 +1,6 @@ package com.metamatrix.data.metadata.runtime; = -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.UnitTestUtil; import com.metamatrix.jdbc.api.AbstractMMQueryTestCase; = Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestParams.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestParams.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestParams.java 2009-02-16 21:35:21 UTC (rev 474) @@ -31,6 +31,7 @@ import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.Parameter; import com.metamatrix.connector.metadata.runtime.TypeModel; @@ -77,7 +78,7 @@ String name, String fullName, int index, - int direction, + Direction direction, String nameInSource, String defaultValue, int nullability, @@ -121,7 +122,7 @@ "in1", "sptest.proc1.in1", 1, - IParameter.IN, + Direction.IN, null, "sample default", TypeModel.NOT_NULLABLE, @@ -138,7 +139,7 @@ "in2", "sptest.proc1.in2", 2, - IParameter.IN, + Direction.IN, null, "15", TypeModel.NULLABLE, @@ -155,7 +156,7 @@ "in3", "sptest.proc1.in3", 3, - IParameter.IN, + Direction.IN, null, "2003-04-23 09:30:00", TypeModel.NULLABLE_UNKNOWN, @@ -172,7 +173,7 @@ "inOptional", "sptest.proc1.inOptional", 4, - IParameter.IN, + Direction.IN, "optionalName", null, TypeModel.NULLABLE, Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/= util/TestCollectorVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estCollectorVisitor.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estCollectorVisitor.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,6 +25,7 @@ import java.util.*; = import com.metamatrix.connector.language.*; +import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.visitor.util.CollectorVisitor; import com.metamatrix.dqp.internal.datamgr.language.*; = @@ -115,7 +116,7 @@ GroupImpl g1 =3D new GroupImpl("g1", null, null); //$NON-NLS-1$ ElementImpl e1 =3D new ElementImpl(g1, "e1", null, String.class); = //$NON-NLS-1$ ElementImpl e2 =3D new ElementImpl(g1, "e2", null, String.class); = //$NON-NLS-1$ - CompareCriteriaImpl cc =3D new CompareCriteriaImpl(e1, e2, ICompar= eCriteria.EQ); + CompareCriteriaImpl cc =3D new CompareCriteriaImpl(e1, e2, Operato= r.EQ); = helpTestElementsUsedByGroups(cc, new String[] {"g1.e1", "g1.e2"}, = new String[] {"g1"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } Modified: trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXACo= nnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXAConnecti= on.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXAConnecti= on.java 2009-02-16 21:35:21 UTC (rev 474) @@ -25,14 +25,15 @@ import javax.transaction.xa.XAResource; = import com.metamatrix.connector.api.ConnectorCapabilities; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.Execution; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.basic.BasicConnection; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xa.api.XAConnection; = -class FakeXAConnection implements XAConnection { +class FakeXAConnection extends BasicConnection implements XAConnection { String name; boolean released =3D false; boolean failToCreateXAResource =3D false; Modified: trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArju= naRecovery.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaReco= very.java 2009-02-16 18:56:03 UTC (rev 473) +++ trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaReco= very.java 2009-02-16 21:35:21 UTC (rev 474) @@ -35,7 +35,7 @@ import com.arjuna.ats.arjuna.common.Configuration; import com.arjuna.ats.arjuna.recovery.RecoveryConfiguration; import com.metamatrix.common.xa.MMXid; -import com.metamatrix.connector.exception.ConnectorException; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.dqp.internal.transaction.TransactionProvider; import com.metamatrix.dqp.service.TransactionService; = --===============1024052525339976125==-- From teiid-commits at lists.jboss.org Mon Feb 16 16:35:28 2009 Content-Type: multipart/mixed; boundary="===============3130564250170498172==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r475 - in trunk: connector-api/src/main/java/com/metamatrix/connector and 3 other directories. Date: Mon, 16 Feb 2009 16:35:28 -0500 Message-ID: --===============3130564250170498172== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-16 16:35:28 -0500 (Mon, 16 Feb 2009) New Revision: 475 Removed: trunk/connector-api/src/main/java/com/metamatrix/connector/exception/ trunk/connector-api/src/main/java/com/metamatrix/connector/monitor/ trunk/connector-api/src/main/java/com/metamatrix/data/ trunk/connector-api/src/test/java/com/metamatrix/data/basic/ trunk/engine/src/main/java/com/metamatrix/dqp/internal/cache/connector/ trunk/server/src/test/java/com/metamatrix/common/net/ Log: TEIID-351 TEIID-348 TEIID-164 minor fix for ldap lt gt support, removed exp= licit interfaces for monitoredconnector, repackaged connectorexception, add= ed the use of appropriate generics to connector api. --===============3130564250170498172==-- From teiid-commits at lists.jboss.org Thu Feb 19 12:59:11 2009 Content-Type: multipart/mixed; boundary="===============6809785816857133231==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r476 - in trunk: connector-api/src/main/java/com/metamatrix/connector/language and 58 other directories. Date: Thu, 19 Feb 2009 12:59:10 -0500 Message-ID: --===============6809785816857133231== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-19 12:59:09 -0500 (Thu, 19 Feb 2009) New Revision: 476 Added: trunk/connector-api/src/main/java/com/metamatrix/connector/api/SourceSys= temFunctions.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/access/AccessSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/LeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/ModFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestOracleTranslator.java Removed: trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICas= eExpression.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/access/AccessSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/access/AccessSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2ResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2SQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2SQLModificationVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2SingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2UserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbySingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyTimestampFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/impl/BasicSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/informix/InformixResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/informix/InformixSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/informix/InformixUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/FormatFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/HourFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/LeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/ParseFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/SubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerModModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/FormatTimestampModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/ModFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestFormatFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestHourFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestParseFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sqlserver/TestSqlServerConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sybase/TestFormatTimestampModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sybase/TestModFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialConversionVisitor.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/SpatialHint.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/SpatialSelectProxy.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= CaseExpressionImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestCaseExpressionImpl.java Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/api/TypeFacil= ity.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IJoi= n.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILan= guageFactory.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILim= it.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/MetadataID.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/frame= work/AbstractLanguageVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/frame= work/DelegatingHierarchyVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/frame= work/HierarchyVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/frame= work/LanguageObjectVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/= CollectorVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/= SQLStringVisitor.java trunk/connector-api/src/test/java/com/metamatrix/data/transform/TestBasi= cValueTranslator.java trunk/connector-sdk/src/test/java/com/metamatrix/cdk/unittest/FakeTransl= ationFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCConnector.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCProcedureExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCQueryExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCSourceConnection.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCSourceConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCUpdateExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2Capabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2SQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbySQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/BindValueVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/ResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/SQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/SQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/TranslatedCommand.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/ValueRetriever.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/impl/BasicResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/impl/BasicValueRetriever.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/informix/InformixSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/ssl/JDBCSequeLinkSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/util/FunctionReplacementVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/JDBCSingleIdentityDSConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/JDBCSourceXAConnection.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/TestJDBCSourceConnection.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/access/TestAccessSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/db2/TestDB2ConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/db2/TestDB2SqlTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/derby/TestDerbyConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/mysql/TestMySQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestDayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestLeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestLocateFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestLog10FunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestMonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestOracleConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestSubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/postgresql/TestPostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sqlserver/TestSqlServerConversionVisitor.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sybase/TestSybaseConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sybase/TestSybaseSQLConversionVisitor.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/IQueryToLdapSearchParser.java trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/l= dap/TestIQueryToLdapSearchParser.java trunk/connectors/connector-xml-common/ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Type= FacilityImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= BaseLanguageObject.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LanguageBridgeFactory.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LanguageFactoryImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= MetadataFactory.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= MetadataIDImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= MetadataObjectImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ParameterIDImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ProcedureIDImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= RuntimeMetadataImpl.java trunk/engine/src/main/java/com/metamatrix/query/function/FunctionLibrary= .java trunk/engine/src/main/java/com/metamatrix/query/function/FunctionMethods= .java trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemSo= urce.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/Ali= asGenerator.java trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.j= ava trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Function.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/SQLStringVis= itor.java trunk/engine/src/main/resources/com/metamatrix/query/i18n.properties trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestElementImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestInsertImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/metadata/= TestMetadataFactory.java trunk/engine/src/test/java/com/metamatrix/query/function/TestFunction.ja= va trunk/engine/src/test/java/com/metamatrix/query/function/TestFunctionLib= rary.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoinOptimi= zation.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestLimit.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer.= java trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/Tes= tAliasGenerator.java trunk/engine/src/test/java/com/metamatrix/query/parser/TestParser.java trunk/engine/src/test/java/com/metamatrix/query/processor/TestProcessor.= java trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewrit= er.java trunk/engine/src/test/java/com/metamatrix/query/sql/util/TestUpdateProce= dureGenerator.java trunk/engine/src/test/java/com/metamatrix/query/sql/visitor/TestSQLStrin= gVisitor.java trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator.= java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exten= sion/TestSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracl= e/TestOracleSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestMetadataID.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestParams.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestProcedure.java trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/Te= stSQLStringVisitor.java Log: TEIID-360 TEIID-359 TEIID-357 TEIID-356 TEIID-354 TEIID-353 TEIID-352 TEIID= -164 jdbc connector api cleanup. created canonical push-down function list= , changed the SQLTranslator to handle the tasks that were previously in spe= cific SQLConversionVisitors. Added: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Sourc= eSystemFunctions.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/SourceSy= stemFunctions.java (rev 0) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/SourceSy= stemFunctions.java 2009-02-19 17:59:09 UTC (rev 476) @@ -0,0 +1,144 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.connector.api; + +/** + * Constants for all the possible standard system push down functions. + * The names and function forms follow the Open Group CLI functions, with = a few exceptions + * (such as lpad, rpad, bitand, bitor, etc. which are most notably support= ed by Oracle). + * = + */ +public class SourceSystemFunctions { + = + //arithmetic + public static final String MULTIPLY_OP =3D "*"; + public static final String ADD_OP =3D "+"; + public static final String SUBTRACT_OP =3D "-"; + public static final String DIVIDE_OP =3D "/"; + = + //String + public static final String ASCII =3D "ascii"; + public static final String CHAR =3D "char"; + public static final String CONCAT =3D "concat"; + //public static final String DIFFERENCE =3D "difference"; + public static final String INITCAP =3D "initcap"; + public static final String INSERT =3D "insert"; + public static final String LCASE =3D "lcase"; + public static final String LPAD =3D "lpad"; + public static final String LEFT =3D "left"; + public static final String LENGTH =3D "length"; + public static final String LOCATE =3D "locate"; + public static final String LTRIM =3D "ltrim"; + public static final String REPEAT =3D "repeat"; + public static final String REPLACE =3D "replace"; + public static final String RIGHT =3D "right"; + public static final String RPAD =3D "rpad"; + public static final String RTRIM =3D "rtrim"; + //public static final String SOUNDEX =3D "soundex"; + public static final String SUBSTRING =3D "substring"; + public static final String UCASE =3D "ucase"; + = + //numeric + public static final String ABS =3D "abs"; + public static final String ACOS =3D "acos"; + public static final String ASIN =3D "asin"; + public static final String ATAN =3D "atan"; + public static final String ATAN2 =3D "atan2"; + public static final String CEILING =3D "ceiling"; + public static final String COS =3D "cos"; + public static final String COT =3D "cot"; + public static final String DEGREES =3D "degrees"; + public static final String EXP =3D "exp"; + public static final String FLOOR =3D "floor"; + public static final String FORMATINTEGER =3D "formatinteger"; + public static final String FORMATLONG =3D "formatlong"; + public static final String FORMATDOUBLE =3D "formatdouble"; + public static final String FORMATFLOAT =3D "formatfloat"; + public static final String FORMATBIGINTEGER =3D "formatbiginteger"; + public static final String FORMATBIGDECIMAL =3D "formatbigdecimal"; + public static final String LOG =3D "log"; + public static final String LOG10 =3D "log10"; + public static final String MOD =3D "mod"; + public static final String PARSEINTEGER =3D "parseinteger"; + public static final String PARSELONG =3D "parselong"; + public static final String PARSEDOUBLE =3D "parsedouble"; + public static final String PARSEFLOAT =3D "parsefloat"; + public static final String PARSEBIGINTEGER =3D "parsebiginteger"; + public static final String PARSEBIGDECIMAL =3D "parsebigdecimal"; + public static final String PI =3D "pi"; + public static final String POWER =3D "power"; + public static final String RADIANS =3D "radians"; + public static final String RAND =3D "rand"; + public static final String ROUND =3D "round"; + public static final String SIGN =3D "sign"; + public static final String SIN =3D "sin"; + public static final String SQRT =3D "sqrt"; + public static final String TAN =3D "tan"; + public static final String TRANSLATE =3D "translate"; + public static final String TRUNCATE =3D "truncate"; + = + //bit + public static final String BITAND =3D "bitand"; + public static final String BITOR =3D "bitor"; + public static final String BITNOT =3D "bitnot"; + public static final String BITXOR =3D "bitxor"; + = + //date functions + public static final String CURDATE =3D "curdate"; + public static final String CURTIME =3D "curtime"; + public static final String DAYNAME =3D "dayname"; + public static final String DAYOFMONTH =3D "dayofmonth"; + public static final String DAYOFWEEK =3D "dayofweek"; + public static final String DAYOFYEAR =3D "dayofyear"; + public static final String FORMATDATE =3D "formatdate"; + public static final String FORMATTIME =3D "formattime"; + public static final String FORMATTIMESTAMP =3D "formattimestamp"; + public static final String HOUR =3D "hour"; + public static final String MINUTE =3D "minute"; + public static final String MODIFYTIMEZONE =3D "modifytimezone"; + public static final String MONTH =3D "month"; + public static final String MONTHNAME =3D "monthname"; + public static final String NOW =3D "now"; + public static final String PARSEDATE =3D "parsedate"; + public static final String PARSETIME =3D "parsetime"; + public static final String PARSETIMESTAMP =3D "parsetimestamp"; + public static final String QUARTER =3D "quarter"; + public static final String SECOND =3D "second"; + public static final String TIMESTAMPADD =3D "timestampadd"; + public static final String TIMESTAMPCREATE =3D "timestampcreate"; + public static final String TIMESTAMPDIFF =3D "timestampdiff"; + public static final String WEEK =3D "week"; + public static final String YEAR =3D "year"; + = + //system functions + public static final String IFNULL =3D "ifnull"; + public static final String COALESCE =3D "coalesce"; + public static final String NULLIF =3D "nullif"; + = + //conversion functions + public static final String CONVERT =3D "convert"; + = + //xml + public static final String XPATHVALUE =3D "xpathvalue"; + +} Property changes on: trunk/connector-api/src/main/java/com/metamatrix/conne= ctor/api/SourceSystemFunctions.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Ty= peFacility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/TypeFaci= lity.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/TypeFaci= lity.java 2009-02-19 17:59:09 UTC (rev 476) @@ -22,6 +22,9 @@ = package com.metamatrix.connector.api; = +import java.util.Calendar; +import java.util.TimeZone; + import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.common.types.MMJDBCSQLTypeInfo; = @@ -72,18 +75,61 @@ public static final String XML =3D DataTypeManager.Defaul= tDataTypes.XML; } = - public static Class getDataTypeClass(String type) { + /** + * Get the Class constant for the given String type name + */ + public static Class getDataTypeClass(String type) { return DataTypeManager.getDataTypeClass(type); = } = - public static final int getSQLTypeFromRuntimeType(Class type) { + /** + * Get the SQL type for the given runtime type Class constant + * @param type + * @return + */ + public static final int getSQLTypeFromRuntimeType(Class type) { return MMJDBCSQLTypeInfo.getSQLTypeFromRuntimeType(type); } = = - public abstract boolean hasTransformation(Class sourceClass, Class tar= getClass); + /** + * Checks if the given transformation exists. + * @param + * @param + * @param sourceClass + * @param targetClass + * @return + */ + public abstract boolean hasTransformation(Class sourceClass,= Class targetClass); = - public abstract T transformValue(Object value, Class sourceClass, = Class targetClass) throws ConnectorException; + /** + * Transform the given value into the target type, or throw an excepti= on if this is not + * possible. + * @param + * @param + * @param value + * @param sourceClass + * @param targetClass + * @return + * @throws ConnectorException + */ + public abstract T transformValue(S value, Class sourceClass,= Class targetClass) throws ConnectorException; = + /** + * Convert the given value to the closest runtime type see {@link RUNT= IME_TYPES} + * @param value + * @return + */ public abstract Object convertToRuntimeType(Object value); = + /** + * Convert the given date to a target type, optionally adjusting its d= isplay = + * for a given target Calendar. + * @param date + * @param initial + * @param target + * @param targetType + * @return + */ + public abstract Object convertDate(java.util.Date date, TimeZone initi= al, Calendar target, Class targetType); + } Deleted: trunk/connector-api/src/main/java/com/metamatrix/connector/languag= e/ICaseExpression.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICa= seExpression.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICa= seExpression.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,89 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.language; - -/** - * Represents a non-searched CASE expression: - *
CASE expression WHEN expression THEN expression ... END - */ -public interface ICaseExpression extends IExpression { - = - /** - * Gets the expression whose evaluation is tested against the WHEN exp= ressions - * @return the expression - */ - IExpression getExpression(); - - /** - * Sets the expression whose evaluation is tested against the WHEN exp= ressions - * @param expression The expression - */ - void setExpression(IExpression expression); - = - /** - * Gets the number of WHEN and THEN clauses in the CASE expression - * @return the number of WHEN ... THEN ... parts - */ - int getWhenCount(); - = - /** - * Gets the WHEN expression at the specified index - * @param index the 0-based index - * @return the WHEN expression at the index - */ - IExpression getWhenExpression(int index); - - /** - * Sets the WHEN expression at the specified index - * @param index the 0-based index - * @param expression The new WHEN expression at the index - */ - void setWhenExpression(int index, IExpression expression); - = - /** - * Gets the THEN expression at the specified index - * @param index the 0-based index - * @return the THEN expression at the index - */ - IExpression getThenExpression(int index); - - /** - * Sets the THEN expression at the specified index - * @param index the 0-based index - * @param expression The new THEN expression at the index - */ - void setThenExpression(int index, IExpression expression); - = - /** - * Gets the ELSE expression, if defined. Can be null. - * @return the ELSE expression. - */ - IExpression getElseExpression(); - = - /** - * Sets the ELSE expression = - * @param expression The new ELSE expression = - */ - void setElseExpression(IExpression expression); - = -} Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IJoin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IJo= in.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IJo= in.java 2009-02-19 17:59:09 UTC (rev 476) @@ -94,5 +94,5 @@ * Set List of CompareCriteria specifying join criteria. * @param criteria List of Criteria */ - void setCriteria(List criteria); = + void setCriteria(List criteria); = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/ILanguageFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILa= nguageFactory.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILa= nguageFactory.java 2009-02-19 17:59:09 UTC (rev 476) @@ -46,17 +46,6 @@ IAggregate createAggregate(String name, boolean isDistinct, IExpressio= n expression, Class type); = /** - * Create case expression. - * @param mainExpression First expression in the case, used to choose = WHEN clause - * @param whenExpressions List of when expressions, should match thenE= xpressions - * @param thenExpressions List of then expressions, should match whenE= xpressions - * @param elseExpression Else expression, may be null - * @param type Data type - * @return New ICaseExpression - */ = - ICaseExpression createCaseExpression(IExpression mainExpression, List<= IExpression> whenExpressions, List thenExpressions, IExpressio= n elseExpression, Class type); - = - /** * Create compare criteria. * @param operator Operator, as defined in constants in {@link ICompar= eCriteria} * @param leftExpression Left expression Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/ILimit.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILi= mit.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILi= mit.java 2009-02-19 17:59:09 UTC (rev 476) @@ -37,8 +37,8 @@ int getRowLimit(); = /** - * Gets the offset (relative to the sarting row of the produced result= set) of the - * first row returned by the connector. + * Gets the offset (relative to the starting row of the produced resul= tset) of the + * first row returned by the connector. 0 or less indicates no offset. * @return * @since 5.0 SP1 */ Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/MetadataID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/MetadataID.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/MetadataID.java 2009-02-19 17:59:09 UTC (rev 476) @@ -31,11 +31,12 @@ */ public interface MetadataID { = - public static final int TYPE_ELEMENT =3D 0; - public static final int TYPE_GROUP =3D 1; - public static final int TYPE_PROCEDURE =3D 2; - public static final int TYPE_PARAMETER =3D 3; - + public enum Type { + TYPE_ELEMENT, + TYPE_GROUP, + TYPE_PARAMETER, + TYPE_PROCEDURE + } /** * Get the type of metadataID * @return ID type @@ -44,7 +45,7 @@ * @see #TYPE_PROCEDURE * @see #TYPE_PARAMETER */ - int getType(); + Type getType(); = /** * Get a list of child IDs from this ID. A group metadata ID will @@ -71,4 +72,10 @@ * @return String fullName */ String getFullName(); + = + /** + * Get the {@link MetadataObject} for this id + * @return + */ + MetadataObject getMetadataObject() throws ConnectorException; } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/framework/AbstractLanguageVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/AbstractLanguageVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/AbstractLanguageVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -27,7 +27,6 @@ import com.metamatrix.connector.language.IAggregate; import com.metamatrix.connector.language.IBatchedUpdates; import com.metamatrix.connector.language.IBulkInsert; -import com.metamatrix.connector.language.ICaseExpression; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICompoundCriteria; import com.metamatrix.connector.language.IDelete; @@ -116,7 +115,6 @@ = public void visit(IAggregate obj) {} public void visit(IBatchedUpdates obj) {} - public void visit(ICaseExpression obj) {} public void visit(ICompareCriteria obj) {} public void visit(ICompoundCriteria obj) {} public void visit(IDelete obj) {} Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/framework/DelegatingHierarchyVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/DelegatingHierarchyVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/DelegatingHierarchyVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -23,7 +23,42 @@ package com.metamatrix.connector.visitor.framework; = import com.metamatrix.connector.DataPlugin; -import com.metamatrix.connector.language.*; +import com.metamatrix.connector.language.IAggregate; +import com.metamatrix.connector.language.IBatchedUpdates; +import com.metamatrix.connector.language.ICompareCriteria; +import com.metamatrix.connector.language.ICompoundCriteria; +import com.metamatrix.connector.language.IDelete; +import com.metamatrix.connector.language.IElement; +import com.metamatrix.connector.language.IExistsCriteria; +import com.metamatrix.connector.language.IFrom; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.IGroup; +import com.metamatrix.connector.language.IGroupBy; +import com.metamatrix.connector.language.IInCriteria; +import com.metamatrix.connector.language.IInlineView; +import com.metamatrix.connector.language.IInsert; +import com.metamatrix.connector.language.IIsNullCriteria; +import com.metamatrix.connector.language.IJoin; +import com.metamatrix.connector.language.ILanguageObject; +import com.metamatrix.connector.language.ILikeCriteria; +import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.INotCriteria; +import com.metamatrix.connector.language.IOrderBy; +import com.metamatrix.connector.language.IOrderByItem; +import com.metamatrix.connector.language.IParameter; +import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IQuery; +import com.metamatrix.connector.language.IScalarSubquery; +import com.metamatrix.connector.language.ISearchedCaseExpression; +import com.metamatrix.connector.language.ISelect; +import com.metamatrix.connector.language.ISelectSymbol; +import com.metamatrix.connector.language.ISetClause; +import com.metamatrix.connector.language.ISetClauseList; +import com.metamatrix.connector.language.ISetQuery; +import com.metamatrix.connector.language.ISubqueryCompareCriteria; +import com.metamatrix.connector.language.ISubqueryInCriteria; +import com.metamatrix.connector.language.IUpdate; = /** * Delegates pre- and post-processing for each node in the hierarchy to @@ -70,15 +105,7 @@ postVisitor.visit(obj); } } - public void visit(ICaseExpression obj) { - if (preVisitor !=3D null) { - preVisitor.visit(obj); - } - super.visit(obj); - if (postVisitor !=3D null) { - postVisitor.visit(obj); - } - } + public void visit(ICompareCriteria obj) { if (preVisitor !=3D null) { preVisitor.visit(obj); Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/framework/HierarchyVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/HierarchyVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/HierarchyVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -24,7 +24,6 @@ = import com.metamatrix.connector.language.IAggregate; import com.metamatrix.connector.language.IBatchedUpdates; -import com.metamatrix.connector.language.ICaseExpression; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICompoundCriteria; import com.metamatrix.connector.language.IDelete; @@ -82,16 +81,6 @@ visitNodes(obj.getUpdateCommands()); } = - public void visit(ICaseExpression obj) { - visitNode(obj.getExpression()); - int whenCount =3D obj.getWhenCount(); - for (int i =3D 0; i < whenCount; i++) { - visitNode(obj.getWhenExpression(i)); - visitNode(obj.getThenExpression(i)); - } - visitNode(obj.getElseExpression()); - } - = public void visit(ICompareCriteria obj) { visitNode(obj.getLeftExpression()); visitNode(obj.getRightExpression()); Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/framework/LanguageObjectVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/LanguageObjectVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/LanguageObjectVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -30,7 +30,6 @@ public void visit(IAggregate obj); public void visit(IBatchedUpdates obj); public void visit(IBulkInsert obj); - public void visit(ICaseExpression obj); public void visit(ICompareCriteria obj); public void visit(ICompoundCriteria obj); public void visit(IDelete obj); Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/util/CollectorVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /CollectorVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /CollectorVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -68,13 +68,6 @@ } = /* = - * @see com.metamatrix.data.visitor.framework.LanguageObjectVisitor#vi= sit(com.metamatrix.data.language.ICaseExpression) - */ - public void visit(ICaseExpression obj) { - checkInstance(obj); - } - - /* = * @see com.metamatrix.data.visitor.framework.LanguageObjectVisitor#vi= sit(com.metamatrix.data.language.ICompareCriteria) */ public void visit(ICompareCriteria obj) { Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/util/SQLStringVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /SQLStringVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /SQLStringVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -29,7 +29,7 @@ import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IAggregate; import com.metamatrix.connector.language.IBulkInsert; -import com.metamatrix.connector.language.ICaseExpression; +import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICompoundCriteria; import com.metamatrix.connector.language.ICriteria; @@ -72,7 +72,6 @@ import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.visitor.framework.AbstractLanguageVisitor; import com.metamatrix.core.util.StringUtil; = @@ -87,7 +86,6 @@ protected static final String UNDEFINED =3D ""; //$NON-NLS-= 1$ protected static final String UNDEFINED_PARAM =3D "?"; //$NON-NLS-1$ = - protected RuntimeMetadata metadata; protected StringBuffer buffer =3D new StringBuffer(); = /** @@ -96,12 +94,8 @@ * @return the name of that element or group as defined in the source */ protected String getName(MetadataID id) { - if (metadata =3D=3D null) { - return id.getName(); - } - = try { - MetadataObject obj =3D metadata.getObject(id); + MetadataObject obj =3D id.getMetadataObject(); if (obj =3D=3D null) { return id.getName(); } @@ -193,84 +187,6 @@ } = /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.ICaseExpression) - */ - public void visit(ICaseExpression obj) { - final IElement element =3D obj.getExpression() instanceof IElement= ? (IElement)obj.getExpression() : null; - final IFunction function =3D obj.getExpression() instanceof IFunct= ion ? (IFunction)obj.getExpression() : null ; = - - buffer.append(CASE); - buffer.append(SPACE); - = - // checking for null compare in decode string case 2969 GCSS - for (int i =3D0; i < obj.getWhenCount(); i++) { = = - if (NULL.equalsIgnoreCase(obj.getWhenExpression(i).toString() = ) ) { = - buffer.append(WHEN); - buffer.append(SPACE); - = - if(element !=3D null) { - visit(element); - }else if(function !=3D null) { - visit(function); - }else { - append(obj.getExpression() ); - } - - buffer.append(SPACE); - buffer.append(IS); - buffer.append(SPACE); - buffer.append(NULL); - buffer.append(SPACE); - buffer.append(THEN); - buffer.append(SPACE); - append(obj.getThenExpression(i)); - buffer.append(SPACE); - } - } - = - for (int i =3D 0; i < obj.getWhenCount(); i++) { - if(!NULL.equalsIgnoreCase(obj.getWhenExpression(i).toString() = ) ) { - buffer.append(WHEN); - buffer.append(SPACE); - = - if(element !=3D null) { - visit(element); - }else if(function !=3D null) { - visit(function); - }else { - append(obj.getExpression() ); - } - - buffer.append(EQ); - append(obj.getWhenExpression(i)); - buffer.append(SPACE); - buffer.append(THEN); - buffer.append(SPACE); - append(obj.getThenExpression(i)); - buffer.append(SPACE); - } - } - - if (obj.getElseExpression() !=3D null) { - buffer.append(ELSE); - buffer.append(SPACE); - if(obj.getElseExpression() instanceof IElement || obj.getElseE= xpression() instanceof IFunction) { - if(element !=3D null) { - visit(element); - }else if(function !=3D null) { - visit(function); - }else { - append(obj.getExpression() ); - } - }else { - append(obj.getElseExpression()); - } - buffer.append(SPACE); - } - buffer.append(END); = - } - - /** * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.ICompareCriteria) */ public void visit(ICompareCriteria obj) { @@ -329,7 +245,7 @@ public void visit(IDelete obj) { buffer.append(DELETE) .append(SPACE); - buffer.append(addProcessComment()); + buffer.append(getSourceComment(obj)); buffer.append(FROM) .append(SPACE); append(obj.getGroup()); @@ -365,9 +281,13 @@ * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IElement) */ public void visit(IElement obj) { - String groupName =3D null; + buffer.append(getElementName(obj, true)); + } + + private String getElementName(IElement obj, boolean qualify) { + String groupName =3D null; IGroup group =3D obj.getGroup(); - if (group !=3D null) { + if (group !=3D null && qualify) { if(group.getDefinition() !=3D null) { = groupName =3D group.getContext(); } else { = @@ -380,24 +300,6 @@ } } = - String elemShortName =3D getElementShortName(obj); - - // Check whether a subclass wants to replace the element name to u= se in special circumstances - String replacementElement =3D replaceElementName(groupName, elemSh= ortName); - if(replacementElement !=3D null) { - // If so, use it as is - buffer.append(replacementElement); - } else { - // If not, do normal logic: [group + "."] + element - if(groupName !=3D null) { - buffer.append(groupName); - buffer.append(DOT); - } - buffer.append(elemShortName); - } - } - - public String getElementShortName(IElement obj) { String elemShortName =3D null; = MetadataID elementID =3D obj.getMetadataID(); if(elementID !=3D null) { @@ -406,19 +308,29 @@ String elementName =3D obj.getName(); elemShortName =3D getShortName(elementName); } - return elemShortName; - } = + // Check whether a subclass wants to replace the element name to u= se in special circumstances + String replacementElement =3D replaceElementName(groupName, elemSh= ortName); + if(replacementElement !=3D null) { + // If so, use it as is + return replacementElement; + } = + StringBuffer elementName =3D new StringBuffer(elemShortName.length= ()); + // If not, do normal logic: [group + "."] + element + if(groupName !=3D null) { + elementName.append(groupName); + elementName.append(DOT); + } + elementName.append(elemShortName); + return elementName.toString(); + } + /** = * @param elementName * @return * @since 4.3 */ - public String getShortName(String elementName) { - return getElementShortName(elementName); - } = - = - public static String getElementShortName(String elementName) { + public static String getShortName(String elementName) { int lastDot =3D elementName.lastIndexOf("."); //$NON-NLS-1$ if(lastDot >=3D 0) { elementName =3D elementName.substring(lastDot+1); = = @@ -490,30 +402,12 @@ IExpression[] args =3D obj.getParameters(); if(name.equalsIgnoreCase(CONVERT) || name.equalsIgnoreCase(CAST)) = { = = - // Need to support both Oracle style convert - convert(express= ion, type) - // and SQL Server style convert - convert(type, expression) - Object firstArg =3D null; - Object secondArg =3D null; - if (args[1] instanceof IElement) { - Object typeValue =3D ((ILiteral)args[0]).getValue(); - Object expression =3D args[1]; - firstArg =3D typeValue; - secondArg =3D expression; - } else { - Object typeValue =3D ((ILiteral)args[1]).getValue(); - Object expression =3D args[0]; - firstArg =3D expression; - secondArg =3D typeValue; - } + Object typeValue =3D ((ILiteral)args[1]).getValue(); = buffer.append(name); buffer.append(LPAREN); = = - if(firstArg instanceof IExpression) { - this.append( (IExpression)firstArg); - }else { - buffer.append(firstArg); - } + append(args[0]); = if(name.equalsIgnoreCase(CONVERT)) { = buffer.append(COMMA); = @@ -523,15 +417,9 @@ buffer.append(AS); = buffer.append(SPACE); = } - = - if(secondArg instanceof IExpression) { - this.append( (IExpression)secondArg); - }else { - buffer.append(secondArg); - } + buffer.append(typeValue); buffer.append(RPAREN); = - - } else if(name.equals("+") || name.equals("-") || name.equals("*")= || name.equals("/") || name.equals("||")) { //$NON-NLS-1$ //$NON-NLS-2$ //= $NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + } else if(name.equals("%") || name.equals("+") || name.equals("-")= || name.equals("*") || name.equals("/") || name.equals("||")) { //$NON-NLS= -1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ buffer.append(LPAREN); = = if(args !=3D null) { @@ -669,7 +557,7 @@ private void formatBasicInsert(IInsert obj) { buffer.append(INSERT) .append(SPACE); - buffer.append(addProcessComment()); + buffer.append(getSourceComment(obj)); buffer.append(INTO) .append(SPACE); append(obj.getGroup()); @@ -679,13 +567,7 @@ = int elementCount=3D obj.getElements().size(); for(int i=3D0; i adaptor =3D BasicValueTranslator.= createTranslator(String.class, Short.class, new FakeTypeFacility()); + BasicValueTranslator adaptor =3D BasicValueTranslator.= createTranslator(String.class, Short.class, Mockito.mock(TypeFacility.class= )); try { adaptor.translate("mmuuid:blah", Mockito.mock(ExecutionContext= .class)); //$NON-NLS-1$ fail("exceptoin expected"); //$NON-NLS-1$ @@ -48,22 +47,4 @@ } } = - static class FakeTypeFacility extends TypeFacility{ - - @Override - public boolean hasTransformation(Class sourceClass, Class targetClass) { - return false; - } - - @Override - public Object transformValue(Object value, Class sourceClass, Class targ= etClass) throws ConnectorException { - throw new ConnectorException("not supported"); - } - = - @Override - public Object convertToRuntimeType(Object value) { - return value; - } - } - = } Modified: trunk/connector-sdk/src/test/java/com/metamatrix/cdk/unittest/Fak= eTranslationFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/test/java/com/metamatrix/cdk/unittest/FakeTrans= lationFactory.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-sdk/src/test/java/com/metamatrix/cdk/unittest/FakeTrans= lationFactory.java 2009-02-19 17:59:09 UTC (rev 476) @@ -24,6 +24,7 @@ = import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.query.unittest.FakeMetadataFactory; +import com.metamatrix.query.validator.TestValidator; = public class FakeTranslationFactory { = @@ -45,4 +46,8 @@ return new TranslationUtility(FakeMetadataFactory.exampleText()); } = + public TranslationUtility getAutoIncrementTranslationUtility() { + return new TranslationUtility(TestValidator.exampleMetadata3()); + } + = } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCConnector.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCConnector.java 2009-02-19 17:59:09 UTC (rev 476) @@ -43,7 +43,6 @@ protected ConnectorEnvironment environment; private ConnectorLogger logger; private JDBCSourceConnectionFactory factory; - = private ConnectorCapabilities capabilities; = static ConnectorCapabilities createCapabilities(ConnectorEnvironment envi= ronment, ClassLoader loader) Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCProcedureExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCProcedureExecution.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCProcedureExecution.java 2009-02-19 17:59:09 UTC (rev 476) @@ -50,7 +50,6 @@ import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.core.util.StringUtil; = /** */ @@ -90,9 +89,6 @@ //create statement or CallableStatement and execute String sql =3D translatedComm.getSql(); try{ - if(translatedComm.getStatementType() !=3D TranslatedCommand.ST= MT_TYPE_CALLABLE_STATEMENT){ - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCS= ynchExecution.Statement_type_not_support_for_command_1", new Integer(transl= atedComm.getStatementType()), sql)); //$NON-NLS-1$ - } //create parameter index map parameterIndexMap =3D createParameterIndexMap(procedure.getPar= ameters(), sql); CallableStatement cstmt =3D getCallableStatement(sql); @@ -200,7 +196,7 @@ if(value =3D=3D null){ return null; } - Object result =3D JDBCExecutionHelper.convertValue(value, para= meter.getType(), this.resultsTranslator.getValueTranslators(), this.results= Translator.getTypefacility(), trimString, context); + Object result =3D JDBCExecutionHelper.convertValue(value, para= meter.getType(), this.resultsTranslator.getValueTranslators(), this.results= Translator.getTypeFacility(), trimString, context); return result; } catch (SQLException e) { throw new ConnectorException(e); Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCQueryExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCQueryExecution.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCQueryExecution.java 2009-02-19 17:59:09 UTC (rev 476) @@ -107,16 +107,13 @@ = try { = - if (translatedComm.getStatementType() =3D=3D TranslatedCommand= .STMT_TYPE_STATEMENT) { + if (!translatedComm.isPrepared()) { results =3D getStatement().executeQuery(sql); - } else if (translatedComm.getStatementType() =3D=3D Translated= Command.STMT_TYPE_PREPARED_STATEMENT) { - PreparedStatement pstatement =3D getPreparedStatement(sql); + } else { + PreparedStatement pstatement =3D getPreparedStatement(sql); resultsTranslator.bindPreparedStatementValues(this.connect= ion, pstatement, translatedComm); results =3D pstatement.executeQuery(); - } else { - throw new ConnectorException( - JDBCPlugin.Util.getString("JD= BCSynchExecution.Statement_type_not_support_for_command_1", new Integer(tra= nslatedComm.getStatementType()), sql)); //$NON-NLS-1$ - } + } = addStatementWarnings(); initResultSetInfo(); = @@ -157,13 +154,13 @@ = for (int i =3D 0; i < columnDataTypes.length; i++) { // Convert from 0-based to 1-based - Object value =3D resultsTranslator.getValueRetriever()= .retrieveValue(results, i+1, columnDataTypes[i], nativeTypes[i], calendar, = env.getTypeFacility()); + Object value =3D resultsTranslator.getValueRetriever()= .retrieveValue(results, i+1, columnDataTypes[i], calendar, env.getTypeFacil= ity()); if(value !=3D null) { // Determine transformation if unknown if(! transformKnown[i]) { Class valueType =3D value.getClass(); if(!columnDataTypes[i].isAssignableFrom(valueT= ype)) { - transforms[i] =3D JDBCExecutionHelper.dete= rmineTransformation(valueType, columnDataTypes[i], resultsTranslator.getVal= ueTranslators(), resultsTranslator.getTypefacility()); + transforms[i] =3D JDBCExecutionHelper.dete= rmineTransformation(valueType, columnDataTypes[i], resultsTranslator.getVal= ueTranslators(), resultsTranslator.getTypeFacility()); } transformKnown[i] =3D true; } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCSourceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSourceConnection.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSourceConnection.java 2009-02-19 17:59:09 UTC (rev 476) @@ -25,7 +25,6 @@ package com.metamatrix.connector.jdbc; = import java.sql.SQLException; -import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; @@ -50,87 +49,51 @@ protected java.sql.Connection physicalConnection; protected ConnectorEnvironment environment; private ConnectorLogger logger; - private ResultsTranslator resultsTranslator; private ConnectionStrategy connectionStrategy; private ConnectionListener connectionListener; - private Class sqlTransClass; + private SQLTranslator sqlTranslator; + private ResultsTranslator resultsTranslator; + /** * @param connection */ - public JDBCSourceConnection(java.sql.Connection connection, ConnectorE= nvironment environment, ConnectionStrategy connectionStrategy) throws Conne= ctorException{ - this(connection, environment, connectionStrategy, null); + public JDBCSourceConnection(java.sql.Connection connection, ConnectorE= nvironment environment, ConnectionStrategy connectionStrategy, ResultsTrans= lator resultsTranslator, SQLTranslator sqlTranslator) throws ConnectorExcep= tion{ + this(connection, environment, connectionStrategy, null, resultsTra= nslator, sqlTranslator); } = - public JDBCSourceConnection(java.sql.Connection connection, ConnectorE= nvironment environment, ConnectionStrategy connectionStrategy, ConnectionLi= stener connectionListener) throws ConnectorException { + public JDBCSourceConnection(java.sql.Connection connection, ConnectorE= nvironment environment, ConnectionStrategy connectionStrategy, ConnectionLi= stener connectionListener, ResultsTranslator resultsTranslator, SQLTranslat= or sqlTranslator) throws ConnectorException { physicalConnection =3D connection; this.environment =3D environment; this.logger =3D environment.getLogger(); this.connectionStrategy =3D connectionStrategy; this.connectionListener =3D connectionListener; - try { - ClassLoader loader =3D Thread.currentThread().getContextClassL= oader(); + = = - Properties connectorProps =3D environment.getProperties(); - //create SQLTranslator - String className =3D connectorProps.getProperty(JDBCPropertyNa= mes.EXT_SQL_TRANSLATOR_CLASS); = - if(className =3D=3D null){ - throw new ConnectorException(JDBCPlugin.Util.getString("JD= BCSourceConnection.Property_{0}_is_required,_but_not_defined_1", JDBCProper= tyNames.EXT_SQL_TRANSLATOR_CLASS)); //$NON-NLS-1$ - } - sqlTransClass =3D Thread.currentThread().getContextClassLoader().loadCl= ass(className); - = - //create ResultsTranslator - className =3D connectorProps.getProperty(JDBCPropertyNames.EXT= _RESULTS_TRANSLATOR_CLASS); = - if(className =3D=3D null){ - throw new ConnectorException(JDBCPlugin.Util.getString("JD= BCSourceConnection.Property_{0}_is_required,_but_not_defined_1", JDBCProper= tyNames.EXT_RESULTS_TRANSLATOR_CLASS)); //$NON-NLS-1$ - } - Class resultsTransClass =3D loader.loadClass(className); - resultsTranslator =3D (ResultsTranslator) resultsTransClass.ne= wInstance(); - resultsTranslator.initialize(environment); = - } catch (ClassNotFoundException e1) { - throw new ConnectorException(e1); - } catch (InstantiationException e2) { - throw new ConnectorException(e2); - } catch (IllegalAccessException e3) { - throw new ConnectorException(e3); - } - // notify the listner that coneection created if (this.connectionListener !=3D null) { = this.connectionListener.afterConnectionCreation(this.physicalC= onnection, this.environment); } } = - private SQLTranslator getSQLTranslator(RuntimeMetadata metadata) throw= s ConnectorException { - try { - SQLTranslator sqlTranslator =3D (SQLTranslator) sqlTransClass.new= Instance(); - sqlTranslator.initialize(environment, metadata); - return sqlTranslator; - } catch (InstantiationException e) { - throw new ConnectorException(e); - } catch (IllegalAccessException e) { - throw new ConnectorException(e); - } - } - @Override public ResultSetExecution createResultSetExecution(IQueryCommand comma= nd, ExecutionContext executionContext, RuntimeMetadata metadata) throws ConnectorException { - return new JDBCQueryExecution(command, this.physicalConnection, getSQ= LTranslator(metadata), resultsTranslator, logger, this.environment.getPrope= rties(), executionContext, this.environment); + return new JDBCQueryExecution(command, this.physicalConnection, sqlTr= anslator, resultsTranslator, logger, this.environment.getProperties(), exec= utionContext, this.environment); } = @Override public ProcedureExecution createProcedureExecution(IProcedure command, ExecutionContext executionContext, RuntimeMetadata metadata) throws ConnectorException { - return new JDBCProcedureExecution(command, this.physicalConnection, g= etSQLTranslator(metadata), resultsTranslator, logger, this.environment.getP= roperties(), metadata, executionContext, this.environment); + return new JDBCProcedureExecution(command, this.physicalConnection, s= qlTranslator, resultsTranslator, logger, this.environment.getProperties(), = metadata, executionContext, this.environment); } = @Override public UpdateExecution createUpdateExecution(ICommand command, ExecutionContext executionContext, RuntimeMetadata metadata) throws ConnectorException { - return new JDBCUpdateExecution(command, this.physicalConnection, getS= QLTranslator(metadata), resultsTranslator, logger, this.environment.getProp= erties(), executionContext); = + return new JDBCUpdateExecution(command, this.physicalConnection, sqlT= ranslator, resultsTranslator, logger, this.environment.getProperties(), exe= cutionContext); = } = @Override Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCSourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSourceConnectionFactory.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSourceConnectionFactory.java 2009-02-19 17:59:09 UTC (rev 476) @@ -35,6 +35,8 @@ import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.internal.ConnectorPropertyNames; +import com.metamatrix.connector.jdbc.extension.ResultsTranslator; +import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.pool.ConnectorIdentity; import com.metamatrix.connector.pool.ConnectorIdentityFactory; = @@ -53,6 +55,8 @@ private String deregisterType; = private ConnectorIdentityFactory connectorIdentityFactory; + private SQLTranslator sqlTranslator; + private ResultsTranslator resultsTranslator; = /** * @@ -65,6 +69,34 @@ this.environment =3D env; Properties props =3D env.getProperties(); this.deregisterType =3D props.getProperty(ConnectorPropertyNames.D= EREGISTER_DRIVER, ConnectorPropertyNames.DEREGISTER_BY_CLASSLOADER); + ClassLoader loader =3D Thread.currentThread().getContextClassLoade= r(); + + Properties connectorProps =3D environment.getProperties(); + //create SQLTranslator + String className =3D connectorProps.getProperty(JDBCPropertyNames.= EXT_SQL_TRANSLATOR_CLASS); = + if(className =3D=3D null){ + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnection.Property_{0}_is_required,_but_not_defined_1", JDBCPropertyNa= mes.EXT_SQL_TRANSLATOR_CLASS)); //$NON-NLS-1$ + } + try { + Class sqlTransClass =3D Thread.currentThread().getContextClassLoader().= loadClass(className); + sqlTranslator =3D (SQLTranslator) sqlTransClass.newInstance(); + sqlTranslator.initialize(environment); + = + //create ResultsTranslator + className =3D connectorProps.getProperty(JDBCPropertyNames.EXT_RE= SULTS_TRANSLATOR_CLASS); = + if(className =3D=3D null){ + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCS= ourceConnection.Property_{0}_is_required,_but_not_defined_1", JDBCPropertyN= ames.EXT_RESULTS_TRANSLATOR_CLASS)); //$NON-NLS-1$ + } + Class resultsTransClass =3D loader.loadClass(className); + resultsTranslator =3D (ResultsTranslator) resultsTransClass.newIn= stance(); + resultsTranslator.initialize(environment); + } catch (ClassNotFoundException e) { + throw new ConnectorException(e); + } catch (InstantiationException e) { + throw new ConnectorException(e); + } catch (IllegalAccessException e) { + throw new ConnectorException(e); + } } = protected ConnectorEnvironment getConnectorEnvironment() { @@ -117,7 +149,7 @@ throw new ConnectorException(e); } = - return new JDBCSourceConnection(connection, this.environment, crea= teConnectionStrategy(), getConnectionListener()); + return new JDBCSourceConnection(connection, this.environment, crea= teConnectionStrategy(), getConnectionListener(), resultsTranslator, sqlTran= slator); } = /** @@ -187,4 +219,12 @@ return this.connectorIdentityFactory.createIdentity(context); } = + public ResultsTranslator getResultsTranslator() { + return resultsTranslator; + } + = + public SQLTranslator getSqlTranslator() { + return sqlTranslator; + } + = } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCUpdateExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCUpdateExecution.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCUpdateExecution.java 2009-02-19 17:59:09 UTC (rev 476) @@ -109,16 +109,9 @@ = for (int i =3D 0; i < commands.length; i++) { TranslatedCommand command =3D translateCommand(commands[i]= ); - if (command.getStatementType() =3D=3D TranslatedCommand.ST= MT_TYPE_CALLABLE_STATEMENT) { - throw new ConnectorException( - JDBCPlugin.Util.getString= ("JDBCSynchExecution.Statement_type_not_support_for_command_1", //$NON-NLS-= 1$ - = new Integer(command.getStatementType()), - = command.getSql())); - } - if (command.getStatementType() =3D=3D TranslatedCommand.ST= MT_TYPE_PREPARED_STATEMENT) { + if (command.isPrepared()) { PreparedStatement pstmt =3D null; - if (previousCommand !=3D null && previousCommand.getSt= atementType() =3D=3D TranslatedCommand.STMT_TYPE_PREPARED_STATEMENT = - && previousCommand.getSql().equals(com= mand.getSql())) { + if (previousCommand !=3D null && previousCommand.isPre= pared() && previousCommand.getSql().equals(command.getSql())) { pstmt =3D (PreparedStatement)statement; } else { if (!executedCmds.isEmpty()) { @@ -129,7 +122,7 @@ resultsTranslator.bindPreparedStatementValues(this.con= nection, pstmt, command); pstmt.addBatch(); } else { - if (previousCommand !=3D null && previousCommand.getSt= atementType() =3D=3D TranslatedCommand.STMT_TYPE_PREPARED_STATEMENT) { + if (previousCommand !=3D null && previousCommand.isPre= pared()) { executeBatch(i, results, executedCmds); getStatement(); } @@ -220,18 +213,13 @@ = try { int updateCount; - if (translatedComm.getStatementType() =3D=3D TranslatedCommand= .STMT_TYPE_STATEMENT) { + if (!translatedComm.isPrepared()) { updateCount =3D getStatement().executeUpdate(sql); - } else if (translatedComm.getStatementType() =3D=3D Translated= Command.STMT_TYPE_PREPARED_STATEMENT) { - PreparedStatement pstatement =3D getPreparedStatement(sql); + } else { + PreparedStatement pstatement =3D getPreparedStatement(sql); resultsTranslator.bindPreparedStatementValues(this.connect= ion, pstatement, translatedComm); updateCount =3D pstatement.executeUpdate(); - } else { - throw new ConnectorException( - JDBCPlugin.Util.getString("JD= BCSynchExecution.Statement_type_not_support_for_command_1", //$NON-NLS-1$ - new= Integer(translatedComm.getStatementType()), - sql= )); - } + } = addStatementWarnings(); return updateCount; } catch (SQLException err) { Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/access/AccessSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/access/AccessSQLConversionVisitor.java 2009-02-16 21:35:28 UTC (rev 47= 5) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/access/AccessSQLConversionVisitor.java 2009-02-19 17:59:09 UTC (rev 47= 6) @@ -1,99 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.access; - -import java.sql.Time; - -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelect; - -public class AccessSQLConversionVisitor extends SQLConversionVisitor{ - = - private int limit =3D 0; - /* = - * @see com.metamatrix.connector.jdbc.extension.SQLConversionVisitor#t= ranslateLiteralTime(java.sql.Time) - */ - protected String translateLiteralTime(Time timeValue) { - return "{ts'1900-01-01 " + formatDateValue(timeValue) + "'}"; //$N= ON-NLS-1$ //$NON-NLS-2$ - } - - protected String translateLiteralBoolean(Boolean booleanValue) { - if(booleanValue.booleanValue()) { - return "-1"; //$NON-NLS-1$ - } - return "0"; //$NON-NLS-1$ - } - = - protected void appendQuery(IQuery obj) { - if (obj.getLimit() !=3D null) { - limit =3D obj.getLimit().getRowLimit(); - } - append(obj.getSelect()); - if (obj.getFrom() !=3D null) { - buffer.append(SPACE); - append(obj.getFrom()); - } - if (obj.getWhere() !=3D null) { - buffer.append(SPACE) - .append(WHERE) - .append(SPACE); - append(obj.getWhere()); - } - if (obj.getGroupBy() !=3D null) { - buffer.append(SPACE); - append(obj.getGroupBy()); - } - if (obj.getHaving() !=3D null) { - buffer.append(SPACE) - .append(HAVING) - .append(SPACE); - append(obj.getHaving()); - } - if (obj.getOrderBy() !=3D null) { - buffer.append(SPACE); - append(obj.getOrderBy()); - } - } - - protected void visitSelect(ISelect obj) { - buffer.append(SELECT).append(SPACE); - if (limit > 0) { - buffer.append("TOP") //$NON-NLS-1$ - .append(SPACE) - .append(limit) - .append(SPACE); - limit =3D 0; - } - if (obj.isDistinct()) { - buffer.append(DISTINCT).append(SPACE); - } - append(obj.getSelectSymbols()); - } - - protected boolean supportsComments() { - return false; - } = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/access/AccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/access/AccessSQLTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/access/AccessSQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.access; - -import java.util.Properties; - -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; - -public class AccessSQLTranslator extends BasicSQLTranslator { - private Properties connectorProperties; - private ILanguageFactory languageFactory; - = - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getTrans= lationVisitor() - */ - public SQLConversionVisitor getTranslationVisitor() { - SQLConversionVisitor visitor =3D new AccessSQLConversionVisitor(); - visitor.setRuntimeMetadata(getRuntimeMetadata()); - visitor.setFunctionModifiers(getFunctionModifiers()); - visitor.setProperties(connectorProperties); - visitor.setLanguageFactory(languageFactory); - visitor.setDatabaseTimeZone(getDatabaseTimeZone()); - return visitor; - } - = - /* = - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#initiali= ze(com.metamatrix.data.api.ConnectorEnvironment, com.metamatrix.data.metada= ta.runtime.RuntimeMetadata) - */ - public void initialize(ConnectorEnvironment env, RuntimeMetadata metad= ata) throws ConnectorException { - super.initialize(env, metadata); - connectorProperties =3D getConnectorEnvironment().getProperties(); - languageFactory =3D getConnectorEnvironment().getLanguageFactory(); - } -} Added: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connect= or/jdbc/access/AccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/access/AccessSQLTranslator.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/access/AccessSQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ +package com.metamatrix.connector.jdbc.access; + +import com.metamatrix.connector.jdbc.extension.SQLTranslator; +import com.metamatrix.connector.language.ILimit; + +public class AccessSQLTranslator extends SQLTranslator { + = + @Override + public boolean hasTimeType() { + return false; + } + + @Override + public String translateLiteralBoolean(Boolean booleanValue) { + if(booleanValue.booleanValue()) { + return "-1"; //$NON-NLS-1$ + } + return "0"; //$NON-NLS-1$ + } + = + @Override + public String addLimitString(String queryCommand, ILimit limit) { + int index =3D queryCommand.startsWith("SELECT DISTINCT")?15:6; + return new StringBuffer(queryCommand.length() + 8).append(queryComman= d) + .insert(index, " TOP " + limit.getRowLimit()).toString(); + } + = + @Override + public boolean addSourceComment() { + return false; + } + = +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/com/meta= matrix/connector/jdbc/access/AccessSQLTranslator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/db2/DB2Capabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2Capabilities.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2Capabilities.java 2009-02-19 17:59:09 UTC (rev 476) @@ -104,7 +104,7 @@ supportedFunctions.add("CONVERT"); //$NON-NLS-1$ supportedFunctions.add("IFNULL"); //$NON-NLS-1$ supportedFunctions.add("NVL"); //$NON-NLS-1$ = - + supportedFunctions.add("COALESCE"); //$NON-NLS-1$ return supportedFunctions; } = Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/db2/DB2ResultsTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2ResultsTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2ResultsTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.db2; - -import com.metamatrix.connector.jdbc.extension.impl.BasicResultsTranslator; - -/** - */ -public class DB2ResultsTranslator extends BasicResultsTranslator { - //TODO -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/db2/DB2SQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLConversionVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLConversionVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,109 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.db2; - -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.language.IFromItem; -import com.metamatrix.connector.language.IJoin; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.IJoin.JoinType; - -/** = - * @since 4.3 - */ -public class DB2SQLConversionVisitor extends SQLConversionVisitor { - - private final int MAX_SELECT_ALIAS_LENGTH =3D 30; - = - private final int MAX_TABLE_ALIAS_LENGTH =3D 128; - = - /** - * Convert limit clause to DB2 ...FETCH FIRST rowlimit ROWS ONLY syntax - * @see com.metamatrix.connector.visitor.framework.LanguageObjectVisit= or#visit(com.metamatrix.connector.language.IQuery) - * @since 5.0 SP1 - */ - public void visit(ILimit obj) { - buffer.append("FETCH") //$NON-NLS-1$ - .append(SPACE) - .append("FIRST") //$NON-NLS-1$ - .append(SPACE) - .append(obj.getRowLimit()) - .append(SPACE) - .append("ROWS") //$NON-NLS-1$ - .append(SPACE) - .append("ONLY"); //$NON-NLS-1$ - } - = - /** = - * @see com.metamatrix.connector.jdbc.extension.SQLConversionVisitor#g= etMaxSelectAliasLength() - * @since 4.3 - */ - protected int getMaxSelectAliasLength() { - return MAX_SELECT_ALIAS_LENGTH; - } - - /** = - * @see com.metamatrix.connector.jdbc.extension.SQLConversionVisitor#g= etMaxTableAliasLength() - * @since 4.3 - */ - protected int getMaxTableAliasLength() { - return MAX_TABLE_ALIAS_LENGTH; - } - = - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IJoin) - */ - public void visit(IJoin obj) { - if(obj.getJoinType() !=3D JoinType.CROSS_JOIN) { - super.visit(obj); - return; - } - = - IFromItem leftItem =3D obj.getLeftItem(); - if(leftItem instanceof IJoin) { - buffer.append(LPAREN); - append(leftItem); - buffer.append(RPAREN); - } else { - append(leftItem); - } - buffer.append(SPACE) - .append(INNER) - .append(SPACE) - .append(JOIN) - .append(SPACE); - = - IFromItem rightItem =3D obj.getRightItem(); - if(rightItem instanceof IJoin) { - buffer.append(LPAREN); - append(rightItem); - buffer.append(RPAREN); - } else { - append(rightItem); - } - = - buffer.append(SPACE) - .append(ON).append(SPACE) - .append("1=3D1");//$NON-NLS-1$ - } -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/db2/DB2SQLModificationVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLModificationVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLModificationVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.db2; - -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.visitor.framework.HierarchyVisitor; - - -/** - */ -public class DB2SQLModificationVisitor extends HierarchyVisitor { - = - private ILanguageFactory languageFactory; - - public DB2SQLModificationVisitor(ILanguageFactory languageFactory) { - this.languageFactory =3D languageFactory; = - } - -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/db2/DB2SQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -24,75 +24,64 @@ */ package com.metamatrix.connector.jdbc.db2; = -import java.util.HashMap; -import java.util.Map; - +import java.util.Arrays; + import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; +import com.metamatrix.connector.api.SourceSystemFunctions; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.jdbc.extension.SQLTranslator; +import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.language.IJoin; +import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.ICompareCriteria.Operator; +import com.metamatrix.connector.language.IJoin.JoinType; +import com.metamatrix.connector.visitor.framework.HierarchyVisitor; = /** */ -public class DB2SQLTranslator extends BasicSQLTranslator { - - private Map functionModifiers; - private ILanguageFactory languageFactory; - - /* = - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#initiali= ze(com.metamatrix.data.api.ConnectorEnvironment, com.metamatrix.data.metada= ta.runtime.RuntimeMetadata) - */ - public void initialize(ConnectorEnvironment env, RuntimeMetadata metad= ata) throws ConnectorException { - super.initialize(env, metadata); - languageFactory =3D getConnectorEnvironment().getLanguageFactory(); - initializeFunctionModifiers(); - } = - - private void initializeFunctionModifiers() { - functionModifiers =3D new HashMap(); - functionModifiers.putAll(super.getFunctionModifiers()); - functionModifiers.put("cast", new DB2ConvertModifier(languageFacto= ry)); //$NON-NLS-1$ - functionModifiers.put("char", new AliasModifier("chr")); //$NON-NL= S-1$ //$NON-NLS-2$ - functionModifiers.put("convert", new DB2ConvertModifier(languageFa= ctory)); //$NON-NLS-1$ = - functionModifiers.put("dayofmonth", new AliasModifier("day")); //$= NON-NLS-1$ //$NON-NLS-2$ = - functionModifiers.put("ifnull", new AliasModifier("coalesce")); //= $NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("nvl", new AliasModifier("coalesce")); //$NO= N-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("substring", new AliasModifier("substr")); /= /$NON-NLS-1$ //$NON-NLS-2$ - } +public class DB2SQLTranslator extends SQLTranslator { + + @Override + public void initialize(ConnectorEnvironment env) throws ConnectorExceptio= n { + super.initialize(env); + registerFunctionModifier(SourceSystemFunctions.CONVERT, new DB2Con= vertModifier(getLanguageFactory())); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.CHAR, new AliasModi= fier("chr")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new Ali= asModifier("day")); //$NON-NLS-1$ //$NON-NLS-2$ = + registerFunctionModifier(SourceSystemFunctions.IFNULL, new AliasMo= difier("coalesce")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.SUBSTRING, new Alia= sModifier("substr")); //$NON-NLS-1$ //$NON-NLS-2$ + } + = + @Override + public String addLimitString(String queryCommand, ILimit limit) { + return queryCommand + " FETCH FIRST " + limit.getRowLimit() + " ROWS ONL= Y"; //$NON-NLS-1$ + } + = + @Override + public ICommand modifyCommand(ICommand command, ExecutionContext context) + throws ConnectorException { + HierarchyVisitor hierarchyVisitor =3D new HierarchyVisitor() { + @Override + public void visit(IJoin obj) { + if (obj.getJoinType() !=3D JoinType.CROSS_JOIN) { + return; + } + ILiteral one =3D getLanguageFactory().createLiteral(1, TypeFacility.RU= NTIME_TYPES.INTEGER); + obj.setCriteria(Arrays.asList(getLanguageFactory().createCompareCriter= ia(Operator.EQ, one, one))); + obj.setJoinType(JoinType.INNER_JOIN); + } + }; + = + command.acceptVisitor(hierarchyVisitor); + return command; + } + = + @Override + public String getConnectionTestQuery() { + return "Select 'x' from sysibm.systables where 1 =3D 2"; //$NON-NLS-1$ + } = - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getFunct= ionModifiers() - */ - public Map getFunctionModifiers() { - return functionModifiers; - } - = - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#modifyCo= mmand(com.metamatrix.connector.language.ICommand, com.metamatrix.data.Secur= ityContext) - */ - public ICommand modifyCommand(ICommand command, ExecutionContext conte= xt) throws ConnectorException { - // DB2-specific modification - DB2SQLModificationVisitor visitor =3D new DB2SQLModificationVisito= r(getConnectorEnvironment().getLanguageFactory()); - command.acceptVisitor(visitor); - return command; - } - = - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getTrans= lationVisitor() - */ - public SQLConversionVisitor getTranslationVisitor() { - SQLConversionVisitor visitor =3D new DB2SQLConversionVisitor(); - visitor.setRuntimeMetadata(getRuntimeMetadata()); - visitor.setFunctionModifiers(functionModifiers); - visitor.setProperties(super.getConnectorEnvironment().getPropertie= s()); - visitor.setLanguageFactory(languageFactory); - visitor.setDatabaseTimeZone(getDatabaseTimeZone()); - return visitor; - } = - = } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/db2/DB2SingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SingleIdentityConnectionFactory.java 2009-02-16 21:35:28 UTC (r= ev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SingleIdentityConnectionFactory.java 2009-02-19 17:59:09 UTC (r= ev 476) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.db2; - -import com.metamatrix.connector.jdbc.*; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory; - -public class DB2SingleIdentityConnectionFactory extends JDBCSingleIdentity= ConnectionFactory{ - private String queryTest =3D "Select 'x' from sysibm.systables where 1= =3D 2"; //$NON-NLS-1$ - = - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } - = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/db2/DB2UserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2UserIdentityConnectionFactory.java 2009-02-16 21:35:28 UTC (rev= 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2UserIdentityConnectionFactory.java 2009-02-19 17:59:09 UTC (rev= 476) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.db2; - -import com.metamatrix.connector.jdbc.*; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCUserIdentityConnectionFactory; - -public class DB2UserIdentityConnectionFactory extends JDBCUserIdentityConn= ectionFactory{ - private String queryTest =3D "Select 'x' from sysibm.systables where 1= =3D 2"; //$NON-NLS-1$ - = - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } - -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/derby/DerbyCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyCapabilities.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyCapabilities.java 2009-02-19 17:59:09 UTC (rev 476) @@ -120,7 +120,7 @@ supportedFunctions.add("CONVERT"); //$NON-NLS-1$ supportedFunctions.add("IFNULL"); //$NON-NLS-1$ supportedFunctions.add("NVL"); //$NON-NLS-1$ - = + supportedFunctions.add("COALESCE"); //$NON-NLS-1$ return supportedFunctions; } = Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/derby/DerbyConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyConversionVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyConversionVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.derby; - -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; - -/** - */ -class DerbyConversionVisitor extends SQLConversionVisitor { - = - private final int MAX_TABLE_ALIAS_LENGTH =3D 128; - = - /** = - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#getMaxT= ableAliasLength() - */ - protected int getMaxTableAliasLength() { - return MAX_TABLE_ALIAS_LENGTH; - } - = - protected boolean supportsComments() { - return false; - } = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/derby/DerbyResultsTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyResultsTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyResultsTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.derby; - -import com.metamatrix.connector.jdbc.extension.impl.BasicResultsTranslator; - - -/** = - * @since 4.3 - */ -public class DerbyResultsTranslator extends BasicResultsTranslator { - -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/derby/DerbySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbySQLTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbySQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -22,66 +22,40 @@ = package com.metamatrix.connector.jdbc.derby; = -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; -import com.metamatrix.connector.jdbc.extension.impl.EscapeSyntaxModifier; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.api.SourceSystemFunctions; +import com.metamatrix.connector.jdbc.extension.SQLTranslator; +import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; +import com.metamatrix.connector.jdbc.extension.impl.EscapeSyntaxModifier; = = /** = * @since 4.3 */ -public class DerbySQLTranslator extends BasicSQLTranslator { - - private Map functionModifiers; - private Properties connectorProperties; - private ILanguageFactory languageFactory; - - public void initialize(ConnectorEnvironment env, - RuntimeMetadata metadata) throws ConnectorExcep= tion { - = - super.initialize(env, metadata); - ConnectorEnvironment connEnv =3D getConnectorEnvironment(); - this.connectorProperties =3D connEnv.getProperties(); - this.languageFactory =3D connEnv.getLanguageFactory(); - initializeFunctionModifiers(); = - - } - - private void initializeFunctionModifiers() { - functionModifiers =3D new HashMap(); - functionModifiers.putAll(super.getFunctionModifiers()); - = - functionModifiers.put("concat", new EscapeSyntaxModifier()); //$NO= N-NLS-1$ - functionModifiers.put("substring", new AliasModifier("substr")); /= /$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("dayofmonth", new AliasModifier("day")); //$= NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("timestampadd", new DerbyTimestampFunctionMo= difier()); //$NON-NLS-1$ - functionModifiers.put("timestampdiff", new DerbyTimestampFunctionM= odifier()); //$NON-NLS-1$ - functionModifiers.put("cast", new DerbyConvertModifier(languageFac= tory)); //$NON-NLS-1$ - functionModifiers.put("convert", new DerbyConvertModifier(language= Factory)); //$NON-NLS-1$ - functionModifiers.put("ifnull", new AliasModifier("coalesce")); //= $NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("nvl", new AliasModifier("coalesce")); //$NO= N-NLS-1$ //$NON-NLS-2$ = +public class DerbySQLTranslator extends SQLTranslator { + + @Override + public void initialize(ConnectorEnvironment env) throws ConnectorExceptio= n { + super.initialize(env); + registerFunctionModifier(SourceSystemFunctions.CONCAT, new EscapeS= yntaxModifier()); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.SUBSTRING, new Alia= sModifier("substr")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new Ali= asModifier("day")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.TIMESTAMPADD, new E= scapeSyntaxModifier()); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.TIMESTAMPDIFF, new = EscapeSyntaxModifier()); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.CONVERT, new DerbyC= onvertModifier(getLanguageFactory())); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.IFNULL, new AliasMo= difier("coalesce")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.COALESCE, new Alias= Modifier("coalesce")); //$NON-NLS-1$ //$NON-NLS-2$ = } = - = - public Map getFunctionModifiers() { - return functionModifiers; + = + @Override + public boolean addSourceComment() { + return false; + } + = + @Override + public String getConnectionTestQuery() { + return "Select 0 from sys.systables where 1 =3D 2"; //$NON-NLS-1$ } = - public SQLConversionVisitor getTranslationVisitor() { - SQLConversionVisitor visitor =3D new DerbyConversionVisitor(); - visitor.setRuntimeMetadata(getRuntimeMetadata()); - visitor.setFunctionModifiers(functionModifiers); - visitor.setProperties(connectorProperties); - visitor.setLanguageFactory(languageFactory); - visitor.setDatabaseTimeZone(getDatabaseTimeZone()); - return visitor; - } } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/derby/DerbySingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbySingleIdentityConnectionFactory.java 2009-02-16 21:35:28 UT= C (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbySingleIdentityConnectionFactory.java 2009-02-19 17:59:09 UT= C (rev 476) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.derby; - -import com.metamatrix.connector.jdbc.ConnectionQueryStrategy; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory; - - -/** = - * @since 4.3 - */ -public class DerbySingleIdentityConnectionFactory extends JDBCSingleIdenti= tyConnectionFactory { - private String queryTest =3D "Select 0 from sys.systables where 1 =3D = 2"; //$NON-NLS-1$ - = - /** = - * @see com.metamatrix.connector.jdbc.JDBCSourceConnectionFactory#crea= teConnectionStrategy() - * @since 4.3 - */ - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/derby/DerbyTimestampFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyTimestampFunctionModifier.java 2009-02-16 21:35:28 UTC (rev= 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyTimestampFunctionModifier.java 2009-02-19 17:59:09 UTC (rev= 476) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.derby; - -import java.util.ArrayList; -import java.util.List; - -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILiteral; - - -public class DerbyTimestampFunctionModifier extends BasicFunctionModifier { - - public DerbyTimestampFunctionModifier() { - super(); - } - -/** = - * @see com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModi= fier#translate(com.metamatrix.connector.language.IFunction) - * @since 4.3 - */ - public List translate(IFunction function) { - List objs =3D new ArrayList(); - objs.add("{fn "); //$NON-NLS-1$ - objs.add(function.getName()); - objs.add("("); //$NON-NLS-1$ - - IExpression[] args =3D function.getParameters(); - if(args !=3D null && args.length > 0) { - objs.add(((ILiteral)args[0]).getValue()); - - for(int i=3D1; i modifiers; private ExecutionContext context; - private ILanguageFactory languageFactory; - private TimeZone databaseTimeZone; + private SQLTranslator translator; + private Calendar cal; = - private int execType =3D TranslatedCommand.EXEC_TYPE_QUERY; - private int stmtType =3D TranslatedCommand.STMT_TYPE_STATEMENT; + private boolean prepared; = private List preparedValues =3D new ArrayList(); private List preparedTypes =3D new ArrayList(); = - public SQLConversionVisitor() { - super(); + public SQLConversionVisitor(SQLTranslator translator) { + this.translator =3D translator; + this.prepared =3D translator.usePreparedStatements(); + this.modifiers =3D translator.getFunctionModifiers(); + TimeZone tz =3D translator.getDatabaseTimeZone(); + if (tz !=3D null) { + this.cal =3D Calendar.getInstance(tz); + } } = - /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IInsert) - */ - public void visit(IInsert obj) { - this.execType =3D TranslatedCommand.EXEC_TYPE_UPDATE; - super.visit(obj); - } - public void visit(IBulkInsert obj) { - this.stmtType =3D TranslatedCommand.STMT_TYPE_PREPARED_STATEMENT; + this.prepared =3D true; = super.visit(obj); = @@ -130,19 +123,21 @@ // where toString will use for numbers greater than 10p7 a= nd // less than 10p-3, where database may not understand. if (useFormatting) { - valuesbuffer.append(decimalFormatter.format(obj)); + synchronized (DECIMAL_FORMAT) { + valuesbuffer.append(DECIMAL_FORMAT.format(obj)); + } } else { valuesbuffer.append(obj); } } else if(type.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { - valuesbuffer.append(translateLiteralBoolean((Boolean)obj)); + valuesbuffer.append(translator.translateLiteralBoolean((Bo= olean)obj)); } else if(type.equals(TypeFacility.RUNTIME_TYPES.TIMESTAMP)) { - valuesbuffer.append(translateLiteralTimestamp((Timestamp)o= bj)); + valuesbuffer.append(translator.translateLiteralTimestamp((= Timestamp)obj, cal)); } else if(type.equals(TypeFacility.RUNTIME_TYPES.TIME)) { - valuesbuffer.append(translateLiteralTime((Time)obj)); + valuesbuffer.append(translator.translateLiteralTime((Time)= obj, cal)); } else if(type.equals(TypeFacility.RUNTIME_TYPES.DATE)) { - valuesbuffer.append(translateLiteralDate((java.sql.Date)ob= j)); + valuesbuffer.append(translator.translateLiteralDate((java.= sql.Date)obj, cal)); } else { // If obj is string, toSting() will not create a new Strin= g = // object, it returns it self, so new object creation. = @@ -154,27 +149,10 @@ } = /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IUpdate) - */ - public void visit(IUpdate obj) { - this.execType =3D TranslatedCommand.EXEC_TYPE_UPDATE; - super.visit(obj); - } - - /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IQuery) - */ - public void visit(IQuery obj) { - this.execType =3D TranslatedCommand.EXEC_TYPE_QUERY; - super.visit(obj); - } - - /** * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IProcedure) */ public void visit(IProcedure obj) { - this.execType =3D TranslatedCommand.EXEC_TYPE_EXECUTE; - this.stmtType =3D TranslatedCommand.STMT_TYPE_CALLABLE_STATEMENT; + this.prepared =3D true; /* * preparedValues is now a list of procedure params instead of jus= t values */ @@ -183,14 +161,6 @@ } = /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IDelete) - */ - public void visit(IDelete obj) { - this.execType =3D TranslatedCommand.EXEC_TYPE_UPDATE; - super.visit(obj); - } - - /** * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IFunction) */ public void visit(IFunction obj) { @@ -221,7 +191,7 @@ * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.ILiteral) */ public void visit(ILiteral obj) { - if (this.stmtType =3D=3D TranslatedCommand.STMT_TYPE_PREPARED_STAT= EMENT && obj.isBindValue()) { + if (this.prepared && obj.isBindValue()) { buffer.append(UNDEFINED_PARAM); preparedValues.add(obj.getValue()); preparedTypes.add(obj.getType()); @@ -231,102 +201,6 @@ } = /** - * Subclasses should override this method to provide a different sql t= ranslation - * of the literal boolean value. By default, a boolean literal is rep= resented as: - * '0' or '1'. - * @param booleanValue Boolean value, never null - * @return Translated string - */ - protected String translateLiteralBoolean(Boolean booleanValue) { - if(booleanValue.booleanValue()) { - return "1"; //$NON-NLS-1$ - } - return "0"; //$NON-NLS-1$ - } - - /** - * Subclasses should override this method to provide a different sql t= ranslation - * of the literal date value. By default, a date literal is represent= ed as: - * {d'2002-12-31'} - * @param dateValue Date value, never null - * @return Translated string - */ - protected String translateLiteralDate(java.sql.Date dateValue) { - return "{d'" + formatDateValue(dateValue) + "'}"; //$NON-NLS-1$ //= $NON-NLS-2$ - } - - /** - * Subclasses should override this method to provide a different sql t= ranslation - * of the literal time value. By default, a time literal is represent= ed as: - * {t'23:59:59'} - * @param timeValue Time value, never null - * @return Translated string - */ - protected String translateLiteralTime(Time timeValue) { - return "{t'" + formatDateValue(timeValue) + "'}"; //$NON-NLS-1$ //= $NON-NLS-2$ - } - - /** - * Subclasses should override this method to provide a different sql t= ranslation - * of the literal timestamp value. By default, a timestamp literal is - * represented as: {ts'2002-12-31 23:59:59'}. - * @param timestampValue Timestamp value, never null - * @return Translated string - */ - protected String translateLiteralTimestamp(Timestamp timestampValue) { - return "{ts'" + formatDateValue(timestampValue) + "'}"; //$NON-NLS= -1$ //$NON-NLS-2$ - } - = - /** - * Format the dateObject (of type date, time, or timestamp) into a str= ing - * using the DatabaseTimeZone format. - * @param dateObject - * @return Formatted string - */ - protected String formatDateValue(Object dateObject) { - if(this.databaseTimeZone =3D=3D null) { - return dateObject.toString(); - } - = -//System.out.println("!!! translating timestamp value " + dateObject + " (= " + ((java.util.Date)dateObject).getTime() + " in " + this.databaseTimeZone= ); = - = - if(dateObject instanceof Timestamp) { - SimpleDateFormat timestampFormatter =3D new SimpleDateFormat("= yyyy-MM-dd HH:mm:ss"); //$NON-NLS-1$ - timestampFormatter.setTimeZone(this.databaseTimeZone); - - Timestamp ts =3D (Timestamp) dateObject; = - String nanoStr =3D "" + (1000000000L + ts.getNanos()); //$NON-= NLS-1$ - while(nanoStr.length() > 2 && nanoStr.charAt(nanoStr.length()-= 1) =3D=3D '0') { - nanoStr =3D nanoStr.substring(0, nanoStr.length()-1); - } - String tsStr =3D timestampFormatter.format(ts) + "." + nanoStr= .substring(1); //$NON-NLS-1$ - = -//System.out.println("!!! returning " + tsStr); = - = - return tsStr; - = - } else if(dateObject instanceof java.sql.Date) { - SimpleDateFormat dateFormatter =3D new SimpleDateFormat("yyyy-= MM-dd"); //$NON-NLS-1$ - dateFormatter.setTimeZone(this.databaseTimeZone); - return dateFormatter.format((java.sql.Date)dateObject); - = - } else if(dateObject instanceof Time) { - SimpleDateFormat timeFormatter =3D new SimpleDateFormat("HH:mm= :ss"); //$NON-NLS-1$ - timeFormatter.setTimeZone(this.databaseTimeZone); - return timeFormatter.format((java.sql.Time)dateObject); - = - } else { - return dateObject.toString(); - } = - } = - - /** - */ - public void setFunctionModifiers(Map modifiers) { - this.modifiers =3D modifiers; - } - = - /** * Set the per-command execution context on this visitor. = * @param context ExecutionContext * @since 4.3 @@ -345,39 +219,11 @@ return this.context; } = - public void setProperties(Properties props) { - String useBindVariables =3D props.getProperty(JDBCPropertyNames.US= E_BIND_VARIABLES, Boolean.FALSE.toString()); - if (useBindVariables.equals(Boolean.TRUE.toString())) { - this.stmtType =3D TranslatedCommand.STMT_TYPE_PREPARED_STATEME= NT; - } = - = - String useCommentInSource =3D props.getProperty(JDBCPropertyNames.= USE_COMMENTS_SOURCE_QUERY); - if (useCommentInSource !=3D null) { - this.useComment =3D Boolean.valueOf(useCommentInSource).boolea= nValue(); - } + protected String getSourceComment(ICommand command) { + return this.translator.getSourceComment(this.context, command); } = /** - * inserting the comments is the source SQL supported or not by the = - * source data source. By default it is turned on; user has choice to - * turn off by setting the connector property; the data base source has - * option to turn off by overloading this. = - * @return true if yes; false otherwise. - */ - protected boolean supportsComments() { - return this.useComment; - } - = - static final FieldPosition FIELD_ZERO =3D new FieldPosition(0); - protected String addProcessComment() { - if (supportsComments() && this.context !=3D null) { - return COMMENT.format(new Object[] {this.context.getConnection= Identifier(), this.context.getRequestIdentifier(), this.context.getPartIden= tifier()}); - } - return super.addProcessComment(); = - } - = - = - /** * This is a generic implementation. Subclass should override this met= hod * if necessary. * @param exec The command for the stored procedure. @@ -400,7 +246,7 @@ } } = - prepareCallBuffer.append(addProcessComment()); + prepareCallBuffer.append(getSourceComment(exec)); = if(needQuestionMark){ prepareCallBuffer.append("?=3D"); //$NON-NLS-1$ @@ -427,36 +273,7 @@ return prepareCallBuffer.toString(); } = - /** - * @param factory - */ - public void setLanguageFactory(ILanguageFactory factory) { - languageFactory =3D factory; - } - - /** - * @return - */ - public ILanguageFactory getLanguageFactory() { - return languageFactory; - } - - public void setDatabaseTimeZone(TimeZone zone) { - databaseTimeZone =3D zone; - } - - protected TimeZone getDatabaseTimeZone() { - return databaseTimeZone; - } - = /** = - * @return the execType - */ - protected int getExecType() { - return this.execType; - } - = - /** = * @return the preparedValues */ List getPreparedValues() { @@ -470,15 +287,61 @@ return this.preparedTypes; } = - /** = - * @return the stmtType - */ - int getStmtType() { - return this.stmtType; + public boolean isPrepared() { + return prepared; + } + = + public void setPrepared(boolean prepared) { + this.prepared =3D prepared; + } + = + @Override + protected boolean useAsInGroupAlias() { + return this.translator.useAsInGroupAlias(); } = - protected void setStmtType(int stmtType) { - this.stmtType =3D stmtType; + @Override + public void visit(IQuery obj) { + if (obj.getLimit() !=3D null) { + handleLimit(obj); + } else { + super.visit(obj); + } } - = + = + @Override + public void visit(ISetQuery obj) { + if (obj.getLimit() !=3D null) { + handleLimit(obj); + } else { + super.visit(obj); + } + } + = + @Override + protected boolean useParensForSetQueries() { + return translator.useParensForSetQueries(); + } + = + private void handleLimit(IQueryCommand obj) { + ILimit limit =3D obj.getLimit(); + obj.setLimit(null); + StringBuffer current =3D this.buffer; + this.buffer =3D new StringBuffer(); + append(obj); + current.append(this.translator.addLimitString(this.buffer.toString(),= limit)); + this.buffer =3D current; + obj.setLimit(limit); + } + = + @Override + protected String replaceElementName(String group, String element) { + return translator.replaceElementName(group, element); + } + = + @Override + protected void appendSetOperation(Operation operation) { + buffer.append(translator.getSetOperationString(operation)); + } + = } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/extension/SQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/SQLTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/SQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -20,48 +20,229 @@ * 02110-1301 USA. */ = -/* - */ package com.metamatrix.connector.jdbc.extension; = +import java.sql.Time; +import java.sql.Timestamp; +import java.text.MessageFormat; +import java.util.Calendar; +import java.util.HashMap; import java.util.Map; +import java.util.TimeZone; = +import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.jdbc.JDBCPropertyNames; import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.ISetQuery; = /** + * Base class for creating source SQL queries and retrieving results. + * Specific databases should override as necessary. */ -public interface SQLTranslator { +public class SQLTranslator { + + private static final MessageFormat COMMENT =3D new MessageFormat("/*te= iid sessionid:{0}, requestid:{1}.{2}*/ "); //$NON-NLS-1$ + + public final static TimeZone DEFAULT_TIME_ZONE =3D TimeZone.getDefault= (); + + private Map functionModifiers =3D new HashMap(); + private TimeZone databaseTimeZone; + private ConnectorEnvironment environment; = + private boolean useComments; + private boolean usePreparedStatements; + = /** * Initialize the SQLTranslator. * @param env * @param metadata * @throws ConnectorException */ - void initialize(ConnectorEnvironment env, RuntimeMetadata metadata) th= rows ConnectorException; = + public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { + this.environment =3D env; + + String timeZone =3D env.getProperties().getProperty(JDBCPropertyNa= mes.DATABASE_TIME_ZONE); + if(timeZone !=3D null && timeZone.trim().length() > 0) { + TimeZone tz =3D TimeZone.getTimeZone(timeZone); + // Check that the dbms time zone is really different than the = local time zone + if(!DEFAULT_TIME_ZONE.hasSameRules(tz)) { + this.databaseTimeZone =3D tz; = + } = + } = + = + this.useComments =3D PropertiesUtils.getBooleanProperty(env.getPro= perties(), JDBCPropertyNames.USE_COMMENTS_SOURCE_QUERY, false); + this.usePreparedStatements =3D PropertiesUtils.getBooleanProperty(= env.getProperties(), JDBCPropertyNames.USE_BIND_VARIABLES, false); + } = + public TimeZone getDatabaseTimeZone() { + return databaseTimeZone; + } + = + public ConnectorEnvironment getEnvironment() { + return environment; + } + = + public ILanguageFactory getLanguageFactory() { + return environment.getLanguageFactory(); + } + = /** * Modify the command. * @param command * @param context * @return */ - ICommand modifyCommand(ICommand command, ExecutionContext context) thr= ows ConnectorException; + public ICommand modifyCommand(ICommand command, ExecutionContext conte= xt) throws ConnectorException { + return command; + } = /** - * Return the SQLConversionVisitor used for converting the command obj= ects to - * a sql string. - * @return + * Return a map of function name in lower case to FunctionModifier. + * @return Map of function name to FunctionModifier. */ - SQLConversionVisitor getTranslationVisitor(); + public Map getFunctionModifiers() { + return functionModifiers; + } = + public void registerFunctionModifier(String name, FunctionModifier mod= ifier) { + this.functionModifiers.put(name, modifier); + } + = /** - * Return a map of function name in lower case to FunctionModifier. - * @return Map of function name to FunctionModifier. + * Subclasses should override this method to provide a different sql t= ranslation + * of the literal boolean value. By default, a boolean literal is rep= resented as: + * '0' or '1'. + * @param booleanValue Boolean value, never null + * @return Translated string */ - Map getFunctionModifiers(); + public String translateLiteralBoolean(Boolean booleanValue) { + if(booleanValue.booleanValue()) { + return "1"; //$NON-NLS-1$ + } + return "0"; //$NON-NLS-1$ + } + + /** + * Subclasses should override this method to provide a different sql t= ranslation + * of the literal date value. By default, a date literal is represent= ed as: + * {d'2002-12-31'} + * @param dateValue Date value, never null + * @return Translated string + */ + public String translateLiteralDate(java.sql.Date dateValue, Calendar c= al) { + return "{d'" + formatDateValue(dateValue, cal) + "'}"; //$NON-NLS-= 1$ //$NON-NLS-2$ + } + + /** + * Subclasses should override this method to provide a different sql t= ranslation + * of the literal time value. By default, a time literal is represent= ed as: + * {t'23:59:59'} + * @param timeValue Time value, never null + * @return Translated string + */ + public String translateLiteralTime(Time timeValue, Calendar cal) { + if (!hasTimeType()) { + return "{ts'1970-01-01 " + formatDateValue(timeValue, cal) + "'}"; /= /$NON-NLS-1$ //$NON-NLS-2$ + } + return "{t'" + formatDateValue(timeValue, cal) + "'}"; //$NON-NLS-= 1$ //$NON-NLS-2$ + } + + /** + * Subclasses should override this method to provide a different sql t= ranslation + * of the literal timestamp value. By default, a timestamp literal is + * represented as: {ts'2002-12-31 23:59:59'}. + * @param timestampValue Timestamp value, never null + * @return Translated string + */ + public String translateLiteralTimestamp(Timestamp timestampValue, Cale= ndar cal) { + return "{ts'" + formatDateValue(timestampValue, cal) + "'}"; //$NO= N-NLS-1$ //$NON-NLS-2$ + } + = + /** + * Format the dateObject (of type date, time, or timestamp) into a str= ing + * using the DatabaseTimeZone format. + * @param dateObject + * @param cal + * @return Formatted string + */ + public String formatDateValue(java.util.Date dateObject, Calendar cal)= { + if (dateObject instanceof Timestamp && getTimestampNanoSecondPreci= sion() < 9) { + Timestamp ts =3D (Timestamp)dateObject; + Timestamp newTs =3D new Timestamp(ts.getTime()); + if (getTimestampNanoSecondPrecision() > 0) { + int mask =3D 10^(9-getTimestampNanoSecondPrecision()); + newTs.setNanos(ts.getNanos()/mask*mask); + } + dateObject =3D newTs; + } + = + if(cal =3D=3D null) { + return dateObject.toString(); + } + = + return getEnvironment().getTypeFacility().convertDate(dateObject, + DEFAULT_TIME_ZONE, cal, dateObject.getClass()).toString(); = + } = + = + public boolean addSourceComment() { + return useComments; + } = + = + public String addLimitString(String queryCommand, ILimit limit) { + return queryCommand + " " + limit.toString(); //$NON-NLS-1$ + } + = + /** + * Indicates whether group alias should be of the form + * "...FROM groupA AS X" or "...FROM groupA X". Certain + * data sources (such as Oracle) may not support the first + * form. = + * @return boolean + */ + public boolean useAsInGroupAlias(){ + return true; + } + = + public boolean usePreparedStatements() { + return this.usePreparedStatements; + } + = + public boolean useParensForSetQueries() { + return false; + } + = + public boolean hasTimeType() { + return true; + } + = + public String getSetOperationString(ISetQuery.Operation operation) { + return operation.toString(); + } + = + public String getSourceComment(ExecutionContext context, ICommand comm= and) { + if (addSourceComment() && context !=3D null) { + synchronized (COMMENT) { + return COMMENT.format(new Object[] {context.getConnectionIden= tifier(), context.getRequestIdentifier(), context.getPartIdentifier()}); + } + } + return ""; //$NON-NLS-1$ = + } + = + public String replaceElementName(String group, String element) { + return null; + } + = + public int getTimestampNanoSecondPrecision() { + return 9; + } + = + public String getConnectionTestQuery() { + return "select 1"; //$NON-NLS-1$ + } + = } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/extension/TranslatedCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/TranslatedCommand.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/TranslatedCommand.java 2009-02-19 17:59:09 UTC (rev 476) @@ -42,27 +42,8 @@ */ public class TranslatedCommand { = - /** the translated command is a query */ - public static final int EXEC_TYPE_QUERY =3D 0; - - /** the translated command is an insert, update, or delete */ - public static final int EXEC_TYPE_UPDATE =3D 1; - - /** the translated command is an execute-type command */ - public static final int EXEC_TYPE_EXECUTE =3D 2; - = - /** execution of translated command requires a jdbc Statement */ - public static final int STMT_TYPE_STATEMENT =3D 0; - - /** execution of translated command requires a jdbc Prepared Statement= */ - public static final int STMT_TYPE_PREPARED_STATEMENT =3D 1; - - /** execution of translated command requires a jdbc Callable Statement= */ - public static final int STMT_TYPE_CALLABLE_STATEMENT =3D 2; - = private String sql; - private int executionType; - private int statementType; + private boolean prepared; private List preparedValues; private List preparedTypes; = @@ -79,9 +60,8 @@ this.context =3D context; this.sqlTranslator =3D sqlTranslator; = - Map modifiers =3D sqlTranslator.getFunctionModifiers(); - this.sqlConversionVisitor =3D sqlTranslator.getTranslationVisitor(= ); - sqlConversionVisitor.setFunctionModifiers(modifiers); + Map modifiers =3D sqlTranslator.getFunction= Modifiers(); + this.sqlConversionVisitor =3D new SQLConversionVisitor(sqlTranslat= or); sqlConversionVisitor.setExecutionContext(context); this.functionVisitor =3D new FunctionReplacementVisitor(modifiers); } @@ -102,18 +82,17 @@ */ public void translateCommand(ICommand command) throws ConnectorExcepti= on { this.sql =3D getSQL(command); - this.statementType =3D this.sqlConversionVisitor.getStmtType(); - this.executionType =3D this.sqlConversionVisitor.getExecType(); this.preparedValues =3D this.sqlConversionVisitor.getPreparedValue= s(); this.preparedTypes =3D this.sqlConversionVisitor.getPreparedTypes(= ); + this.prepared =3D this.sqlConversionVisitor.isPrepared(); } = private String getSQL(ICommand command) throws ConnectorException { command =3D sqlTranslator.modifyCommand(command, context); command.acceptVisitor(functionVisitor); = - if (this.sqlConversionVisitor.getStmtType() =3D=3D STMT_TYPE_PREPA= RED_STATEMENT || hasBindValue(command)) { - this.sqlConversionVisitor.setStmtType(STMT_TYPE_PREPARED_STATE= MENT); + if (sqlTranslator.usePreparedStatements() || hasBindValue(command)= ) { + this.sqlConversionVisitor.setPrepared(true); = command.acceptVisitor(new BindValueVisitor()); } @@ -151,16 +130,6 @@ } = /** - * Return the execution type, one of {@link #EXEC_TYPE_QUERY}, - * {@link #EXEC_TYPE_UPDATE}, or - * {@link #EXEC_TYPE_EXECUTE} - * @return execution type of translated command - */ - public int getExecutionType() { - return executionType; - } - - /** * Return List of values to set on a prepared statement, if = * necessary (see {@link #getStatementType}) * @return List of values to be set on a prepared statement @@ -195,8 +164,8 @@ * {@link #STMT_TYPE_CALLABLE_STATEMENT} * @return statement type of translated command */ - public int getStatementType() { - return statementType; + public boolean isPrepared() { + return prepared; } = } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/extension/ValueRetriever.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/ValueRetriever.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/ValueRetriever.java 2009-02-19 17:59:09 UTC (rev 476) @@ -47,7 +47,7 @@ * @return The object that was retrieved * @throws SQLException If an error occurred retrieving the value */ - Object retrieveValue(ResultSet results, int columnIndex, Class expecte= dType, int nativeSQLType, Calendar cal, TypeFacility typeFacility) throws S= QLException; + Object retrieveValue(ResultSet results, int columnIndex, Class expecte= dType, Calendar cal, TypeFacility typeFacility) throws SQLException; = /** * Retrieve the value at parameterIndex from the callable= statement Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/extension/impl/BasicResultsTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/impl/BasicResultsTranslator.java 2009-02-16 21:35:28 UTC (re= v 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/impl/BasicResultsTranslator.java 2009-02-19 17:59:09 UTC (re= v 476) @@ -93,8 +93,7 @@ } = } = - = - public TypeFacility getTypefacility() { + public TypeFacility getTypeFacility() { return typeFacility; } = Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/extension/impl/BasicSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/impl/BasicSQLTranslator.java 2009-02-16 21:35:28 UTC (rev 47= 5) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/impl/BasicSQLTranslator.java 2009-02-19 17:59:09 UTC (rev 47= 6) @@ -1,109 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.extension.impl; - -import java.util.HashMap; -import java.util.Map; -import java.util.TimeZone; - -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.jdbc.JDBCPropertyNames; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; - -/** - */ -public class BasicSQLTranslator implements SQLTranslator { - public final static TimeZone DEFAULT_TIME_ZONE =3D TimeZone.getDefault= (); - - private RuntimeMetadata metadata; - private ConnectorEnvironment environment; - private Map functionModifiers =3D new HashMap(); - private TimeZone databaseTimeZone; - = - = - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#initiali= ze(com.metamatrix.data.ConnectorEnvironment) - */ - public void initialize(ConnectorEnvironment env, RuntimeMetadata metad= ata) throws ConnectorException { - this.metadata =3D metadata; - this.environment =3D env; - - String timeZone =3D env.getProperties().getProperty(JDBCPropertyNa= mes.DATABASE_TIME_ZONE); - if(timeZone !=3D null && timeZone.trim().length() > 0) { - TimeZone tz =3D TimeZone.getTimeZone(timeZone); - // Check that the dbms time zone is really different than the = local time zone - if(!DEFAULT_TIME_ZONE.hasSameRules(tz)) { - this.databaseTimeZone =3D tz; = - } = - } = - = - } - - /** - * Subclass should override this methods to modify the command if nece= ssary. - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#modifyCo= mmand(com.metamatrix.connector.language.ICommand, com.metamatrix.data.Execu= tionContext) - */ - public ICommand modifyCommand(ICommand command, ExecutionContext conte= xt) throws ConnectorException { - return command; - } - - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getTrans= lationVisitor() - */ - public SQLConversionVisitor getTranslationVisitor() { - SQLConversionVisitor visitor =3D new SQLConversionVisitor(); - visitor.setRuntimeMetadata(metadata); - visitor.setFunctionModifiers(getFunctionModifiers()); - visitor.setProperties(environment.getProperties()); - visitor.setLanguageFactory(environment.getLanguageFactory()); = = - visitor.setDatabaseTimeZone(databaseTimeZone); - = - return visitor; - } - - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getFunct= ionModifiers() - */ - public Map getFunctionModifiers() { - return functionModifiers; - } - - protected RuntimeMetadata getRuntimeMetadata(){ - return this.metadata; - } - = - protected ConnectorEnvironment getConnectorEnvironment(){ - return this.environment; - } - - protected TimeZone getDatabaseTimeZone() { - return this.databaseTimeZone; - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/extension/impl/BasicValueRetriever.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/impl/BasicValueRetriever.java 2009-02-16 21:35:28 UTC (rev 4= 75) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/impl/BasicValueRetriever.java 2009-02-19 17:59:09 UTC (rev 4= 76) @@ -25,7 +25,6 @@ import java.sql.CallableStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Types; import java.util.Calendar; import java.util.HashMap; import java.util.Map; @@ -78,7 +77,7 @@ /* = * @see com.metamatrix.connector.jdbc.extension.ValueRetriever#retriev= eValue(java.sql.ResultSet, int, java.lang.Class, java.util.Calendar) */ - public Object retrieveValue(ResultSet results, int columnIndex, Class = expectedType, int nativeSQLType, Calendar cal, TypeFacility typeFacility) t= hrows SQLException { + public Object retrieveValue(ResultSet results, int columnIndex, Class = expectedType, Calendar cal, TypeFacility typeFacility) throws SQLException { Integer code =3D (Integer) TYPE_CODE_MAP.get(expectedType); if(code !=3D null) { // Calling the specific methods here is more likely to get uni= form (and fast) results from different @@ -153,20 +152,7 @@ } } = - // otherwise fall through and call getObject() and rely on the nor= mal translation routines - switch(nativeSQLType) { - case Types.BLOB: = - return typeFacility.convertToRuntimeType(results.getBlob(c= olumnIndex)); - case Types.CLOB: = - return typeFacility.convertToRuntimeType(results.getClob(columnI= ndex)); - case Types.BINARY: - case Types.VARBINARY: - case Types.LONGVARBINARY: - return typeFacility.convertToRuntimeType(results.getBytes(col= umnIndex)); - } - = return typeFacility.convertToRuntimeType(results.getObject(columnI= ndex)); - = } = public Object retrieveValue(CallableStatement results, int parameterIn= dex, Class expectedType, Calendar cal, TypeFacility typeFacility) throws SQ= LException{ Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/informix/InformixResultsTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixResultsTranslator.java 2009-02-16 21:35:28 UTC (rev 4= 75) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixResultsTranslator.java 2009-02-19 17:59:09 UTC (rev 4= 76) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.informix; - -import com.metamatrix.connector.jdbc.extension.impl.BasicResultsTranslator; - -/** - */ -public class InformixResultsTranslator extends BasicResultsTranslator { - //TODO -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/informix/InformixSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixSQLTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixSQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -24,37 +24,25 @@ */ package com.metamatrix.connector.jdbc.informix; = -import java.util.*; - import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.extension.impl.*; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.api.SourceSystemFunctions; +import com.metamatrix.connector.jdbc.extension.SQLTranslator; +import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; = /** */ -public class InformixSQLTranslator extends BasicSQLTranslator { +public class InformixSQLTranslator extends SQLTranslator { = - private Map functionModifiers; - - public void initialize(ConnectorEnvironment env, - RuntimeMetadata metadata) throws ConnectorExcep= tion { - = - super.initialize(env, metadata); - initializeFunctionModifiers(); = + @Override + public void initialize(ConnectorEnvironment env) throws ConnectorExceptio= n { + super.initialize(env); + registerFunctionModifier(SourceSystemFunctions.CONVERT, new DropFunct= ionModifier()); //$NON-NLS-1$ = } - - private void initializeFunctionModifiers() { - functionModifiers =3D new HashMap(); - functionModifiers.putAll(super.getFunctionModifiers()); - functionModifiers.put("cast", new DropFunctionModifier()); = //$NON-NLS-1$ = - functionModifiers.put("convert", new DropFunctionModifier()); = //$NON-NLS-1$ = - } + = + @Override + public String getConnectionTestQuery() { + return "select 'x' from informix.sysusers where 1=3D0"; //$NON-NLS-1$ + } = - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getFunct= ionModifiers() - */ - public Map getFunctionModifiers() { - return this.functionModifiers; - } } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/informix/InformixSingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixSingleIdentityConnectionFactory.java 2009-02-16 21:35= :28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixSingleIdentityConnectionFactory.java 2009-02-19 17:59= :09 UTC (rev 476) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.informix; - -import com.metamatrix.connector.jdbc.*; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory; - -public class InformixSingleIdentityConnectionFactory extends JDBCSingleIde= ntityConnectionFactory{ - private String queryTest =3D "select 'x' from informix.sysusers where = 1=3D0"; //$NON-NLS-1$ - = - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } - = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/informix/InformixUserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixUserIdentityConnectionFactory.java 2009-02-16 21:35:2= 8 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixUserIdentityConnectionFactory.java 2009-02-19 17:59:0= 9 UTC (rev 476) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.informix; - -import com.metamatrix.connector.jdbc.*; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCUserIdentityConnectionFactory; - -public class InformixUserIdentityConnectionFactory extends JDBCUserIdentit= yConnectionFactory{ - private String queryTest =3D "select 'x' from informix.sysusers where = 1=3D0"; //$NON-NLS-1$ - = - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } - -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/mysql/MySQLCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLCapabilities.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLCapabilities.java 2009-02-19 17:59:09 UTC (rev 476) @@ -124,7 +124,7 @@ // ADDITIONAL functions supported by MySQL = // // Comparison -// supportedFunctions.add("COALESCE"); //$NON-NLS-1$ + supportedFunctions.add("COALESCE"); //$NON-NLS-1$ // supportedFunctions.add("GREATEST"); //$NON-NLS-1$ // supportedFunctions.add("ISNULL"); //$NON-NLS-1$ // supportedFunctions.add("LEAST"); //$NON-NLS-1$ Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/mysql/MySQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLConversionVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLConversionVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,90 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.mysql; - -import java.sql.Date; -import java.sql.Time; -import java.sql.Timestamp; -import java.text.SimpleDateFormat; - -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.IQueryCommand; - -/** - */ -class MySQLConversionVisitor extends SQLConversionVisitor { - = - /** - * Some very large row count. This number is from the mysql documentat= ion for the LIMIT clause - */ - static final String NO_LIMIT =3D "18446744073709551615"; //$NON-NLS-1$ - = - protected String translateLiteralDate(Date dateValue) { - return "DATE('" + formatDateValue(dateValue) + "')"; //$NON-NLS-1= $//$NON-NLS-2$ - } - - protected String translateLiteralTime(Time timeValue) { - return "TIME('" + formatDateValue(timeValue) + "')"; //$NON-NLS-1= $//$NON-NLS-2$ - } - = - protected String translateLiteralTimestamp(Timestamp timestampValue) { - return "TIMESTAMP('" + formatDateValue(timestampValue) + "')"; //= $NON-NLS-1$//$NON-NLS-2$ - } - = - protected String formatDateValue(Object dateObject) { - if(dateObject instanceof Timestamp) { - SimpleDateFormat timestampFormatter =3D new SimpleDateFormat("= yyyy-MM-dd HH:mm:ss"); //$NON-NLS-1$ - if (getDatabaseTimeZone() !=3D null) { - timestampFormatter.setTimeZone(getDatabaseTimeZone()); - } - - Timestamp ts =3D (Timestamp) dateObject; = - int nanos =3D ts.getNanos(); - int micros =3D nanos/1000; // truncate for microseconds - String microsStr =3D "" + (1000000 + micros); //$NON-NLS-1$ //= Add a number at the beginning, so that we can print leading zeros - = - return timestampFormatter.format(ts) + "." + microsStr.substri= ng(1); //$NON-NLS-1$ // show all digits except the number we just added - } - return super.formatDateValue(dateObject); - } - = - protected void appendSetQuery(IQueryCommand obj) { - buffer.append(LPAREN); - append(obj); - buffer.append(RPAREN); - } - = - public void visit(ILimit obj) { - buffer.append(LIMIT) - .append(SPACE); - if (obj.getRowOffset() > 0) { - buffer.append(obj.getRowOffset()) - .append(COMMA) - .append(SPACE); - } - buffer.append(obj.getRowLimit()); - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/mysql/MySQLConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLConvertModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLConvertModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -31,6 +31,7 @@ import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.ICompareCriteria.Operator; = = /** = @@ -94,11 +95,11 @@ int srcCode =3D getSrcCode(function); switch(srcCode) { case BOOLEAN: - // convert(booleanSrc, string) --> CASE booleanSrc WHEN 1 = THEN '1' ELSE '0' END - List when =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral(new Integer(1), Integer.class)}); + // convert(booleanSrc, string) --> CASE WHEN booleanSrc TH= EN '1' ELSE '0' END + List when =3D Arrays.asList(langFactory.createCompareCrite= ria(Operator.EQ, function.getParameters()[0], langFactory.createLiteral(Boo= lean.TRUE, Boolean.class))); List then =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral("1", String.class)}); //$NON-NLS-1$ IExpression elseExpr =3D langFactory.createLiteral("0", St= ring.class); //$NON-NLS-1$ - return langFactory.createCaseExpression(function.getParame= ters()[0], when, then, elseExpr, String.class); + return langFactory.createSearchedCaseExpression(when, then= , elseExpr, String.class); case BYTE: case SHORT: case INTEGER: @@ -156,10 +157,11 @@ switch(srcCode) { case STRING: // convert(src, boolean) --> CASE src WHEN 'true' THEN 1 E= LSE 0 END - List when =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral("true", String.class)}); //$NON-NLS-1$ - List then =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral(new Integer(1), Integer.class)}); - IExpression elseExpr =3D langFactory.createLiteral(new Int= eger(0), Integer.class); - return langFactory.createCaseExpression(function.getParame= ters()[0], when, then, elseExpr, Integer.class); = + // convert(booleanSrc, string) --> CASE WHEN booleanSrc TH= EN '1' ELSE '0' END + List when =3D Arrays.asList(langFactory.createCompareCrite= ria(Operator.EQ, function.getParameters()[0], langFactory.createLiteral("tr= ue", String.class))); + List then =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral(Integer.valueOf(1), Integer.class)}); //$NON-NLS-1$ + IExpression elseExpr =3D langFactory.createLiteral(Integer= .valueOf(0), Integer.class); //$NON-NLS-1$ + return langFactory.createSearchedCaseExpression(when, then= , elseExpr, String.class); default: return DROP_MODIFIER.modify(function); } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/mysql/MySQLResultsTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLResultsTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLResultsTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.mysql; - -import com.metamatrix.connector.jdbc.extension.impl.BasicResultsTranslator; - - -/** = - * @since 4.3 - */ -public class MySQLResultsTranslator extends BasicResultsTranslator { - -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/mysql/MySQLSingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLSingleIdentityConnectionFactory.java 2009-02-16 21:35:28 UT= C (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLSingleIdentityConnectionFactory.java 2009-02-19 17:59:09 UT= C (rev 476) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.mysql; - -import com.metamatrix.connector.jdbc.ConnectionQueryStrategy; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory; - - -/** = - * @since 4.3 - */ -public class MySQLSingleIdentityConnectionFactory extends JDBCSingleIdenti= tyConnectionFactory { - private String queryTest =3D "Select 1"; //$NON-NLS-1$ - = - /** = - * @see com.metamatrix.connector.jdbc.JDBCSourceConnectionFactory#crea= teConnectionStrategy() - * @since 4.3 - */ - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/mysql/MySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -22,59 +22,51 @@ = package com.metamatrix.connector.jdbc.mysql; = -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - +import java.sql.Date; +import java.sql.Time; +import java.sql.Timestamp; +import java.util.Calendar; + import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.api.SourceSystemFunctions; +import com.metamatrix.connector.jdbc.extension.SQLTranslator; = = /** = * @since 4.3 */ -public class MySQLTranslator extends BasicSQLTranslator { - - private Map functionModifiers; - private Properties connectorProperties; - private ILanguageFactory languageFactory; - - public void initialize(ConnectorEnvironment env, - RuntimeMetadata metadata) throws ConnectorExcep= tion { - = - super.initialize(env, metadata); - ConnectorEnvironment connEnv =3D getConnectorEnvironment(); - this.connectorProperties =3D connEnv.getProperties(); - this.languageFactory =3D connEnv.getLanguageFactory(); - initializeFunctionModifiers(); = - - } - - private void initializeFunctionModifiers() { - functionModifiers =3D new HashMap(); - functionModifiers.putAll(super.getFunctionModifiers()); - = - functionModifiers.put("cast", new MySQLConvertModifier(languageFac= tory)); //$NON-NLS-1$ - functionModifiers.put("convert", new MySQLConvertModifier(language= Factory)); //$NON-NLS-1$ - functionModifiers.put("nvl", new AliasModifier("ifnull")); //$NON-= NLS-1$ //$NON-NLS-2$ - } = - = - public Map getFunctionModifiers() { - return functionModifiers; - } - - public SQLConversionVisitor getTranslationVisitor() { - SQLConversionVisitor visitor =3D new MySQLConversionVisitor(); - visitor.setRuntimeMetadata(getRuntimeMetadata()); - visitor.setFunctionModifiers(functionModifiers); - visitor.setProperties(connectorProperties); - visitor.setLanguageFactory(languageFactory); - visitor.setDatabaseTimeZone(getDatabaseTimeZone()); - return visitor; - } +public class MySQLTranslator extends SQLTranslator { + + @Override + public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { + super.initialize(env); + registerFunctionModifier(SourceSystemFunctions.CONVERT, new MySQLC= onvertModifier(getLanguageFactory())); //$NON-NLS-1$ + } = + = + @Override + public String translateLiteralDate(Date dateValue, Calendar cal) { + return "DATE('" + formatDateValue(dateValue, cal) + "')"; //$NON-= NLS-1$//$NON-NLS-2$ + } + + @Override + public String translateLiteralTime(Time timeValue, Calendar cal) { + return "TIME('" + formatDateValue(timeValue, cal) + "')"; //$NON-= NLS-1$//$NON-NLS-2$ + } + + @Override + public String translateLiteralTimestamp(Timestamp timestampValue, Cale= ndar cal) { + return "TIMESTAMP('" + formatDateValue(timestampValue, cal) + "')"= ; //$NON-NLS-1$//$NON-NLS-2$ + } + = + @Override + public boolean useParensForSetQueries() { + return true; + } + = + @Override + public int getTimestampNanoSecondPrecision() { + return 6; + } + = } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/mysql/MySQLUserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLUserIdentityConnectionFactory.java 2009-02-16 21:35:28 UTC = (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLUserIdentityConnectionFactory.java 2009-02-19 17:59:09 UTC = (rev 476) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.mysql; - -import com.metamatrix.connector.jdbc.ConnectionQueryStrategy; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCUserIdentityConnectionFactory; - - -/** = - * @since 4.3 - */ -public class MySQLUserIdentityConnectionFactory extends JDBCUserIdentityCo= nnectionFactory { - private String queryTest =3D "Select 1"; //$NON-NLS-1$ - = - /** = - * @see com.metamatrix.connector.jdbc.JDBCSourceConnectionFactory#crea= teConnectionStrategy() - * @since 4.3 - */ - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/oracle/FormatFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/FormatFunctionModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/FormatFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.language.*; -/** - */ -public class FormatFunctionModifier extends BasicFunctionModifier implemen= ts FunctionModifier { - private ILanguageFactory langFactory; - - public FormatFunctionModifier(ILanguageFactory langFactory) { - this.langFactory =3D langFactory; - } - = - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) - */ - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); = - String format =3D (String) ((ILiteral)args[1]).getValue(); - - IFunction func =3D langFactory.createFunction("to_char", //$NON-NL= S-1$ - new IExpression[] { = - args[0], - langFactory.createLiteral(format, String.class), - }, - String.class); - - return func; - } -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/oracle/HourFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/HourFunctionModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/HourFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,60 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.language.*; - -/** - * Convert the HOUR function into an equivalent Oracle function. = - * HOUR(ts) --> TO_NUMBER(TO_CHAR(ts, 'HH24')) - */ -public class HourFunctionModifier extends BasicFunctionModifier implements= FunctionModifier { - - private ILanguageFactory langFactory; - = - public HourFunctionModifier(ILanguageFactory langFactory) { - this.langFactory =3D langFactory; - } - = - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) - */ - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - = - IFunction innerFunction =3D langFactory.createFunction("TO_CHAR", = //$NON-NLS-1$ - new IExpression[] { = - args[0], - langFactory.createLiteral("HH24", String.class)}, //$NON-= NLS-1$ - String.class); = - - IFunction outerFunction =3D langFactory.createFunction("TO_NUMBER"= , //$NON-NLS-1$ - new IExpression[] { innerFunction }, - Integer.class); = - = - return outerFunction; - } - -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/oracle/LeftOrRightFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LeftOrRightFunctionModifier.java 2009-02-16 21:35:28 UTC (rev 4= 75) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LeftOrRightFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 4= 76) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.language.*; - -/** - * Convert left(string, count) --> substr(string, 0, count) - * or right(string, count) --> substr(string, length(string) - count) - */ -public class LeftOrRightFunctionModifier extends BasicFunctionModifier imp= lements FunctionModifier { - private ILanguageFactory langFactory; - private String target; - = - public LeftOrRightFunctionModifier(ILanguageFactory langFactory, Strin= g target) { - this.langFactory =3D langFactory; - this.target =3D target; - } - = - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) - */ - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - IFunction func =3D null; - = - if (target.equalsIgnoreCase("left")) { //$NON-NLS-1$ - func =3D langFactory.createFunction("SUBSTR", //$NON-NLS-1$ - new IExpression[] { - args[0], = - langFactory.createLiteral(new Integer(0), Integer.clas= s), - args[1]}, - String.class); = - } else if (target.equalsIgnoreCase("right")) { //$NON-NLS-1$ - IFunction inner =3D langFactory.createFunction("LENGTH", //$N= ON-NLS-1$ - new IExpression[] {args[0]}, - Integer.class); - = - IExpression substrArgs =3D langFactory.createFunction("-", //= $NON-NLS-1$ - new IExpression[] {inner, args[1] }, = - Integer.class); = - = - func =3D langFactory.createFunction("SUBSTR", //$NON-NLS-1$ - new IExpression[] { - args[0], = - substrArgs}, - String.class); = - } - - return func; = - } -} Added: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connect= or/jdbc/oracle/LeftOrRightFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LeftOrRightFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LeftOrRightFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 4= 76) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.connector.jdbc.oracle; + +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.jdbc.extension.FunctionModifier; +import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; +import com.metamatrix.connector.language.*; + +/** + * Convert left(string, count) --> substr(string, 1, count) + * or right(string, count) --> substr(string, -1 * count) - we lack a way = to express a unary negation + */ +public class LeftOrRightFunctionModifier extends BasicFunctionModifier imp= lements FunctionModifier { + private ILanguageFactory langFactory; + = + public LeftOrRightFunctionModifier(ILanguageFactory langFactory) { + this.langFactory =3D langFactory; + } + = + /* = + * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) + */ + public IExpression modify(IFunction function) { + IExpression[] args =3D function.getParameters(); + IFunction func =3D null; + = + if (function.getName().equalsIgnoreCase("left")) { //$NON-NLS-1$ + func =3D langFactory.createFunction("SUBSTR", //$NON-NLS-1$ + new IExpression[] { + args[0], = + langFactory.createLiteral(Integer.valueOf(1), TypeFaci= lity.RUNTIME_TYPES.INTEGER), + args[1]}, + String.class); = + } else if (function.getName().equalsIgnoreCase("right")) { //$NON-= NLS-1$ + IFunction negIndex =3D langFactory.createFunction("*", //$NON= -NLS-1$ + new IExpression[] {langFactory.createLiteral(Integer.value= Of(-1), TypeFacility.RUNTIME_TYPES.INTEGER), args[1]}, + Integer.class); + = + func =3D langFactory.createFunction("SUBSTR", //$NON-NLS-1$ + new IExpression[] { + args[0], = + negIndex}, + String.class); = + } + + return func; = + } +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/com/meta= matrix/connector/jdbc/oracle/LeftOrRightFunctionModifier.java ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/OracleCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleCapabilities.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleCapabilities.java 2009-02-19 17:59:09 UTC (rev 476) @@ -106,7 +106,7 @@ supportedFunctions.add("CONVERT"); //$NON-NLS-1$ supportedFunctions.add("IFNULL"); //$NON-NLS-1$ supportedFunctions.add("NVL"); //$NON-NLS-1$ = - + supportedFunctions.add("COALESCE"); //$NON-NLS-1$ return supportedFunctions; } = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/OracleConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleConvertModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleConvertModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -22,42 +22,29 @@ = package com.metamatrix.connector.jdbc.oracle; = -import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.jdbc.extension.FunctionModifier; import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; -import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.IScalarSubquery; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** */ public class OracleConvertModifier extends BasicFunctionModifier implement= s FunctionModifier { = private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); private ILanguageFactory langFactory; - private RuntimeMetadata metadata; - private ConnectorLogger logger; = - public OracleConvertModifier(ILanguageFactory langFactory, RuntimeMeta= data metadata, ConnectorLogger logger) { + public OracleConvertModifier(ILanguageFactory langFactory, ConnectorLo= gger logger) { this.langFactory =3D langFactory; - this.metadata =3D metadata; - this.logger =3D logger; } = /** - * Intentially return null, rely on the SQLStringVisitor being used by= caller + * Intentionally return null, rely on the SQLStringVisitor being used = by caller * (Oracle or Oracle8 SQLConversionVisitor (SQLConversionVisitor)) * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#trans= late(com.metamatrix.connector.language.IFunction) */ @@ -69,140 +56,41 @@ IExpression[] args =3D function.getParameters(); IExpression modified =3D null; = - if (args[0] !=3D null && args[0] instanceof ILiteral && ((ILiteral= )args[0]).getValue() =3D=3D null ) { - if (args[1] !=3D null && args[1] instanceof ILiteral) { - // This is a convert(null, ...) or cast(null as ...) - modified =3D convertNull(function); - return modified; - } - } = - = - if (args[1] !=3D null && args[1] instanceof ILiteral) { - String target =3D ((String)((ILiteral)args[1]).getValue()).toL= owerCase(); - if (target.equals("string")) { //$NON-NLS-1$ = - modified =3D convertToString(function); - } else if (target.equals("short")) { //$NON-NLS-1$ = - modified =3D convertToShort(function); - } else if (target.equals("integer")) { //$NON-NLS-1$ = - modified =3D convertToInteger(function); - } else if (target.equals("long")) { //$NON-NLS-1$ = - modified =3D convertToLong(function); - } else if (target.equals("biginteger")) { //$NON-NLS-1$ = - modified =3D convertToBigInteger(function); - } else if (target.equals("float")) { //$NON-NLS-1$ = - modified =3D convertToFloat(function); - } else if (target.equals("double")) { //$NON-NLS-1$ = - modified =3D convertToDouble(function); - } else if (target.equals("bigdecimal")) { //$NON-NLS-1$ = - modified =3D convertToBigDecimal(function); - } else if (target.equals("date")) { //$NON-NLS-1$ = - modified =3D convertToDate(function); - } else if (target.equals("time")) { //$NON-NLS-1$ = - modified =3D convertToTime(function); - } else if (target.equals("timestamp")) { //$NON-NLS-1$ = - modified =3D convertToTimestamp(function); - } else if (target.equals("char")) { //$NON-NLS-1$ = - modified =3D convertToChar(function); - } else if (target.equals("boolean")) { //$NON-NLS-1$ = - modified =3D convertToBoolean(function); - } else if (target.equals("byte")) { //$NON-NLS-1$ = - modified =3D convertToByte(function); - } else { - modified =3D DROP_MODIFIER.modify(function); = - } - return modified; - = - } - return DROP_MODIFIER.modify(function); = - } - = - /** = - * In Oracle 8i only, there are cases where a null in the select clause - * must be wrapped by a cast function, casting to the appropriate type. - * This happens when a Union is submitted to Oracle 8i. A null must - * be explicitly casted to the type of it's corresponding symbol in = - * another branch of the Union. - * = - * For example, the following query would fail in 8i: - * = - * select null from TableX Union select dateColumn from TableY - * = - * The above query would have to be rewritten as - * = - * select cast(null as date) from TableX Union select dateColumn= from TableY - * = - * This isn't necessary, though, for textual types (string, char, etc.= ) so the - * cast/convert function will be dropped. - * = - * (Date is Oracle type for timestamps and dates.) - * = - * @param function IFunction to be converted - */ - private IExpression convertNull(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - String typeName =3D null; - Class functionClass =3D null; - = String target =3D ((String)((ILiteral)args[1]).getValue()).toLower= Case(); if (target.equals("string")) { //$NON-NLS-1$ = - convert =3D DROP_MODIFIER.modify(function); = + modified =3D convertToString(function); } else if (target.equals("short")) { //$NON-NLS-1$ = - typeName =3D "Number"; //$NON-NLS-1$ - functionClass =3D Integer.class; + modified =3D convertToShort(function); } else if (target.equals("integer")) { //$NON-NLS-1$ = - typeName =3D "Number"; //$NON-NLS-1$ - functionClass =3D Integer.class; + modified =3D convertToInteger(function); } else if (target.equals("long")) { //$NON-NLS-1$ = - typeName =3D "Number"; //$NON-NLS-1$ - functionClass =3D Integer.class; + modified =3D convertToLong(function); } else if (target.equals("biginteger")) { //$NON-NLS-1$ = - typeName =3D "Number"; //$NON-NLS-1$ - functionClass =3D Integer.class; + modified =3D convertToBigInteger(function); } else if (target.equals("float")) { //$NON-NLS-1$ = - typeName =3D "float"; //$NON-NLS-1$ - functionClass =3D Float.class; + modified =3D convertToFloat(function); } else if (target.equals("double")) { //$NON-NLS-1$ = - typeName =3D "Number"; //$NON-NLS-1$ - functionClass =3D Integer.class; + modified =3D convertToDouble(function); } else if (target.equals("bigdecimal")) { //$NON-NLS-1$ = - typeName =3D "float"; //$NON-NLS-1$ - functionClass =3D Float.class; = + modified =3D convertToBigDecimal(function); } else if (target.equals("date")) { //$NON-NLS-1$ = - typeName =3D TypeFacility.RUNTIME_NAMES.DATE; = - functionClass =3D java.sql.Date.class; + modified =3D convertToDate(function); } else if (target.equals("time")) { //$NON-NLS-1$ = - typeName =3D TypeFacility.RUNTIME_NAMES.DATE; = - functionClass =3D java.sql.Time.class; + modified =3D convertToTime(function); } else if (target.equals("timestamp")) { //$NON-NLS-1$ = - typeName =3D TypeFacility.RUNTIME_NAMES.DATE; = - functionClass =3D java.sql.Timestamp.class; + modified =3D convertToTimestamp(function); } else if (target.equals("char")) { //$NON-NLS-1$ = - convert =3D DROP_MODIFIER.modify(function); = + modified =3D convertToChar(function); } else if (target.equals("boolean")) { //$NON-NLS-1$ = - typeName =3D "Number"; //$NON-NLS-1$ - functionClass =3D Integer.class; + modified =3D convertToBoolean(function); } else if (target.equals("byte")) { //$NON-NLS-1$ = - typeName =3D "Number"; //$NON-NLS-1$ - functionClass =3D Integer.class; + modified =3D convertToByte(function); } else { - convert =3D DROP_MODIFIER.modify(function); = + modified =3D DROP_MODIFIER.modify(function); = } - = - if (convert =3D=3D null) { - // cast (NULL as ...) -- > cast(NULL as ...) - // or - // convert (NULL, ...) -- > cast(NULL as ...) - convert =3D langFactory.createFunction("cast", //$NON-NLS-1$ - new IExpression[] { - args[0], - langFactory.createLiteral(typeName, String.class)}, = - functionClass); = - } - - return convert; + return modified; } - + = private IExpression convertToDate(IFunction function) { IExpression convert =3D null; IExpression[] args =3D function.getParameters(); @@ -262,24 +150,18 @@ break; = = case TIMESTAMP: // convert(timestamp, time) = - // --> to_date(('1970-01-01 ' ||substr(to_char(timestampva= lue, 'YYYY-MM-DD HH24:MI:SS'), 12)), = + // --> to_date(('1970-01-01 ' || to_char(timestampvalue, '= HH24:MI:SS'))), = // 'YYYY-MM-DD HH24:MI:SS') = IFunction inner =3D langFactory.createFunction("to_char", = //$NON-NLS-1$ new IExpression[] { = args[0], - langFactory.createLiteral("FXYYYY-MM-DD HH24:MI:SS= ", String.class)}, //$NON-NLS-1$ + langFactory.createLiteral("HH24:MI:SS", String.cla= ss)}, //$NON-NLS-1$ String.class); = = - IFunction intermediate =3D langFactory.createFunction("sub= str", //$NON-NLS-1$ - new IExpression[] { = - inner, - langFactory.createLiteral(new Integer(12), Integer= .class)}, = - String.class); = - = IExpression prependedPart =3D langFactory.createFunction(= "||", //$NON-NLS-1$ new IExpression[] { langFactory.createLiteral("1970-01-01 ", String.cl= ass), //$NON-NLS-1$ - intermediate}, + inner}, String.class); = convert =3D langFactory.createFunction("to_date", //$NON-= NLS-1$ @@ -295,40 +177,22 @@ return convert; } = = - /** - * This works only for Oracle 9i. - * @param src - * @return IFunction - */ private IExpression convertToTimestamp(IFunction function) { IExpression convert =3D null; IExpression[] args =3D function.getParameters(); Class srcType =3D args[0].getType(); int srcCode =3D getSrcCode(srcType); - //TODO: what is the best format for timestamp - //String format =3D "YYYY-MM-DD HH24:MI:SS.fffffffff"; //$NON-NLS= -1$ - String format =3D "YYYY-MM-DD HH24:MI:SS"; //$NON-NLS-1$ switch(srcCode) { case STRING: - // convert(STRING, timestamp) --> to_date(timestampvalue, = 'YYYY-MM-DD HH24:MI:SS'))) from smalla = - format =3D "YYYY-MM-DD HH24:MI:SS.FF"; //$NON-NLS-1$ + // convert(STRING, timestamp) --> to_date(timestampvalue, = 'YYYY-MM-DD HH24:MI:SS.FF'))) = + String format =3D "YYYY-MM-DD HH24:MI:SS.FF"; //$NON-NLS-= 1$ convert =3D dateTypeHelper("to_timestamp", new IExpression= [] {args[0], //$NON-NLS-1$ = langFactory.createLiteral(format, String.class)}, java= .sql.Timestamp.class); break; case TIME: case DATE: - // convert(DATE, timestamp) --> to_date(to_char(DATE, 'YYY= Y-MM-DD HH24:MI:SS'), 'YYYY-MM-DD HH24:MI:SS') - IFunction inner =3D langFactory.createFunction("to_char", = //$NON-NLS-1$ - new IExpression[] { = - args[0], - langFactory.createLiteral(format, String.class)}, = - String.class); = - = - convert =3D langFactory.createFunction("to_date", //$NON-= NLS-1$ - new IExpression[] { = - inner, - langFactory.createLiteral(format, String.class)}, = - java.sql.Timestamp.class); = + convert =3D dateTypeHelper("cast", new IExpression[] {args[0]= , //$NON-NLS-1$ = + langFactory.createLiteral("timestamp", String.clas= s)}, java.sql.Timestamp.class); //$NON-NLS-1$ break; = default: convert =3D DROP_MODIFIER.modify(function); = @@ -350,7 +214,6 @@ IExpression convert =3D null; IExpression[] args =3D function.getParameters(); String format =3D null; - boolean dateTypeFound =3D false; = int srcCode =3D getSrcCode(function); switch(srcCode) { // convert(input, string) --> to_char(input) @@ -384,56 +247,7 @@ convert =3D createStringFunction(args[0], format); = break; case TIMESTAMP: - if (args[0] instanceof IElement) { - IElement element =3D (IElement) args[0]; - MetadataID id =3D element.getMetadataID(); - RuntimeMetadata rmd =3D this.metadata; - try { - Element elemMetadata =3D (Element)rmd.getObject(id= ); - String nativeType =3D elemMetadata.getNativeType(); - if (nativeType !=3D null && nativeType.equalsIgnor= eCase("DATE")) { //$NON-NLS-1$ - dateTypeFound =3D true; - } - } - catch (ConnectorException e) { - logger.logError(e.getMessage()); - } - } - else if (args[0] instanceof IScalarSubquery) { - IScalarSubquery scalar =3D (IScalarSubquery) args[0]; - List symList =3D scalar.getQuery().getProjectedQuery()= .getSelect().getSelectSymbols(); - Iterator iter =3D symList.iterator(); - while(iter.hasNext()) { - ISelectSymbol symObj =3D (ISelectSymbol)iter.next(= ); - IExpression expObj =3D symObj.getExpression(); - if (expObj instanceof IElement) { - IElement element =3D (IElement)expObj; - MetadataID id =3D element.getMetadataID(); - RuntimeMetadata rmd =3D this.metadata; - try { - Element elemMetadata =3D (Element)rmd.getO= bject(id); - String nativeType =3D elemMetadata.getNati= veType(); - if (nativeType !=3D null && nativeType.equ= alsIgnoreCase("DATE")) { //$NON-NLS-1$ - dateTypeFound =3D true; - } - } - catch (ConnectorException e) { - logger.logError(e.getMessage()); - = - } - } - } - = - } - = - if (dateTypeFound) { - format =3D "YYYY-MM-DD HH24:MI:SS"; //$NON-NLS-1$ = - } - else { - format =3D "YYYY-MM-DD HH24:MI:SS.FF"; //$NON-NLS-1$ - } = - = - convert =3D createStringFunction(args[0], format); = + convert =3D createStringFunction(args[0], "YYYY-MM-DD HH24= :MI:SS.FF"); //$NON-NLS-1$ = break; default: convert =3D DROP_MODIFIER.modify(function); Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/oracle/OracleSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLConversionVisitor.java 2009-02-16 21:35:28 UTC (rev 47= 5) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLConversionVisitor.java 2009-02-19 17:59:09 UTC (rev 47= 6) @@ -1,282 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.oracle; - -import java.sql.Time; -import java.util.Iterator; - -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISetQuery.Operation; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; - -/** - */ -public class OracleSQLConversionVisitor extends SQLConversionVisitor { - - private final int MAX_SELECT_ALIAS_LENGTH =3D 30; - = - private final int MAX_TABLE_ALIAS_LENGTH =3D 30; - = - protected final static String DUAL =3D "DUAL"; //$NON-NLS-1$ - protected final static String ROWNUM =3D "ROWNUM"; //$NON-NLS-1$ - protected final static String SEQUENCE =3D ":SEQUENCE=3D"; //$NON-NLS-= 1$ - protected final static String HINT_PREFIX =3D "/*+"; //$NON-NLS-1$ - = - = - /** - * Overriden to check for Oracle SQL hints - * @param obj ISelect object - * @since 4.3 - */ - protected void visitSelect(ISelect obj) { - buffer.append(SELECT).append(SPACE); - buffer.append(addProcessComment()); - = - // Check for db hints - Object payload =3D this.getExecutionContext().getExecutionPayload(= ); - if (payload instanceof String) { - String payloadString =3D (String)payload; - if (payloadString.startsWith(HINT_PREFIX)) { - buffer.append(payloadString).append(SPACE); - } - } - = - if (obj.isDistinct()) { - buffer.append(DISTINCT).append(SPACE); - } - append(obj.getSelectSymbols()); - } - = - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IGroup) - */ - protected boolean useAsInGroupAlias(){ - return false; - } - = - /** - * Don't fully qualify elements if table =3D DUAL or element =3D ROWNU= M or special stuff is packed into name in source value. - * = - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#skipGro= upInElement(java.lang.String, java.lang.String) - * @since 5.0 - */ - protected String replaceElementName(String group, String element) { = = - - // Check if the element was modeled as using a Sequence - String elementTrueName =3D getElementTrueName(element); - if (elementTrueName !=3D null) { - return group + DOT + elementTrueName; - } - = - // Check if the group name should be discarded - if((group !=3D null && group.equalsIgnoreCase(DUAL)) || element.eq= ualsIgnoreCase(ROWNUM)) { - // Strip group if group or element are pseudo-columns - return element; - } - = - return null; - } - = - /** - * Check if the element was modeled as using a Sequence to - * generate a unique value for Inserting - strip off everything - * except the element name. Otherwise return null. - * @param element - * @return - * @since 4.3 - */ - protected String getElementTrueName(String element) { - = - int useIndex =3D element.indexOf(SEQUENCE); - if (useIndex >=3D 0) { - return element.substring(0, useIndex); = - } - = - return null; - } - - /* = - * @see com.metamatrix.connector.jdbc.extension.SQLConversionVisitor#t= ranslateLiteralTime(java.sql.Time) - */ - protected String translateLiteralTime(Time timeValue) { - return "{ts'1970-01-01 " + formatDateValue(timeValue) + "'}"; //$N= ON-NLS-1$ //$NON-NLS-2$ - } - - private static final String DATE_TYPE =3D "DATE"; //$NON-NLS-1$ - = - public void visit(ICompareCriteria obj) { - IExpression leftExpression =3D obj.getLeftExpression(); - append(leftExpression); - buffer.append(SPACE); - = - switch(obj.getOperator()) { - case EQ: buffer.append(EQ); break; - case GE: buffer.append(GE); break; - case GT: buffer.append(GT); break; - case LE: buffer.append(LE); break; - case LT: buffer.append(LT); break; - case NE: buffer.append(NE); break; - } - buffer.append(SPACE); - = - IExpression rightExpression =3D obj.getRightExpression(); - if(leftExpression instanceof IElement && rightExpression instanceo= f ILiteral && ((ILiteral)rightExpression).getType().equals(TypeFacility.RUN= TIME_TYPES.TIMESTAMP) && ((ILiteral)rightExpression).getValue() !=3D null) { - translateStringToTimestampConversion(leftExpression, rightExpr= ession); - = - } else { - append(rightExpression); = - } = - } - = - /** = - * If a column is modeled with name in source indicating that an Oracl= e Sequence should - * be used to generate the value to insert, then pull the Sequence nam= e out of the name - * in source of the column, discard the (dummy) literal value from the= user-entered value list, - * and replace with the Sequence (as an IElement). - * Implementation note: An IGroup will be used for the Sequence name, = and an IElement will be used - * for the Sequence operation (i.e. "nextVal"). - * This nasty kludge is brought to you by Tier 3. - * @see com.metamatrix.connector.jdbc.extension.SQLConversionVisitor#v= isit(com.metamatrix.connector.language.IInsert) - * @since 4.3 - */ - public void visit(IInsert obj) { - = - Iterator iter =3D obj.getElements().iterator(); - for (int i=3D0; i=3D 0) { - = - String sequence =3D name.substring(index + SEQUENCE.le= ngth()); - = - int delimiterIndex =3D sequence.indexOf(DOT); - if (delimiterIndex >=3D 0) { - String sequenceGroupName =3D sequence.substring(0,= delimiterIndex); - String sequenceElementName =3D sequence.substring(= delimiterIndex + 1); - = - ILanguageObject previousValue =3D (ILanguageObject= )obj.getValues().get(i); - IGroup sequenceGroup =3D this.getLanguageFactory()= .createGroup(sequenceGroupName, null, null); - IElement sequenceElement =3D this.getLanguageFacto= ry().createElement(sequenceElementName, sequenceGroup, null, previousValue.= getClass()); - = - obj.getValues().set(i, sequenceElement); - = - } - } - = - } - = - } - = - super.visit(obj); - } - - protected void translateStringToTimestampConversion(IExpression leftEx= pression, - IExpression rightExp= ression) { - String nativeType =3D DATE_TYPE; - - try { - // Determine native type of left element - IElement element =3D (IElement) leftExpression; - MetadataID metadataID =3D element.getMetadataID(); - Element elem =3D (Element) super.metadata.getObject(metadataID= ); - nativeType =3D elem.getNativeType(); = - } catch(ConnectorException e) { - // ignore, use default - } - = - // Translate timestamp based on native type of compared element - = Oracle will - // only use an index for date or timestamp type columns if the pro= per function - // is used. The importer will import date types as type=3DDATE an= d timestamp types - // as type=3DTIMESTAMP(0), etc. - ILiteral timestamp =3D (ILiteral) rightExpression; - if(nativeType !=3D null && nativeType.equalsIgnoreCase(DATE_TYPE))= { - buffer.append("to_date('"); //$NON-NLS-1$ - = - String tsValue =3D formatDateValue(timestamp.getValue()); - int decimalIndex =3D tsValue.lastIndexOf("."); //$NON-NLS-1$ - if(decimalIndex >=3D 0) { = - buffer.append(tsValue.substring(0, decimalIndex)); - } else { - buffer.append(tsValue); - } - buffer.append("','YYYY-MM-DD HH24:MI:SS')");//$NON-NLS-1$ - } else { - buffer.append("to_timestamp('"); //$NON-NLS-1$ - buffer.append(formatDateValue(timestamp.getValue())); - buffer.append("','YYYY-MM-DD HH24:MI:SS.FF')");//$NON-NLS-1$ - } - } - = - public void visit(ILimit obj) { - //limits should be removed by the translator - } - = - /** = - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#appendS= etOperation(com.metamatrix.connector.language.ISetQuery.Operation) - */ - @Override - protected void appendSetOperation(Operation operation) { - if (operation.equals(Operation.EXCEPT)) { - buffer.append("MINUS"); //$NON-NLS-1$ - } else { - super.appendSetOperation(operation); - } - } - - /** = - * @see com.metamatrix.connector.jdbc.extension.SQLConversionVisitor#g= etMaxSelectAliasLength() - * @since 4.3 - */ - protected int getMaxSelectAliasLength() { - return MAX_SELECT_ALIAS_LENGTH; - } - - /** = - * @see com.metamatrix.connector.jdbc.extension.SQLConversionVisitor#g= etMaxTableAliasLength() - * @since 4.3 - */ - protected int getMaxTableAliasLength() { - return MAX_TABLE_ALIAS_LENGTH; - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/OracleSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -24,272 +24,207 @@ */ package com.metamatrix.connector.jdbc.oracle; = -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; -import java.util.Properties; = import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; +import com.metamatrix.connector.api.SourceSystemFunctions; +import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ICriteria; import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.language.IFromItem; import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IInlineView; -import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.IInsert; import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.IOrderByItem; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.language.ISetQuery; -import com.metamatrix.connector.language.ICompareCriteria.Operator; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.visitor.util.CollectorVisitor; -import com.metamatrix.connector.visitor.util.SQLStringVisitor; +import com.metamatrix.connector.language.ISetQuery.Operation; +import com.metamatrix.connector.metadata.runtime.Element; +import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.visitor.util.SQLReservedWords; = /** */ -public class OracleSQLTranslator extends BasicSQLTranslator { - - protected final static String ROWNUM =3D "ROWNUM"; //$NON-NLS-1$ - protected final static String ROWNUM_ALIAS =3D "MM_ROWNUM"; //$NON-NLS= -1$ - protected final static String INLINE_VIEW_ALIAS =3D "MM_VIEW_FOR_LIMIT= "; //$NON-NLS-1$ - protected final static String ROOT_EXPRESSION_NAME =3D "expr"; //$NON-= NLS-1$ - - = - - private Map functionModifiers; - private Properties connectorProperties; - private ILanguageFactory languageFactory; - - public void initialize(ConnectorEnvironment env, - RuntimeMetadata metadata) throws ConnectorExcep= tion { - = - super.initialize(env, metadata); - ConnectorEnvironment connEnv =3D getConnectorEnvironment(); - this.connectorProperties =3D connEnv.getProperties(); - this.languageFactory =3D connEnv.getLanguageFactory(); - initializeFunctionModifiers(); = - +public class OracleSQLTranslator extends SQLTranslator { + + public final static String HINT_PREFIX =3D "/*+"; //$NON-NLS-1$ + public final static String DUAL =3D "DUAL"; //$NON-NLS-1$ + public final static String ROWNUM =3D "ROWNUM"; //$NON-NLS-1$ + public final static String SEQUENCE =3D ":SEQUENCE=3D"; //$NON-NLS-1$ + = + public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { + super.initialize(env); + registerFunctionModifier(SourceSystemFunctions.CHAR, new AliasModi= fier("chr")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LCASE, new AliasMod= ifier("lower")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.UCASE, new AliasMod= ifier("upper")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.IFNULL, new AliasMo= difier("nvl")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LOG, new AliasModif= ier("ln")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.CEILING, new AliasM= odifier("ceil")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LOG10, new Log10Fun= ctionModifier(getLanguageFactory())); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.CONVERT, new Oracle= ConvertModifier(getLanguageFactory(), getEnvironment().getLogger())); //$NO= N-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.HOUR, new ExtractFu= nctionModifier("HOUR"));//$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.YEAR, new ExtractFu= nctionModifier("YEAR"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.MINUTE, new Extract= FunctionModifier("MINUTE"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.SECOND, new Extract= FunctionModifier("SECOND"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.MONTH, new ExtractF= unctionModifier("MONTH"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new Ext= ractFunctionModifier("DAY"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.MONTHNAME, new Mont= hOrDayNameFunctionModifier(getLanguageFactory(), "Month"));//$NON-NLS-1$ //= $NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYNAME, new MonthO= rDayNameFunctionModifier(getLanguageFactory(), "Day"));//$NON-NLS-1$ //$NON= -NLS-2$ + registerFunctionModifier(SourceSystemFunctions.WEEK, new DayWeekQu= arterFunctionModifier(getLanguageFactory(), "WW"));//$NON-NLS-1$ //$NON-NLS= -2$ + registerFunctionModifier(SourceSystemFunctions.QUARTER, new DayWee= kQuarterFunctionModifier(getLanguageFactory(), "Q"));//$NON-NLS-1$ //$NON-N= LS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYOFWEEK, new DayW= eekQuarterFunctionModifier(getLanguageFactory(), "D"));//$NON-NLS-1$ //$NON= -NLS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYOFYEAR, new DayW= eekQuarterFunctionModifier(getLanguageFactory(), "DDD"));//$NON-NLS-1$ //$N= ON-NLS-2$ = + registerFunctionModifier(SourceSystemFunctions.LOCATE, new LocateF= unctionModifier(getLanguageFactory()));//$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.SUBSTRING, new Alia= sModifier("substr"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LEFT, new LeftOrRig= htFunctionModifier(getLanguageFactory()));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.RIGHT, new LeftOrRi= ghtFunctionModifier(getLanguageFactory()));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.CONCAT, new ConcatF= unctionModifier(getLanguageFactory())); //$NON-NLS-1$ + } + = + @Override + public ICommand modifyCommand(ICommand command, ExecutionContext conte= xt) + throws ConnectorException { + if (!(command instanceof IInsert)) { + return command; + } + = + /* = + * If a missing auto_increment column is modeled with name in sour= ce indicating that an Oracle Sequence = + * then pull the Sequence name out of the name in source of the co= lumn. + */ + IInsert insert =3D (IInsert)command; + List allElements =3D insert.getGroup().getMetadataID().ge= tChildIDs(); + if (allElements.size() =3D=3D insert.getValues().size()) { + return command; + } + = + int index =3D 0; + List elements =3D insert.getElements(); + = + for (MetadataID metadataID : allElements) { + Element element =3D (Element)metadataID.getMetadataObject(); + if (!element.isAutoIncremented()) { + continue; + } + String name =3D element.getNameInSource(); + int seqIndex =3D name.indexOf(SEQUENCE); + if (seqIndex =3D=3D -1) { + continue; + } + boolean found =3D false; + while (index < elements.size()) { + if (metadataID.equals(elements.get(index).getMetadataID())) { + found =3D true; + break; + } + index++; + } + if (found) { + continue; + } + = + String sequence =3D name.substring(seqIndex + SEQUENCE.length(= )); + = + int delimiterIndex =3D sequence.indexOf(SQLReservedWords.DOT); + if (delimiterIndex =3D=3D -1) { + throw new ConnectorException("Invalid name in source sequence= format. Expected " + SEQUENCE + "., but was " + name); + } + String sequenceGroupName =3D sequence.substring(0, delimiterIn= dex); + String sequenceElementName =3D sequence.substring(delimiterInd= ex + 1); + = + IGroup sequenceGroup =3D this.getLanguageFactory().createGroup= (sequenceGroupName, null, null); + IElement sequenceElement =3D this.getLanguageFactory().createE= lement(sequenceElementName, sequenceGroup, null, element.getJavaType()); + insert.getElements().add(index, this.getLanguageFactory().crea= teElement(element.getMetadataID().getName(), insert.getGroup(), metadataID,= element.getJavaType())); + insert.getValues().add(index, sequenceElement); + } + return command; } - - /** = - * @see com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslato= r#modifyCommand(com.metamatrix.connector.language.ICommand, com.metamatrix.= connector.api.ExecutionContext) - * @since 5.0 - */ - public ICommand modifyCommand(ICommand command, ExecutionContext conte= xt) throws ConnectorException { - command =3D super.modifyCommand(command, context); - Collection subCommands =3D CollectorVisitor.collectObjects(IInline= View.class, command); - for (Iterator i =3D subCommands.iterator(); i.hasNext();) { - IInlineView inlineView =3D (IInlineView)i.next(); - inlineView.setQuery((IQueryCommand)modifyCommand(inlineView.ge= tQuery(), context)); - } - = - if (!(command instanceof IQueryCommand)) { - return command; - } - = - return modifySingleCommand((IQueryCommand)command, context); - } - = - protected IQueryCommand modifySingleCommand(IQueryCommand command, Exe= cutionContext context) { - if (command instanceof ISetQuery) { - ISetQuery union =3D (ISetQuery)command; - union.setLeftQuery(modifySingleCommand(union.getLeftQuery(), c= ontext)); - union.setRightQuery(modifySingleCommand(union.getRightQuery(),= context)); - return union; - } = - = - if (command.getLimit() =3D=3D null) { - return command; - } - = - ILimit limit =3D command.getLimit(); - command.setLimit(null); - = - List lstCriteria =3D new ArrayList(); - = - if (limit.getRowOffset() > 0) { - IGroup group =3D languageFactory.createGroup(INLINE_VIEW_ALIAS= , null, null); - IElement eleRowNum =3D languageFactory.createElement(ROWNUM_AL= IAS, group, null, TypeFacility.RUNTIME_TYPES.INTEGER); - ILiteral litOffset =3D languageFactory.createLiteral(new Integ= er( limit.getRowOffset() ), TypeFacility.RUNTIME_TYPES.INTEGER); - ICriteria criteria =3D languageFactory.createCompareCriteria(O= perator.GT, eleRowNum, litOffset); - lstCriteria.add( criteria ); - } - - IGroup group =3D languageFactory.createGroup(INLINE_VIEW_ALIAS, nu= ll, null); - IElement eleRowNum =3D languageFactory.createElement(ROWNUM_ALIAS,= group, null, TypeFacility.RUNTIME_TYPES.INTEGER); - ILiteral litLimit =3D languageFactory.createLiteral(new Integer( l= imit.getRowOffset() + limit.getRowLimit() ),TypeFacility.RUNTIME_TYPES.INTE= GER); - ICriteria criteria =3D languageFactory.createCompareCriteria(Opera= tor.LE, eleRowNum, litLimit); - lstCriteria.add( criteria ); - = - if ( lstCriteria.size() =3D=3D 1 ) { - criteria =3D lstCriteria.get( 0 ); - } else { - criteria =3D languageFactory.createCompoundCriteria(com.metama= trix.connector.language.ICompoundCriteria.Operator.AND, lstCriteria ); - } - = - IQuery intermediate =3D createLimitQuery(command, null, true); - = - IQuery result =3D createLimitQuery(intermediate, criteria, false); - = - eleRowNum =3D languageFactory.createElement(OracleSQLConversionVis= itor.ROWNUM, null, null, TypeFacility.RUNTIME_TYPES.INTEGER); - ISelectSymbol newSelectSymbol =3D languageFactory.createSelectSymb= ol(ROWNUM_ALIAS, eleRowNum); - newSelectSymbol.setAlias(true); - intermediate.getSelect().getSelectSymbols().add(newSelectSymbol); - = - return result; - } - - /** = - * @param query - * @param criteria - * @return - * @since 5.0 - */ - private IQuery createLimitQuery(IQueryCommand query, - ICriteria criteria, boolean alias) { - IInlineView view =3D languageFactory.createInlineView(query, INLIN= E_VIEW_ALIAS); - = - IFrom from =3D languageFactory.createFrom(Arrays.asList(new IFromI= tem[] {view})); - = - LinkedHashMap> names =3D new LinkedHashMap>(); - = - List symbols =3D query.getProjectedQuery().getSelect().getSelectSy= mbols(); - IOrderBy orderBy =3D query.getOrderBy(); - HashMap orderByNames =3D null; - if (orderBy !=3D null) { - orderByNames =3D new HashMap(); - for (IOrderByItem item : (List)orderBy.getItems()) { - if (item.getName() !=3D null) { - orderByNames.put(item.getName().toLowerCase(), item); - } + + @Override + public String addLimitString(String queryCommand, ILimit limit) { + StringBuffer limitQuery =3D new StringBuffer(queryCommand.length()); + if (limit.getRowOffset() > 0) { + limitQuery.append("SELECT * FROM (SELECT VIEW_FOR_LIMIT.*, ROWNUM ROWNU= M_ FROM ("); + } else { + limitQuery.append("SELECT * FROM ("); + } + limitQuery.append(queryCommand); + if (limit.getRowOffset() > 0) { + limitQuery.append(") VIEW_FOR_LIMIT WHERE ROWNUM <=3D ").append( + limit.getRowLimit()).append(") WHERE ROWNUM_ > ").append( + limit.getRowOffset()); + } else { + limitQuery.append(") WHERE ROWNUM <=3D ").append( + limit.getRowLimit()); + } + return limitQuery.toString(); + } + = + @Override + public boolean useAsInGroupAlias(){ + return false; + } + = + @Override + public String getSetOperationString(Operation operation) { + if (operation =3D=3D Operation.EXCEPT) { + return "MINUS"; //$NON-NLS-1$ + } + return super.getSetOperationString(operation); + } + = + @Override + public String getSourceComment(ExecutionContext context, ICommand comm= and) { + String comment =3D super.getSourceComment(context, command); + = + if (context !=3D null) { + // Check for db hints + Object payload =3D context.getExecutionPayload(); + if (payload instanceof String) { + String payloadString =3D (String)payload; + if (payloadString.startsWith(HINT_PREFIX)) { + comment +=3D payloadString + " "; //$NON-NLS-1$ + } + } + } + return comment; + } + = + /** + * Don't fully qualify elements if table =3D DUAL or element =3D ROWNU= M or special stuff is packed into name in source value. + * = + * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#skipGro= upInElement(java.lang.String, java.lang.String) + * @since 5.0 + */ + @Override + public String replaceElementName(String group, String element) { = = + + // Check if the element was modeled as using a Sequence + int useIndex =3D element.indexOf(SEQUENCE); + if (useIndex >=3D 0) { + String name =3D element.substring(0, useIndex); + if (group !=3D null) { + return group + SQLReservedWords.DOT + name; } + return name; } - = - for (int i =3D 0; i < symbols.size(); i++) { - ISelectSymbol symbol =3D (ISelectSymbol)symbols.get(i); - - String originalName =3D null; - = - if (symbol.getExpression() instanceof IElement || symbol.hasAl= ias()) { - originalName =3D SQLStringVisitor.getElementShortName(symbol.= getOutputName()).toLowerCase(); - } else if (alias) { - originalName =3D ROOT_EXPRESSION_NAME; = - } - = - String name =3D originalName; - = - int j =3D 0; - while (names.containsKey(name)) { - name =3D originalName + j++; - } - = - if (alias) { - symbol.setAlias(true); - symbol.setOutputName(name); - if (orderByNames !=3D null) { - IOrderByItem item =3D orderByNames.get(originalName); - if (item !=3D null) { - item.setName(name); - } - } - } - names.put(name, symbol.getExpression().getType()); - } = - List lstSelect =3D new ArrayList(); - - for (Map.Entry> entry : names.entrySet()) { - IGroup group =3D languageFactory.createGroup(INLINE_VIEW_ALIAS= , null, null); - IElement expression =3D languageFactory.createElement(entry.ge= tKey(), group, null, entry.getValue()); - ISelectSymbol newSymbol =3D languageFactory.createSelectSymbol= (entry.getKey(), expression); - lstSelect.add(newSymbol); - } - = - ISelect select =3D languageFactory.createSelect(false, lstSelect); - = - IQuery result =3D languageFactory.createQuery(select, from, criter= ia, null, null, null); - return result; - } - = - /** = - * @param modifier - * @since 4.2 - */ - private void initializeFunctionModifiers() { - functionModifiers =3D new HashMap(); - functionModifiers.putAll(super.getFunctionModifiers()); - functionModifiers.put("char", new AliasModifier("chr")); //$NON-NL= S-1$ //$NON-NLS-2$ - functionModifiers.put("lcase", new AliasModifier("lower")); //$NON= -NLS-1$ //$NON-NLS-2$ - functionModifiers.put("ucase", new AliasModifier("upper")); //$NON= -NLS-1$ //$NON-NLS-2$ - functionModifiers.put("ifnull", new AliasModifier("nvl")); //$NON-= NLS-1$ //$NON-NLS-2$ - functionModifiers.put("log", new AliasModifier("ln")); //$NON-NLS-= 1$ //$NON-NLS-2$ - functionModifiers.put("ceiling", new AliasModifier("ceil")); //$NO= N-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("log10", new Log10FunctionModifier(languageF= actory)); //$NON-NLS-1$ - functionModifiers.put("convert", new OracleConvertModifier(languag= eFactory, getRuntimeMetadata(), getConnectorEnvironment().getLogger())); //= $NON-NLS-1$ - functionModifiers.put("cast", new OracleConvertModifier(languageFa= ctory, getRuntimeMetadata(), getConnectorEnvironment().getLogger())); //$NO= N-NLS-1$ - functionModifiers.put("hour", new HourFunctionModifier(languageFac= tory));//$NON-NLS-1$ - functionModifiers.put("month", new ExtractFunctionModifier("MONTH"= ));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("year", new ExtractFunctionModifier("YEAR"))= ;//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("day", new ExtractFunctionModifier("DAY"));/= /$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("minute", new DayWeekQuarterFunctionModifier= (languageFactory, "MI"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("second", new DayWeekQuarterFunctionModifier= (languageFactory, "SS"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("monthname", new MonthOrDayNameFunctionModif= ier(languageFactory, "Month"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("dayname", new MonthOrDayNameFunctionModifie= r(languageFactory, "Day"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("week", new DayWeekQuarterFunctionModifier(l= anguageFactory, "WW"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("quarter", new DayWeekQuarterFunctionModifie= r(languageFactory, "Q"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("dayofweek", new DayWeekQuarterFunctionModif= ier(languageFactory, "D"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("dayofmonth", new DayWeekQuarterFunctionModi= fier(languageFactory, "DD"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("dayofyear", new DayWeekQuarterFunctionModif= ier(languageFactory, "DDD"));//$NON-NLS-1$ //$NON-NLS-2$ = - functionModifiers.put("formatdate", new FormatFunctionModifier(lan= guageFactory));//$NON-NLS-1$ = - functionModifiers.put("formattime", new FormatFunctionModifier(lan= guageFactory));//$NON-NLS-1$ = - functionModifiers.put("formattimestamp", new FormatFunctionModifie= r(languageFactory));//$NON-NLS-1$ = - functionModifiers.put("parsedate", new ParseFunctionModifier(langu= ageFactory, java.sql.Date.class));//$NON-NLS-1$ = - functionModifiers.put("parsetime", new ParseFunctionModifier(langu= ageFactory, java.sql.Time.class));//$NON-NLS-1$ = - functionModifiers.put("parsetimestamp", new ParseFunctionModifier(= languageFactory, java.sql.Timestamp.class));//$NON-NLS-1$ = - functionModifiers.put("locate", new LocateFunctionModifier(languag= eFactory));//$NON-NLS-1$ - functionModifiers.put("substring", new AliasModifier("substr"));//= $NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("left", new LeftOrRightFunctionModifier(lang= uageFactory, "left"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("right", new LeftOrRightFunctionModifier(lan= guageFactory, "right"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("concat", new ConcatFunctionModifier(languag= eFactory)); //$NON-NLS-1$ - functionModifiers.put("||", new ConcatFunctionModifier(languageFac= tory)); //$NON-NLS-1$ - } = - = - - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getTrans= lationVisitor() - */ - public SQLConversionVisitor getTranslationVisitor() { - SQLConversionVisitor visitor =3D new OracleSQLConversionVisitor(); - visitor.setRuntimeMetadata(getRuntimeMetadata()); - visitor.setFunctionModifiers(functionModifiers); - visitor.setProperties(connectorProperties); - visitor.setLanguageFactory(languageFactory); - visitor.setDatabaseTimeZone(getDatabaseTimeZone()); - return visitor; - } = - = - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getFunct= ionModifiers() - */ - public Map getFunctionModifiers() { - return functionModifiers; - } - + + // Check if the group name should be discarded + if((group !=3D null && group.equalsIgnoreCase(DUAL)) || element.eq= ualsIgnoreCase(ROWNUM)) { + // Strip group if group or element are pseudo-columns + return element; + } + = + return null; + } + = + @Override + public boolean hasTimeType() { + return false; + } + = + @Override + public String getConnectionTestQuery() { + return "Select 'x' from DUAL"; //$NON-NLS-1$ + } + = } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/oracle/ParseFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ParseFunctionModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ParseFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.language.*; -/** - */ -public class ParseFunctionModifier extends BasicFunctionModifier implement= s FunctionModifier { - private ILanguageFactory langFactory; - private Class targetClass; - = - public ParseFunctionModifier(ILanguageFactory langFactory, Class targe= tClass) { - this.langFactory =3D langFactory; - this.targetClass =3D targetClass; - } - = - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) - */ - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); = - String format =3D (String) ((ILiteral)args[1]).getValue(); - - IFunction func =3D langFactory.createFunction("to_date", //$NON-NL= S-1$ - new IExpression[] { = - args[0], - langFactory.createLiteral(format, String.class), - }, - targetClass); - - return func; - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/postgresql/PostgreSQLCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLCapabilities.java 2009-02-16 21:35:28 UTC (rev 47= 5) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLCapabilities.java 2009-02-19 17:59:09 UTC (rev 47= 6) @@ -200,7 +200,7 @@ // supportedFunctions.add("TIMEOFDAY"); //$NON-NLS-1$ // = // // Conditional -// supportedFunctions.add("COALESCE"); //$NON-NLS-1$ + supportedFunctions.add("COALESCE"); //$NON-NLS-1$ // supportedFunctions.add("NULLIF"); //$NON-NLS-1$ // supportedFunctions.add("GREATEST"); //$NON-NLS-1$ // supportedFunctions.add("LEAST"); //$NON-NLS-1$ Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/postgresql/PostgreSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLConversionVisitor.java 2009-02-16 21:35:28 UTC (r= ev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLConversionVisitor.java 2009-02-19 17:59:09 UTC (r= ev 476) @@ -1,123 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.postgresql; - -import java.sql.Date; -import java.sql.Time; -import java.sql.Timestamp; -import java.text.SimpleDateFormat; - -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.ILimit; - -/** - */ -class PostgreSQLConversionVisitor extends SQLConversionVisitor { - = - protected String translateLiteralBoolean(Boolean booleanValue) { - if(booleanValue.booleanValue()) { - return "TRUE"; //$NON-NLS-1$ - } - return "FALSE"; //$NON-NLS-1$ - } - - protected String translateLiteralDate(Date dateValue) { - return "DATE '" + dateValue.toString() + "'"; //$NON-NLS-1$//$NON-= NLS-2$ - } - - protected String translateLiteralTime(Time timeValue) { - return "TIME '" + timeValue.toString() + "'"; //$NON-NLS-1$//$NON-= NLS-2$ - } - - protected String translateLiteralTimestamp(Timestamp timestampValue) { - SimpleDateFormat timestampFormatter =3D new SimpleDateFormat("yyyy= -MM-dd HH:mm:ss"); //$NON-NLS-1$ - if (getDatabaseTimeZone() !=3D null) { - timestampFormatter.setTimeZone(getDatabaseTimeZone()); - } - int nanos =3D timestampValue.getNanos(); - int micros =3D nanos/1000; // truncate for microseconds - String microsStr =3D "" + (1000000 + micros); //$NON-NLS-1$ // Add= a number at the beginning, so that we can print leading zeros - = - return "to_timestamp('" + timestampFormatter.format(timestampValue= ) + "." + microsStr.substring(1) + "', 'YYYY-MM-DD HH24:MI:SS.UF')"; //$NON= -NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ - } - = - /** - * Postgres doesn't provide min/max(boolean), so this conversion write= s a min(booleanval) as = - * CASE MIN(CASE B.BooleanValue WHEN TRUE THEN 1 ELSE 0 END) WHEN 1 TH= EN TRUE ELSE FALSE END - * TODO: This conversion implementation does not handle null values in= the boolean column. - * @see com.metamatrix.connector.visitor.framework.LanguageObjectVisit= or#visit(com.metamatrix.connector.language.IAggregate) - * @since 4.3 - */ - public void visit(IAggregate obj) { - if ((obj.getName().equalsIgnoreCase("min") || obj.getName().equals= IgnoreCase("max")) //$NON-NLS-1$//$NON-NLS-2$ - && obj.getExpression().getType().equals(Boolean.cl= ass)) { - buffer.append(CASE) - .append(SPACE).append(obj.getName()) - // Inner case - .append(LPAREN).append(CASE) - .append(SPACE); - append(obj.getExpression()); - buffer.append(SPACE).append(WHEN) - .append(SPACE).append(TRUE) - .append(SPACE).append(THEN) - .append(SPACE).append(1) - .append(SPACE).append(ELSE) - .append(SPACE).append(0) - .append(SPACE).append(END) - .append(RPAREN) - = - .append(SPACE).append(WHEN) - .append(SPACE).append(1) - .append(SPACE).append(THEN) - .append(SPACE).append(TRUE) - .append(SPACE).append(ELSE) - .append(SPACE).append(FALSE) - .append(SPACE).append(END); - } else { - super.visit(obj); - } - } - - /** - * Convert limit clause to PostgreSQL ...[LIMIT rowlimit] [OFFSET offs= et] syntax - * @see com.metamatrix.connector.visitor.framework.LanguageObjectVisit= or#visit(com.metamatrix.connector.language.IQuery) - * @since 5.0 SP1 - */ - public void visit(ILimit obj) { - buffer.append(LIMIT) - .append(SPACE) - .append(obj.getRowLimit()); - = - if (obj.getRowOffset() > 0) { - if (obj.getRowLimit() > 0) { - buffer.append(SPACE); - } - buffer.append("OFFSET") //$NON-NLS-1$ - .append(SPACE) - .append(obj.getRowOffset()); - } - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/postgresql/PostgreSQLConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLConvertModifier.java 2009-02-16 21:35:28 UTC (rev= 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLConvertModifier.java 2009-02-19 17:59:09 UTC (rev= 476) @@ -34,6 +34,7 @@ import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.ICompareCriteria.Operator; = /** */ @@ -157,10 +158,10 @@ switch(srcCode) { = case BOOLEAN: // convert(booleanSrc, string) --> CASE WHEN booleanSrc TH= EN '1' ELSE '0' END - List when =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral(Boolean.TRUE, Boolean.class)}); + List when =3D Arrays.asList(langFactory.createCompareCrite= ria(Operator.EQ, function.getParameters()[0], langFactory.createLiteral(Boo= lean.TRUE, Boolean.class))); List then =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral("1", String.class)}); //$NON-NLS-1$ IExpression elseExpr =3D langFactory.createLiteral("0", St= ring.class); //$NON-NLS-1$ - return langFactory.createCaseExpression(function.getParame= ters()[0], when, then, elseExpr, String.class); + return langFactory.createSearchedCaseExpression(when, then= , elseExpr, String.class); case BYTE: case SHORT: case INTEGER: Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/postgresql/PostgreSQLResultsTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLResultsTranslator.java 2009-02-16 21:35:28 UTC (r= ev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLResultsTranslator.java 2009-02-19 17:59:09 UTC (r= ev 476) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.postgresql; - -import com.metamatrix.connector.jdbc.extension.impl.BasicResultsTranslator; - - -/** = - * @since 4.3 - */ -public class PostgreSQLResultsTranslator extends BasicResultsTranslator { - -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/postgresql/PostgreSQLSingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLSingleIdentityConnectionFactory.java 2009-02-16 2= 1:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLSingleIdentityConnectionFactory.java 2009-02-19 1= 7:59:09 UTC (rev 476) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.postgresql; - -import com.metamatrix.connector.jdbc.ConnectionQueryStrategy; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory; - - -/** = - * @since 4.3 - */ -public class PostgreSQLSingleIdentityConnectionFactory extends JDBCSingleI= dentityConnectionFactory { - private String queryTest =3D "Select 1"; //$NON-NLS-1$ - = - /** = - * @see com.metamatrix.connector.jdbc.JDBCSourceConnectionFactory#crea= teConnectionStrategy() - * @since 4.3 - */ - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/postgresql/PostgreSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -22,96 +22,125 @@ = package com.metamatrix.connector.jdbc.postgresql; = -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - +import java.sql.Date; +import java.sql.Time; +import java.sql.Timestamp; +import java.util.Calendar; + import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; -import com.metamatrix.connector.jdbc.oracle.MonthOrDayNameFunctionModifier; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.SourceSystemFunctions; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.jdbc.extension.SQLTranslator; +import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; +import com.metamatrix.connector.jdbc.oracle.LeftOrRightFunctionModifier; +import com.metamatrix.connector.jdbc.oracle.MonthOrDayNameFunctionModifier; +import com.metamatrix.connector.language.IAggregate; +import com.metamatrix.connector.language.ICommand; +import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.visitor.framework.HierarchyVisitor; +import com.metamatrix.connector.visitor.util.SQLReservedWords; = = /** = * @since 4.3 */ -public class PostgreSQLTranslator extends BasicSQLTranslator { +public class PostgreSQLTranslator extends SQLTranslator { = - private Map functionModifiers; - private Properties connectorProperties; - private ILanguageFactory languageFactory; - - public void initialize(ConnectorEnvironment env, - RuntimeMetadata metadata) throws ConnectorExcep= tion { + public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { = - super.initialize(env, metadata); - ConnectorEnvironment connEnv =3D getConnectorEnvironment(); - this.connectorProperties =3D connEnv.getProperties(); - this.languageFactory =3D connEnv.getLanguageFactory(); - initializeFunctionModifiers(); = - - } - - /** = - * @param modifier - * @since 4.2 - */ - private void initializeFunctionModifiers() { - functionModifiers =3D new HashMap(); - functionModifiers.putAll(super.getFunctionModifiers()); - functionModifiers.put("log", new AliasModifier("ln")); //$NON-NLS-= 1$ //$NON-NLS-2$ - functionModifiers.put("log10", new AliasModifier("log")); //$NON-N= LS-1$ //$NON-NLS-2$ + super.initialize(env); + registerFunctionModifier(SourceSystemFunctions.LOG, new AliasModif= ier("ln")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LOG10, new AliasMod= ifier("log")); //$NON-NLS-1$ //$NON-NLS-2$ = - functionModifiers.put("char", new AliasModifier("chr")); //$NON-NL= S-1$ //$NON-NLS-2$ - functionModifiers.put("concat", new AliasModifier("||")); //$NON-N= LS-1$ //$NON-NLS-2$ - functionModifiers.put("lcase", new AliasModifier("lower")); //$NON= -NLS-1$ //$NON-NLS-2$ - functionModifiers.put("left", new SubstringFunctionModifier(langua= geFactory, true));//$NON-NLS-1$ = - functionModifiers.put("right", new SubstringFunctionModifier(langu= ageFactory, false));//$NON-NLS-1$ = - functionModifiers.put("substring", new AliasModifier("substr")); /= /$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("ucase", new AliasModifier("upper")); //$NON= -NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.CHAR, new AliasModi= fier("chr")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.CONCAT, new AliasMo= difier("||")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LCASE, new AliasMod= ifier("lower")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LEFT, new LeftOrRig= htFunctionModifier(getLanguageFactory()));//$NON-NLS-1$ = + registerFunctionModifier(SourceSystemFunctions.RIGHT, new LeftOrRi= ghtFunctionModifier(getLanguageFactory()));//$NON-NLS-1$ = + registerFunctionModifier(SourceSystemFunctions.SUBSTRING, new Alia= sModifier("substr")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.UCASE, new AliasMod= ifier("upper")); //$NON-NLS-1$ //$NON-NLS-2$ = - functionModifiers.put("dayname", new MonthOrDayNameFunctionModifie= r(languageFactory, "Day"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("dayofweek", new ModifiedDatePartFunctionMod= ifier(languageFactory, "dow", "+", new Integer(1)));//$NON-NLS-1$ //$NON-NL= S-2$ //$NON-NLS-3$ - functionModifiers.put("dayofmonth", new DatePartFunctionModifier(l= anguageFactory, "day"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("dayofyear", new DatePartFunctionModifier(la= nguageFactory, "doy"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("hour", new DatePartFunctionModifier(languag= eFactory, "hour"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("minute", new DatePartFunctionModifier(langu= ageFactory, "minute"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("month", new DatePartFunctionModifier(langua= geFactory, "month"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("monthname", new MonthOrDayNameFunctionModif= ier(languageFactory, "Month"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("quarter", new DatePartFunctionModifier(lang= uageFactory, "quarter"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("second", new DatePartFunctionModifier(langu= ageFactory, "second"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("week", new DatePartFunctionModifier(languag= eFactory, "week"));//$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("year", new DatePartFunctionModifier(languag= eFactory, "year"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYNAME, new MonthO= rDayNameFunctionModifier(getLanguageFactory(), "Day"));//$NON-NLS-1$ //$NON= -NLS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYOFWEEK, new Modi= fiedDatePartFunctionModifier(getLanguageFactory(), "dow", "+", new Integer(= 1)));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new Dat= ePartFunctionModifier(getLanguageFactory(), "day"));//$NON-NLS-1$ //$NON-NL= S-2$ + registerFunctionModifier(SourceSystemFunctions.DAYOFYEAR, new Date= PartFunctionModifier(getLanguageFactory(), "doy"));//$NON-NLS-1$ //$NON-NLS= -2$ + registerFunctionModifier(SourceSystemFunctions.HOUR, new DatePartF= unctionModifier(getLanguageFactory(), "hour"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.MINUTE, new DatePar= tFunctionModifier(getLanguageFactory(), "minute"));//$NON-NLS-1$ //$NON-NLS= -2$ + registerFunctionModifier(SourceSystemFunctions.MONTH, new DatePart= FunctionModifier(getLanguageFactory(), "month"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.MONTHNAME, new Mont= hOrDayNameFunctionModifier(getLanguageFactory(), "Month"));//$NON-NLS-1$ //= $NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.QUARTER, new DatePa= rtFunctionModifier(getLanguageFactory(), "quarter"));//$NON-NLS-1$ //$NON-N= LS-2$ + registerFunctionModifier(SourceSystemFunctions.SECOND, new DatePar= tFunctionModifier(getLanguageFactory(), "second"));//$NON-NLS-1$ //$NON-NLS= -2$ + registerFunctionModifier(SourceSystemFunctions.WEEK, new DatePartF= unctionModifier(getLanguageFactory(), "week"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.YEAR, new DatePartF= unctionModifier(getLanguageFactory(), "year"));//$NON-NLS-1$ //$NON-NLS-2$ = - functionModifiers.put("ifnull", new AliasModifier("coalesce")); //= $NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("nvl", new AliasModifier("coalesce")); //$NO= N-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("convert", new PostgreSQLConvertModifier(lan= guageFactory)); //$NON-NLS-1$ - functionModifiers.put("cast", new PostgreSQLConvertModifier(langua= geFactory)); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.IFNULL, new AliasMo= difier("coalesce")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.CONVERT, new Postgr= eSQLConvertModifier(getLanguageFactory())); //$NON-NLS-1$ } = - = + = + @Override + public String translateLiteralBoolean(Boolean booleanValue) { + if(booleanValue.booleanValue()) { + return "TRUE"; //$NON-NLS-1$ + } + return "FALSE"; //$NON-NLS-1$ + } + + @Override + public String translateLiteralDate(Date dateValue, Calendar cal) { + return "DATE '" + formatDateValue(dateValue, cal) + "'"; //$NON-NL= S-1$//$NON-NLS-2$ + } + + @Override + public String translateLiteralTime(Time timeValue, Calendar cal) { + return "TIME '" + formatDateValue(timeValue, cal) + "'"; //$NON-NL= S-1$//$NON-NLS-2$ + } + = + @Override + public String translateLiteralTimestamp(Timestamp timestampValue, Cale= ndar cal) { + return "to_timestamp('" + formatDateValue(timestampValue, cal) + "= ', 'YYYY-MM-DD HH24:MI:SS.US')"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + } + = + @Override + public int getTimestampNanoSecondPrecision() { + return 6; + } + = + @Override + public String addLimitString(String queryCommand, ILimit limit) { + StringBuffer sb =3D new StringBuffer(queryCommand); + sb.append(" LIMIT ").append(limit.getRowLimit()); + if (limit.getRowOffset() > 0) { + sb.append(" OFFSET ").append(limit.getRowOffset()); + } + return sb.toString(); + } + + /** + * Postgres doesn't provide min/max(boolean), so this conversion write= s a min(BooleanValue) as = + * bool_and(BooleanValue) + * @see com.metamatrix.connector.visitor.framework.LanguageObjectVisit= or#visit(com.metamatrix.connector.language.IAggregate) + * @since 4.3 + */ + @Override + public ICommand modifyCommand(ICommand command, ExecutionContext conte= xt) + throws ConnectorException { + HierarchyVisitor visitor =3D new HierarchyVisitor() { + @Override + public void visit(IAggregate obj) { + if (TypeFacility.RUNTIME_TYPES.BOOLEAN.equals(obj.getExpre= ssion().getType())) { + if (obj.getName().equalsIgnoreCase(SQLReservedWords.MIN))= { + obj.setName("bool_and"); //$NON-NLS-1$ + } else if (obj.getName().equalsIgnoreCase(SQLReservedWord= s.MAX)) { + obj.setName("bool_or"); //$NON-NLS-1$ + } + } + } + }; + = + command.acceptVisitor(visitor); + return command; + } = - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getTrans= lationVisitor() - */ - public SQLConversionVisitor getTranslationVisitor() { - SQLConversionVisitor visitor =3D new PostgreSQLConversionVisitor(); - visitor.setRuntimeMetadata(getRuntimeMetadata()); - visitor.setFunctionModifiers(functionModifiers); - visitor.setProperties(connectorProperties); - visitor.setLanguageFactory(languageFactory); - visitor.setDatabaseTimeZone(getDatabaseTimeZone()); - return visitor; - } = - = - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getFunct= ionModifiers() - */ - public Map getFunctionModifiers() { - return functionModifiers; - } - } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/postgresql/PostgreSQLUserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLUserIdentityConnectionFactory.java 2009-02-16 21:= 35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLUserIdentityConnectionFactory.java 2009-02-19 17:= 59:09 UTC (rev 476) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.postgresql; - -import com.metamatrix.connector.jdbc.ConnectionQueryStrategy; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCUserIdentityConnectionFactory; - - -/** = - * @since 4.3 - */ -public class PostgreSQLUserIdentityConnectionFactory extends JDBCUserIdent= ityConnectionFactory { - private String queryTest =3D "Select 1"; //$NON-NLS-1$ - = - /** = - * @see com.metamatrix.connector.jdbc.JDBCSourceConnectionFactory#crea= teConnectionStrategy() - * @since 4.3 - */ - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/postgresql/SubstringFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/SubstringFunctionModifier.java 2009-02-16 21:35:28 UTC (rev= 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/SubstringFunctionModifier.java 2009-02-19 17:59:09 UTC (rev= 476) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.postgresql; - -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.language.*; - -/** - * Convert left(string, count) --> substr(string, 0, count) - * or right(string, count) --> substr(string, length(string) - count) - */ -class SubstringFunctionModifier extends BasicFunctionModifier implements F= unctionModifier { - private ILanguageFactory langFactory; - private boolean isLeft; - = - SubstringFunctionModifier(ILanguageFactory langFactory, boolean isLeft= ) { - this.langFactory =3D langFactory; - this.isLeft =3D isLeft; - } - = - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) - */ - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - IFunction func =3D null; - = - if (isLeft) { - func =3D langFactory.createFunction("substr", //$NON-NLS-1$ - new IExpression[] { - args[0], = - langFactory.createLiteral(new Integer(1), Integer.clas= s), - args[1]}, - String.class); = - } else { - IFunction inner =3D langFactory.createFunction("LENGTH", //$N= ON-NLS-1$ - new IExpression[] {args[0]}, - Integer.class); - = - IExpression addOne =3D langFactory.createFunction("+", new IEx= pression[] {inner, langFactory.createLiteral(new Integer(1), Integer.class)= }, Integer.class); //$NON-NLS-1$ - IExpression substrArgs =3D langFactory.createFunction("-", //= $NON-NLS-1$ - new IExpression[] {addOne, args[1] }, = - Integer.class); = - = - func =3D langFactory.createFunction("substr", //$NON-NLS-1$ - new IExpression[] { - args[0], = - substrArgs}, - String.class); = - } - - return func; = - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/sqlserver/SqlServerCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerCapabilities.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerCapabilities.java 2009-02-19 17:59:09 UTC (rev 476) @@ -77,7 +77,7 @@ supportedFunctions.add("LOWER"); //$NON-NLS-1$ //supportedFunctons.add("LPAD"); //$NON-NLS-1$ supportedFunctions.add("LTRIM"); //$NON-NLS-1$ - //supportedFunctons.add("REPEAT"); //$NON-NLS-1$ + supportedFunctions.add("REPEAT"); //$NON-NLS-1$ //supportedFunctions.add("RAND"); //$NON-NLS-1$ supportedFunctions.add("REPLACE"); //$NON-NLS-1$ supportedFunctions.add("RIGHT"); //$NON-NLS-1$ Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/sqlserver/SqlServerConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerConvertModifier.java 2009-02-16 21:35:28 UTC (rev 4= 75) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerConvertModifier.java 2009-02-19 17:59:09 UTC (rev 4= 76) @@ -1,516 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.sqlserver; - -import java.util.ArrayList; -import java.util.List; - -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; -import com.metamatrix.connector.language.*; - -/** - * Sql Server based Convert modifier, taken from Sybase, so far they are s= ame - * classes. - */ -public class SqlServerConvertModifier extends BasicFunctionModifier implem= ents FunctionModifier { - - private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); - static { - // index of expressions in convert functions in SQL Server is one,= not zero - DROP_MODIFIER.setReplaceIndex(1); - } - - private ILanguageFactory langFactory; - = - public SqlServerConvertModifier(ILanguageFactory langFactory) { - this.langFactory =3D langFactory; - } - - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - IExpression modified =3D null; - = - if (args[1] !=3D null && args[1] instanceof ILiteral) { - String target =3D ((String)((ILiteral)args[1]).getValue()).toL= owerCase(); - if (target.equals("string")) { //$NON-NLS-1$ = - modified =3D convertToString(function); - } else if (target.equals("short")) { //$NON-NLS-1$ = - modified =3D convertToShort(function); - } else if (target.equals("integer")) { //$NON-NLS-1$ = - modified =3D convertToInteger(function); - } else if (target.equals("long")) { //$NON-NLS-1$ = - modified =3D convertToLong(function); - } else if (target.equals("biginteger")) { //$NON-NLS-1$ = - modified =3D convertToBigInteger(function); - } else if (target.equals("float")) { //$NON-NLS-1$ = - modified =3D convertToFloat(function); - } else if (target.equals("double")) { //$NON-NLS-1$ = - modified =3D convertToDouble(function); - } else if (target.equals("bigdecimal")) { //$NON-NLS-1$ = - modified =3D convertToBigDecimal(function); - } else if (target.equals("date")) { //$NON-NLS-1$ = - modified =3D convertToDate(function); - } else if (target.equals("time")) { //$NON-NLS-1$ = - modified =3D convertToTime(function); - } else if (target.equals("timestamp")) { //$NON-NLS-1$ = - modified =3D convertToTimestamp(function); - } else if (target.equals("char")) { //$NON-NLS-1$ = - modified =3D convertToChar(function); - } else if (target.equals("boolean")) { //$NON-NLS-1$ = - modified =3D convertToBoolean(function); - } else if (target.equals("byte")) { //$NON-NLS-1$ = - modified =3D convertToByte(function); - } else { - modified =3D DROP_MODIFIER.modify(function); = - } - return modified; - = - } - return DROP_MODIFIER.modify(function); = - } - = - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#trans= late(com.metamatrix.data.language.IFunction) - */ - public List translate(IFunction function) { = - List parts =3D new ArrayList(); - parts.add("convert("); //$NON-NLS-1$ - = - IExpression[] args =3D function.getParameters(); - = - if(args !=3D null && args.length > 0) { - ILiteral type =3D (ILiteral) args[0]; - String typeStr =3D type.getValue().toString(); - = - parts.add(typeStr); - = - for(int i=3D1; i convert(varchar, date,= 112) = - //TODO: what is the best format 111/110/101? - convert =3D createFunction(args[0], 101, String.class); - break; - case TIME: // convert(time, string) --> convert(varchar, time,= 108) - convert =3D createFunction(args[0], 108, String.class); = = - break; - case TIMESTAMP: // convert(time, string) --> convert(varchar,= timestamp, 109) = - convert =3D createFunction(args[0], 109, String.class); = = - break; - default: - convert =3D DROP_MODIFIER.modify(function); - break; - } - = - return convert; - } - - private IExpression convertToShort(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: - case BOOLEAN: = - case BYTE: = - case INTEGER: - case LONG: - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - convert =3D createFunction(args[0], "smallint", Short.clas= s); //$NON-NLS-1$ - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToInteger(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: = - case BOOLEAN: = - case BYTE: - case SHORT: - case LONG: - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - convert =3D createFunction(args[0], "int", Integer.class);= //$NON-NLS-1$ - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToLong(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: - case BOOLEAN: - case BYTE: - case SHORT: - case INTEGER: = - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - convert =3D createFunction(args[0], "numeric", Long.class)= ; //$NON-NLS-1$ - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToBigInteger(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: - case BOOLEAN: - case BYTE: - case SHORT: - case INTEGER: - case LONG: = - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - convert =3D createFunction(args[0], "numeric", java.math.B= igInteger.class); //$NON-NLS-1$ - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - - private IExpression convertToFloat(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: - case BOOLEAN: = - case BYTE: - case SHORT: - case INTEGER: - case LONG: = - case BIGINTEGER: = - case DOUBLE: = - case BIGDECIMAL: - convert =3D createFunction(args[0], "real", Float.class); = //$NON-NLS-1$ - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } = - = - private IExpression convertToDouble(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: - case BOOLEAN: = - case BYTE: - case SHORT: - case INTEGER: - case LONG: = - case BIGINTEGER: = - case FLOAT: = - case BIGDECIMAL: = - convert =3D createFunction(args[0], "float", Double.class)= ; //$NON-NLS-1$ - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToBigDecimal(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: - case BOOLEAN: = - case BYTE: - case SHORT: - case INTEGER: - case LONG: = - case BIGINTEGER: = - case FLOAT: = - case DOUBLE: - convert =3D createFunction(args[0], "float", java.math.Big= Decimal.class); //$NON-NLS-1$ - break; = - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToChar(IFunction function) { - IExpression[] args =3D function.getParameters(); - return createFunction(args[0], "char", Character.class); //$NON-NL= S-1$ - } = - = - private IExpression convertToDate(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); - int srcCode =3D getSrcCode(srcType); - - switch(srcCode) { - case STRING: - // convert(STRING, date) --> convert(datetime, STRING) - convert =3D createFunction(args[0], "datetime", java.sql.D= ate.class); //$NON-NLS-1$ - break; - case TIMESTAMP: - // convert(TIMESTAMP, date) --> convert(datetime, convert(= varchar, TIMESTAMP, 1/101)) - // Build inner convert - IFunction innerConvert =3D langFactory.createFunction("con= vert", //$NON-NLS-1$ - new IExpression[] { = - langFactory.createLiteral("varchar", String.class)= , //$NON-NLS-1$ - args[0], - langFactory.createLiteral(new Integer(109), Intege= r.class) }, - String.class); - = - // Build outer convert - convert =3D langFactory.createFunction("convert", //$NON-= NLS-1$ - new IExpression[] { = - langFactory.createLiteral("datetime", String.class= ), //$NON-NLS-1$ - innerConvert }, - java.sql.Timestamp.class); - = - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - - private IExpression convertToTime(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); - = - int srcCode =3D getSrcCode(srcType); - switch(srcCode) { - case STRING: - //convert(STRING, time) --> convert(datetime, STRING) - convert =3D createFunction(args[0], "datetime", java.sql.T= ime.class); //$NON-NLS-1$ - break; = = - case TIMESTAMP: - // convert(TIMESTAMP, time) --> convert(datetime, convert(= varchar, TIMESTAMP, 108/8) = - // Build inner convert - IFunction innerConvert =3D langFactory.createFunction("con= vert", //$NON-NLS-1$ - new IExpression[] { = - langFactory.createLiteral("varchar", String.class)= , //$NON-NLS-1$ - args[0], - langFactory.createLiteral(new Integer(108), Intege= r.class) }, - String.class); - = - // Build outer convert - convert =3D langFactory.createFunction("convert", //$NON-= NLS-1$ - new IExpression[] { = - langFactory.createLiteral("datetime", String.class= ), //$NON-NLS-1$ - innerConvert }, - java.sql.Time.class); - = - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } = - = - private IExpression convertToTimestamp(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); - int srcCode =3D getSrcCode(srcType); - switch(srcCode) { - case STRING: - case TIME: = - case DATE: - // convert(DATE/TIME/STRING, timestamp) --> convert(dateti= me, DATE) - convert =3D createFunction(args[0], "datetime", java.sql.T= imestamp.class); //$NON-NLS-1$ = - break; = - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IFunction createFunction(IExpression args0, String targetType,= Class targetClass) { - IFunction created =3D langFactory.createFunction("convert", //$NON= -NLS-1$ - new IExpression[] { - langFactory.createLiteral(targetType, String.class), - args0}, = - targetClass); - return created; = - } - = - private IFunction createFunction(IExpression args0, int formatNumber, = Class targetClass) { - IFunction created =3D langFactory.createFunction("convert", //$NO= N-NLS-1$ - new IExpression[] { langFactory.createLiteral("varchar", Strin= g.class), //$NON-NLS-1$ = - args0, - langFactory.createLiteral(new Integer(formatNumber), Integ= er.class) }, = - targetClass); - return created; = - } - = - private int getSrcCode(Class source) { - return ((Integer) typeMap.get(source)).intValue(); - } - -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/sqlserver/SqlServerModModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerModModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerModModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,64 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.sqlserver; - -import com.metamatrix.connector.api.TypeFacility.RUNTIME_TYPES; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; - -public class SqlServerModModifier extends AliasModifier { - - private ILanguageFactory langFactory; - = - public SqlServerModModifier(ILanguageFactory langFactory) { - super("%"); //$NON-NLS-1$ - this.langFactory =3D langFactory; - } - = - @Override - public IExpression modify(IFunction function) { - IExpression[] expressions =3D function.getParameters(); - if (RUNTIME_TYPES.INTEGER.equals(expressions[0].getType())) { - return super.modify(function); - } - //x % y =3D> x - floor(x / y) * y - IExpression[] divideArgs =3D new IExpression[2]; - System.arraycopy(expressions, 0, divideArgs, 0, 2); - IFunction divide =3D langFactory.createFunction("/", divideArgs, divideA= rgs[0].getType()); //$NON-NLS-1$ - = - IFunction floor =3D langFactory.createFunction("floor", new IExpression[= ] {divide}, divide.getType()); //$NON-NLS-1$ - = - IExpression[] multArgs =3D new IExpression[] { - floor, expressions[1] - }; - IFunction mult =3D langFactory.createFunction("*", multArgs, multArgs[1]= .getType()); //$NON-NLS-1$ - = - IExpression[] minusArgs =3D new IExpression[] { - expressions[0], mult - }; - return langFactory.createFunction("-", minusArgs, minusArgs[0].getType()= ); //$NON-NLS-1$ - } - -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/sqlserver/SqlServerResultsTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerResultsTranslator.java 2009-02-16 21:35:28 UTC (rev= 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerResultsTranslator.java 2009-02-19 17:59:09 UTC (rev= 476) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.sqlserver; - -import com.metamatrix.connector.jdbc.extension.impl.BasicResultsTranslator; - - -public class SqlServerResultsTranslator extends BasicResultsTranslator { - = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/sqlserver/SqlServerSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerSQLConversionVisitor.java 2009-02-16 21:35:28 UTC (= rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerSQLConversionVisitor.java 2009-02-19 17:59:09 UTC (= rev 476) @@ -1,117 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.sqlserver; - -import java.sql.Time; - -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.language.*; - -/** - */ -public class SqlServerSQLConversionVisitor extends SQLConversionVisitor { - - private final int MAX_SELECT_ALIAS_LENGTH =3D 30; - = - private final int MAX_TABLE_ALIAS_LENGTH =3D 128; - = - private int limit =3D 0; - /** - * Override to handle % operator. - */ - public void visit(IFunction obj) { - if(obj.getName().equals("%")) { //$NON-NLS-1$ - String name =3D obj.getName(); - IExpression[] args =3D obj.getParameters(); - - buffer.append(LPAREN); = - = - if(args !=3D null) { - for(int i=3D0; i 0) { - buffer.append("TOP") //$NON-NLS-1$ - .append(SPACE) - .append(limit) - .append(SPACE); - limit =3D 0; - } - if (obj.isDistinct()) { - buffer.append(DISTINCT).append(SPACE); - } - append(obj.getSelectSymbols()); - } - - /* = - * @see com.metamatrix.connector.jdbc.extension.SQLConversionVisitor#t= ranslateLiteralTime(java.sql.Time) - */ - protected String translateLiteralTime(Time timeValue) { - return "{ts'1900-01-01 " + formatDateValue(timeValue) + "'}"; //$N= ON-NLS-1$ //$NON-NLS-2$ - } - = - /** = - * @see com.metamatrix.connector.jdbc.extension.SQLConversionVisitor#g= etMaxSelectAliasLength() - * @since 4.3 - */ - protected int getMaxSelectAliasLength() { - return MAX_SELECT_ALIAS_LENGTH; - } - - /** = - * @see com.metamatrix.connector.jdbc.extension.SQLConversionVisitor#g= etMaxTableAliasLength() - * @since 4.3 - */ - protected int getMaxTableAliasLength() { - return MAX_TABLE_ALIAS_LENGTH; - } = -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/sqlserver/SqlServerSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerSQLTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerSQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -24,75 +24,32 @@ */ package com.metamatrix.connector.jdbc.sqlserver; = -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; -import com.metamatrix.connector.jdbc.extension.impl.SubstringFunctionModif= ier; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.api.SourceSystemFunctions; +import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; +import com.metamatrix.connector.jdbc.sybase.SybaseSQLTranslator; +import com.metamatrix.connector.language.ILimit; = /** */ -public class SqlServerSQLTranslator extends BasicSQLTranslator { +public class SqlServerSQLTranslator extends SybaseSQLTranslator { = - private Map functionModifiers; - private Properties connectorProperties; - private ILanguageFactory languageFactory; + public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { + super.initialize(env); + //FEDERATE-168 remove mod modifier for SQL Server 2008 + registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new Ali= asModifier("day")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.REPEAT, new AliasMo= difier("replicate")); //$NON-NLS-1$ //$NON-NLS-2$ + } + = + @Override + public String getLengthFunctionName() { + return "len"; //$NON-NLS-1$ + } + = + @Override + public String addLimitString(String queryCommand, ILimit limit) { + return "SELECT TOP " + limit.getRowLimit() + " * FROM (" + queryComma= nd + ") AS X"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } = - public void initialize(ConnectorEnvironment env, - RuntimeMetadata metadata) throws ConnectorExcep= tion { - = - super.initialize(env, metadata); - ConnectorEnvironment connEnv =3D getConnectorEnvironment(); - this.connectorProperties =3D connEnv.getProperties(); - this.languageFactory =3D connEnv.getLanguageFactory(); - initializeFunctionModifiers(); = - } - - private void initializeFunctionModifiers() { - functionModifiers =3D new HashMap(); - functionModifiers.putAll(super.getFunctionModifiers()); - //FEDERATE-168 this is not necessary for SQL Server 2008 - functionModifiers.put("mod", new SqlServerModModifier(languageFact= ory)); //$NON-NLS-1$ - functionModifiers.put("chr", new AliasModifier("char")); //$NON-NL= S-1$ //$NON-NLS-2$ - functionModifiers.put("concat", new AliasModifier("+")); //$NON-NL= S-1$ //$NON-NLS-2$ - functionModifiers.put("||", new AliasModifier("+")); //$NON-NLS-1$= //$NON-NLS-2$ - functionModifiers.put("ifnull", new AliasModifier("isnull")); //$N= ON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("nvl", new AliasModifier("isnull")); //$NON-= NLS-1$ //$NON-NLS-2$ - functionModifiers.put("lcase", new AliasModifier("lower")); //$NON= -NLS-1$ //$NON-NLS-2$ - functionModifiers.put("length", new AliasModifier("len")); //$NON-= NLS-1$ //$NON-NLS-2$ - functionModifiers.put("dayofmonth", new AliasModifier("day")); //$= NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("ucase", new AliasModifier("upper")); //$NON= -NLS-1$ //$NON-NLS-2$ - functionModifiers.put("substring", new SubstringFunctionModifier(l= anguageFactory, "substring", "len")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NL= S-3$ - functionModifiers.put("cast", new SqlServerConvertModifier(languag= eFactory)); //$NON-NLS-1$ = - functionModifiers.put("convert", new SqlServerConvertModifier(lang= uageFactory)); //$NON-NLS-1$ = - } - - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getFunct= ionModifiers() - */ - public Map getFunctionModifiers() { - return functionModifiers; - } - = - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getTrans= lationVisitor() - */ - public SQLConversionVisitor getTranslationVisitor() { - SQLConversionVisitor visitor =3D new SqlServerSQLConversionVisitor= (); - visitor.setRuntimeMetadata(getRuntimeMetadata()); - visitor.setFunctionModifiers(functionModifiers); - visitor.setProperties(connectorProperties); - visitor.setLanguageFactory(languageFactory); - visitor.setDatabaseTimeZone(getDatabaseTimeZone()); - return visitor; - } - = - = } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/sqlserver/SqlServerSingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerSingleIdentityConnectionFactory.java 2009-02-16 21:= 35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerSingleIdentityConnectionFactory.java 2009-02-19 17:= 59:09 UTC (rev 476) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.sqlserver; - -import com.metamatrix.connector.jdbc.*; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory; - -public class SqlServerSingleIdentityConnectionFactory extends JDBCSingleId= entityConnectionFactory{ - private String queryTest =3D "Select 'x'"; //$NON-NLS-1$ - = - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } - = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/sqlserver/SqlServerUserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerUserIdentityConnectionFactory.java 2009-02-16 21:35= :28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerUserIdentityConnectionFactory.java 2009-02-19 17:59= :09 UTC (rev 476) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.sqlserver; - -import com.metamatrix.connector.jdbc.*; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCUserIdentityConnectionFactory; - -public class SqlServerUserIdentityConnectionFactory extends JDBCUserIdenti= tyConnectionFactory{ - private String queryTest =3D "Select 'x'"; //$NON-NLS-1$ - = - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } - -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/ssl/JDBCSequeLinkSingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ssl/JDBCSequeLinkSingleIdentityConnectionFactory.java 2009-02-16 21:35= :28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ssl/JDBCSequeLinkSingleIdentityConnectionFactory.java 2009-02-19 17:59= :09 UTC (rev 476) @@ -92,6 +92,6 @@ throw new ConnectorException(e); } = - return new JDBCSourceConnection(connection, getConnectorEnvironmen= t(), createConnectionStrategy(), getConnectionListener()); + return new JDBCSourceConnection(connection, getConnectorEnvironmen= t(), createConnectionStrategy(), getConnectionListener(), getResultsTransla= tor(), getSqlTranslator()); } } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/sybase/FormatTimestampModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/FormatTimestampModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/FormatTimestampModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,98 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.sybase; - -import java.util.*; - -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.language.*; - -/** - */ -public class FormatTimestampModifier extends BasicFunctionModifier impleme= nts FunctionModifier { - - private Map styleMappings; - private ILanguageFactory langFactory; - = - public FormatTimestampModifier(ILanguageFactory langFactory) { - this.langFactory =3D langFactory; - loadStyleMappings(); - } - - private void loadStyleMappings() { - styleMappings =3D new HashMap(); - styleMappings.put("yyyy-MM-dd", new Integer(1)); // standard SQ= L format //$NON-NLS-1$ - styleMappings.put("MM/dd/yyyy", new Integer(1)); //$NON-NLS-1$ - styleMappings.put("yy/MM/dd", new Integer(2)); //$NON-NLS-1$ - styleMappings.put("dd/MM/yy", new Integer(3)); //$NON-NLS-1$ - styleMappings.put("dd.mm.yy", new Integer(4)); //$NON-NLS-1$ - styleMappings.put("dd-mm-yy", new Integer(5)); //$NON-NLS-1$ - styleMappings.put("dd mm yy", new Integer(6)); //$NON-NLS-1$ - styleMappings.put("MMM dd, yy", new Integer(7)); //$NON-NLS-1$ - styleMappings.put("HH:mm:ss", new Integer(8)); //$NON-NLS-1$ - styleMappings.put("MM dd yy hh:mm:ss:zzza", new Integer(9)); //$NO= N-NLS-1$ - styleMappings.put("MM-dd-yy", new Integer(10)); //$NON-NLS-1$ - styleMappings.put("yy/MM/dd", new Integer(11)); //$NON-NLS-1$ - styleMappings.put("yyMMdd", new Integer(12)); //$NON-NLS-1$ - styleMappings.put("yy/dd/MM", new Integer(13)); //$NON-NLS-1$ - styleMappings.put("MM/yy/dd", new Integer(14)); //$NON-NLS-1$ - styleMappings.put("dd/yy/MM", new Integer(15)); //$NON-NLS-1$ - styleMappings.put("MMM dd yy HH:mm:ss", new Integer(16)); //$NON-N= LS-1$ - styleMappings.put("hh:mma", new Integer(17)); //$NON-NLS-1$ - styleMappings.put("HH:mm", new Integer(18)); //$NON-NLS-1$ - styleMappings.put("hh:mm:ss:zzza", new Integer(19)); //$NON-NLS-1$ - styleMappings.put("HH:mm:ss:zzz", new Integer(20)); //$NON-NLS-1$ - } - - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) - */ - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - = - String format =3D (String) ((ILiteral)args[1]).getValue(); - - Integer styleCode =3D (Integer) styleMappings.get(format); - IFunction func =3D null; - if(styleCode !=3D null) { = - func =3D langFactory.createFunction("convert", //$NON-NLS-1$ - new IExpression[] { = - langFactory.createLiteral("varchar", String.class),//$= NON-NLS-1$ - args[0], - langFactory.createLiteral(styleCode, Integer.class) = = - }, - String.class); - = - } else { - func =3D langFactory.createFunction("convert", //$NON-NLS-1$ - new IExpression[] { = - langFactory.createLiteral("varchar", String.class),//$= NON-NLS-1$ - args[0] = - }, - String.class); - } - return func; - } - -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/sybase/ModFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/ModFunctionModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/ModFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,59 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.sybase; - -import java.util.ArrayList; -import java.util.List; - -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; - -/** - */ -public class ModFunctionModifier implements FunctionModifier { - - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) - */ - public IExpression modify(IFunction function) { - return function; - } - - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#trans= late(com.metamatrix.data.language.IFunction) - */ - public List translate(IFunction function) { - List parts =3D new ArrayList(); - parts.add("(");//$NON-NLS-1$ - = - IExpression[] args =3D function.getParameters(); - parts.add(args[0]); - parts.add(" % "); //$NON-NLS-1$ - parts.add(args[1]); - parts.add(")"); //$NON-NLS-1$ - = - return parts; - } - -} Copied: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connec= tor/jdbc/sybase/ModFunctionModifier.java (from rev 472, trunk/connectors/co= nnector-jdbc/src/main/java/com/metamatrix/connector/jdbc/sqlserver/SqlServe= rModModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/ModFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/ModFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.connector.jdbc.sybase; + +import java.util.List; + +import com.metamatrix.connector.api.TypeFacility.RUNTIME_TYPES; +import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; + +public class ModFunctionModifier extends AliasModifier { + + private ILanguageFactory langFactory; + = + public ModFunctionModifier(ILanguageFactory langFactory) { + super("%"); //$NON-NLS-1$ + this.langFactory =3D langFactory; + } + = + @Override + public IExpression modify(IFunction function) { + IExpression[] expressions =3D function.getParameters(); + if (RUNTIME_TYPES.INTEGER.equals(expressions[0].getType())) { + return super.modify(function); + } + //x % y =3D> x - floor(x / y) * y + IExpression[] divideArgs =3D new IExpression[2]; + System.arraycopy(expressions, 0, divideArgs, 0, 2); + IFunction divide =3D langFactory.createFunction("/", divideArgs, divideA= rgs[0].getType()); //$NON-NLS-1$ + = + IFunction floor =3D langFactory.createFunction("floor", new IExpression[= ] {divide}, divide.getType()); //$NON-NLS-1$ + = + IExpression[] multArgs =3D new IExpression[] { + floor, expressions[1] + }; + IFunction mult =3D langFactory.createFunction("*", multArgs, multArgs[1]= .getType()); //$NON-NLS-1$ + = + IExpression[] minusArgs =3D new IExpression[] { + expressions[0], mult + }; + return langFactory.createFunction("-", minusArgs, minusArgs[0].getType()= ); //$NON-NLS-1$ + } + = + @Override + public List translate(IFunction function) { + return null; + } + +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/com/meta= matrix/connector/jdbc/sybase/ModFunctionModifier.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/sybase/SybaseConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseConvertModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseConvertModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -408,7 +408,7 @@ new IExpression[] { = langFactory.createLiteral("varchar", String.class)= , //$NON-NLS-1$ args[0], - langFactory.createLiteral(new Integer(1), Integer.= class) }, + langFactory.createLiteral(new Integer(109), Intege= r.class) }, String.class); = // Build outer convert Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/sybase/SybaseResultsTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseResultsTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseResultsTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.sybase; - -import com.metamatrix.connector.jdbc.extension.impl.BasicResultsTranslator; - -/** - */ -public class SybaseResultsTranslator extends BasicResultsTranslator { - -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/sybase/SybaseSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseSQLConversionVisitor.java 2009-02-16 21:35:28 UTC (rev 47= 5) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseSQLConversionVisitor.java 2009-02-19 17:59:09 UTC (rev 47= 6) @@ -1,59 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.sybase; - -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; - -/** - */ -public class SybaseSQLConversionVisitor extends SQLConversionVisitor { - - private static final int MAX_SELECT_ALIAS_LENGTH =3D 30; - = - private static final int MAX_TABLE_ALIAS_LENGTH =3D 30; - = - /* = - * @see com.metamatrix.data.visitor.util.SQLStringVisitor#useAsInGroup= Alias() - */ - protected boolean useAsInGroupAlias() { - return false; - } - = - /** = - * @see com.metamatrix.connector.jdbc.extension.SQLConversionVisitor#g= etMaxSelectAliasLength() - * @since 4.3 - */ - protected int getMaxSelectAliasLength() { - return MAX_SELECT_ALIAS_LENGTH; - } - - /** = - * @see com.metamatrix.connector.jdbc.extension.SQLConversionVisitor#g= etMaxTableAliasLength() - * @since 4.3 - */ - protected int getMaxTableAliasLength() { - return MAX_TABLE_ALIAS_LENGTH; - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/sybase/SybaseSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseSQLTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseSQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -24,76 +24,44 @@ */ package com.metamatrix.connector.jdbc.sybase; = -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicSQLTranslator; -import com.metamatrix.connector.jdbc.extension.impl.SubstringFunctionModif= ier; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.api.SourceSystemFunctions; +import com.metamatrix.connector.jdbc.extension.SQLTranslator; +import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; +import com.metamatrix.connector.jdbc.extension.impl.SubstringFunctionModif= ier; = /** */ -public class SybaseSQLTranslator extends BasicSQLTranslator { +public class SybaseSQLTranslator extends SQLTranslator { = - private Map functionModifiers; - private Properties connectorProperties; - private ILanguageFactory languageFactory; - - public SybaseSQLTranslator() { - } - = /* = * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#initiali= ze(com.metamatrix.data.api.ConnectorEnvironment, com.metamatrix.data.metada= ta.runtime.RuntimeMetadata) */ - public void initialize(ConnectorEnvironment env, RuntimeMetadata metad= ata) throws ConnectorException { - super.initialize(env, metadata); - connectorProperties =3D getConnectorEnvironment().getProperties(); - languageFactory =3D getConnectorEnvironment().getLanguageFactory(); - initializeFunctionModifiers(); - } = - - private void initializeFunctionModifiers() { - functionModifiers =3D new HashMap(); - functionModifiers.putAll(super.getFunctionModifiers()); - functionModifiers.put("mod", new ModFunctionModifier()); //$NON-NL= S-1$ = - functionModifiers.put("chr", new AliasModifier("char")); //$NON-NL= S-1$ //$NON-NLS-2$ - functionModifiers.put("concat", new AliasModifier("+")); //$NON-NL= S-1$ //$NON-NLS-2$ - functionModifiers.put("||", new AliasModifier("+")); //$NON-NLS-1$= //$NON-NLS-2$ - functionModifiers.put("lcase", new AliasModifier("lower")); //$NON= -NLS-1$ //$NON-NLS-2$ - functionModifiers.put("length", new AliasModifier("char_length"));= //$NON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("ifnull", new AliasModifier("isnull")); //$N= ON-NLS-1$ //$NON-NLS-2$ - functionModifiers.put("ucase", new AliasModifier("upper")); //$NON= -NLS-1$ //$NON-NLS-2$ - functionModifiers.put("nvl", new AliasModifier("isnull")); //$NON-= NLS-1$ //$NON-NLS-2$ - functionModifiers.put("substring", new SubstringFunctionModifier(l= anguageFactory, "substring", "char_length")); //$NON-NLS-1$ //$NON-NLS-2$ /= /$NON-NLS-3$ - functionModifiers.put("cast", new SybaseConvertModifier(languageFa= ctory)); //$NON-NLS-1$ = - functionModifiers.put("convert", new SybaseConvertModifier(languag= eFactory)); //$NON-NLS-1$ = - functionModifiers.put("formattimestamp", new FormatTimestampModifi= er(languageFactory)); //$NON-NLS-1$ + public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { + super.initialize(env); + registerFunctionModifier(SourceSystemFunctions.MOD, new ModFunctio= nModifier(getLanguageFactory())); //$NON-NLS-1$ = + registerFunctionModifier(SourceSystemFunctions.CONCAT, new AliasMo= difier("+")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LCASE, new AliasMod= ifier("lower")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LENGTH, new AliasMo= difier(getLengthFunctionName())); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.IFNULL, new AliasMo= difier("isnull")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.UCASE, new AliasMod= ifier("upper")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.SUBSTRING, new Subs= tringFunctionModifier(getLanguageFactory(), "substring", getLengthFunctionN= ame())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + registerFunctionModifier(SourceSystemFunctions.CONVERT, new Sybase= ConvertModifier(getLanguageFactory())); //$NON-NLS-1$ = + } + = + public String getLengthFunctionName() { + return "char_length"; //$NON-NLS-1$ + } + = + @Override + public boolean useAsInGroupAlias() { + return false; + } + = + @Override + public boolean hasTimeType() { + return false; } - = - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getFunct= ionModifiers() - */ - public Map getFunctionModifiers() { - return functionModifiers; - } - = - /** - * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#getTrans= lationVisitor() - */ - public SQLConversionVisitor getTranslationVisitor() { - SQLConversionVisitor visitor =3D new SybaseSQLConversionVisitor(); - visitor.setRuntimeMetadata(getRuntimeMetadata()); - visitor.setFunctionModifiers(functionModifiers); - visitor.setProperties(connectorProperties); - visitor.setLanguageFactory(languageFactory); - visitor.setDatabaseTimeZone(getDatabaseTimeZone()); - return visitor; - } - = + = } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/sybase/SybaseSingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseSingleIdentityConnectionFactory.java 2009-02-16 21:35:28 = UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseSingleIdentityConnectionFactory.java 2009-02-19 17:59:09 = UTC (rev 476) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.sybase; - -import com.metamatrix.connector.jdbc.*; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory; - -public class SybaseSingleIdentityConnectionFactory extends JDBCSingleIdent= ityConnectionFactory{ - private String queryTest =3D "Select 'x'"; //$NON-NLS-1$ - = - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } - = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/sybase/SybaseUserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseUserIdentityConnectionFactory.java 2009-02-16 21:35:28 UT= C (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseUserIdentityConnectionFactory.java 2009-02-19 17:59:09 UT= C (rev 476) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.sybase; - -import com.metamatrix.connector.jdbc.*; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCUserIdentityConnectionFactory; - -public class SybaseUserIdentityConnectionFactory extends JDBCUserIdentityC= onnectionFactory{ - private String queryTest =3D "Select 'x'"; //$NON-NLS-1$ - = - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } - -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/util/FunctionReplacementVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/util/FunctionReplacementVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/util/FunctionReplacementVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -22,10 +22,25 @@ = package com.metamatrix.connector.jdbc.util; = -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; = import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.language.*; +import com.metamatrix.connector.language.IAggregate; +import com.metamatrix.connector.language.ICompareCriteria; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.IGroupBy; +import com.metamatrix.connector.language.IInCriteria; +import com.metamatrix.connector.language.IInlineView; +import com.metamatrix.connector.language.IInsert; +import com.metamatrix.connector.language.IIsNullCriteria; +import com.metamatrix.connector.language.ILikeCriteria; +import com.metamatrix.connector.language.ISearchedCaseExpression; +import com.metamatrix.connector.language.ISelectSymbol; +import com.metamatrix.connector.language.ISubqueryCompareCriteria; +import com.metamatrix.connector.language.ISubqueryInCriteria; import com.metamatrix.connector.visitor.framework.HierarchyVisitor; = /** @@ -56,22 +71,6 @@ } = /* = - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.ICaseExpression) - */ - public void visit(ICaseExpression obj) { - super.visit(obj); - obj.setExpression(replaceFunction(obj.getExpression())); - int whenCount =3D obj.getWhenCount(); - for(int i=3D0; i 0); - } - = } Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/access/TestAccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/access/TestAccessSQLTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/access/TestAccessSQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -44,13 +44,13 @@ static { try { TRANSLATOR =3D new AccessSQLTranslator(); = - TRANSLATOR.initialize(EnvironmentUtility.createEnvironment(new= Properties(), false), null); + TRANSLATOR.initialize(EnvironmentUtility.createEnvironment(new= Properties(), false)); } catch(ConnectorException e) { e.printStackTrace(); = } } = - public void helpTestVisitor(String input, int expectedType, String exp= ectedOutput) throws ConnectorException { + public void helpTestVisitor(String input, String expectedOutput) throw= s ConnectorException { // Convert from sql to objects ICommand obj =3D FakeTranslationFactory.getInstance().getBQTTransl= ationUtility().parseCommand(input); = @@ -60,7 +60,6 @@ = // Check stuff assertEquals("Did not get correct sql", expectedOutput, tc.getSql(= )); //$NON-NLS-1$ - assertEquals("Did not get expected command type", expectedType, tc= .getExecutionType()); //$NON-NLS-1$ } = public void testRowLimit() throws Exception { @@ -69,8 +68,17 @@ = helpTestVisitor( input, = - TranslatedCommand.EXEC_TYPE_QUERY, output); = } + = + public void testRowLimit1() throws Exception { + String input =3D "select distinct intkey from bqt1.smalla limit 10= 0"; //$NON-NLS-1$ + String output =3D "SELECT DISTINCT TOP 100 SmallA.IntKey FROM Smal= lA"; //$NON-NLS-1$ + + helpTestVisitor( + input, = + output); + + } } Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/db2/TestDB2ConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/db2/TestDB2ConvertModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/db2/TestDB2ConvertModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -54,11 +54,9 @@ = public String helpGetString(IExpression expr) throws Exception { DB2SQLTranslator trans =3D new DB2SQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); = - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = sqlVisitor.append(expr); = = return sqlVisitor.toString(); = Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/db2/TestDB2SqlTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/db2/TestDB2SqlTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/db2/TestDB2SqlTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -32,7 +32,6 @@ import com.metamatrix.cdk.unittest.FakeTranslationFactory; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; import com.metamatrix.connector.language.ICommand; import com.metamatrix.core.util.UnitTestUtil; @@ -42,12 +41,12 @@ public class TestDB2SqlTranslator extends TestCase { = private static Map MODIFIERS; - private static SQLTranslator TRANSLATOR; = + private static DB2SQLTranslator TRANSLATOR; = = static { try { TRANSLATOR =3D new DB2SQLTranslator(); = - TRANSLATOR.initialize(EnvironmentUtility.createEnvironment(new= Properties(), false), null); + TRANSLATOR.initialize(EnvironmentUtility.createEnvironment(new= Properties(), false)); MODIFIERS =3D TRANSLATOR.getFunctionModifiers(); } catch(ConnectorException e) { e.printStackTrace(); = @@ -66,7 +65,7 @@ return UnitTestUtil.getTestDataPath() + "/PartsSupplier.vdb"; //$N= ON-NLS-1$ } = - public void helpTestVisitor(TranslationUtility util, String input, Map= modifiers, int expectedType, String expectedOutput) throws ConnectorExcept= ion { + public void helpTestVisitor(TranslationUtility util, String input, Map= modifiers, String expectedOutput) throws ConnectorException { // Convert from sql to objects ICommand obj =3D util.parseCommand(input); = @@ -76,7 +75,6 @@ tc.translateCommand(obj); = assertEquals("Did not get correct sql", expectedOutput, tc.getSql(= )); //$NON-NLS-1$ - assertEquals("Did not get expected command type", expectedType, tc= .getExecutionType()); //$NON-NLS-1$ } = public void testRowLimit() throws Exception { @@ -86,18 +84,16 @@ helpTestVisitor(FakeTranslationFactory.getInstance().getBQTTransla= tionUtility(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = public void testCrossJoin() throws Exception{ String input =3D "SELECT bqt1.smalla.stringkey FROM bqt1.smalla cr= oss join bqt1.smallb"; //$NON-NLS-1$ - String output =3D "SELECT SmallA.StringKey FROM SmallA INNER JOIN = SmallB ON 1=3D1"; //$NON-NLS-1$ + String output =3D "SELECT SmallA.StringKey FROM SmallA INNER JOIN = SmallB ON 1 =3D 1"; //$NON-NLS-1$ = helpTestVisitor(FakeTranslationFactory.getInstance().getBQTTransla= tionUtility(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } } Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/derby/TestDerbyConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/derby/TestDerbyConvertModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/derby/TestDerbyConvertModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -54,11 +54,9 @@ = public String helpGetString(IExpression expr) throws Exception { DerbySQLTranslator trans =3D new DerbySQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); = - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = sqlVisitor.append(expr); = = return sqlVisitor.toString(); = Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/mysql/TestMySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/mysql/TestMySQLTranslator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/mysql/TestMySQLTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -22,16 +22,15 @@ = package com.metamatrix.connector.jdbc.mysql; = -import java.util.Map; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.api.EnvironmentUtility; +import java.util.Map; +import java.util.Properties; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.MetadataFactory; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.jdbc.MetadataFactory; +import com.metamatrix.connector.jdbc.extension.TranslatedCommand; import com.metamatrix.connector.language.ICommand; = /** @@ -39,12 +38,12 @@ public class TestMySQLTranslator extends TestCase { = private static Map MODIFIERS; - private static SQLTranslator TRANSLATOR; = + private static MySQLTranslator TRANSLATOR; = = static { try { TRANSLATOR =3D new MySQLTranslator(); = - TRANSLATOR.initialize(EnvironmentUtility.createEnvironment(new= Properties(), false), null); + TRANSLATOR.initialize(EnvironmentUtility.createEnvironment(new= Properties(), false)); MODIFIERS =3D TRANSLATOR.getFunctionModifiers(); } catch(ConnectorException e) { e.printStackTrace(); = @@ -63,7 +62,7 @@ return MetadataFactory.BQT_VDB; = } = - public void helpTestVisitor(String vdb, String input, Map modifiers, i= nt expectedType, String expectedOutput) throws ConnectorException { + public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring expectedOutput) throws ConnectorException { // Convert from sql to objects ICommand obj =3D MetadataFactory.helpTranslate(vdb, input); = @@ -73,7 +72,6 @@ = // Check stuff assertEquals("Did not get correct sql", expectedOutput, tc.getSql(= )); //$NON-NLS-1$ - assertEquals("Did not get expected command type", expectedType, tc= .getExecutionType()); //$NON-NLS-1$ } = public void testRewriteConversion1() throws Exception { @@ -83,7 +81,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -94,7 +91,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -105,7 +101,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -116,7 +111,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion5() throws Exception { @@ -126,7 +120,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion6() throws Exception { @@ -136,17 +129,15 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion8() throws Exception { - String input =3D "SELECT nvl(PART_WEIGHT, 'otherString') FROM PART= S"; //$NON-NLS-1$ + String input =3D "SELECT ifnull(PART_WEIGHT, 'otherString') FROM P= ARTS"; //$NON-NLS-1$ String output =3D "SELECT ifnull(PARTS.PART_WEIGHT, 'otherString')= FROM PARTS"; //$NON-NLS-1$ = helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion7() throws Exception { @@ -156,7 +147,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteInsert() throws Exception { @@ -166,7 +156,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteLocate() throws Exception { @@ -176,7 +165,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteSubstring1() throws Exception { @@ -186,7 +174,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteSubstring2() throws Exception { @@ -196,7 +183,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteUnionWithOrderBy() throws Exception { @@ -206,7 +192,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -217,7 +202,7 @@ helpTestVisitor(getTestBQTVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); = + output); = } public void testRowLimit3() throws Exception { String input =3D "select intkey from bqt1.smalla limit 50, 100"; /= /$NON-NLS-1$ @@ -226,7 +211,7 @@ helpTestVisitor(getTestBQTVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); = + output); = } = } Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestDayWeekQuarterFunctionModifier.java 2009-02-16 21:35:28 UTC= (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestDayWeekQuarterFunctionModifier.java 2009-02-19 17:59:09 UTC= (rev 476) @@ -29,6 +29,7 @@ = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; @@ -58,13 +59,10 @@ IExpression expr =3D mod.modify(func); = OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); = - OracleSQLConversionVisitor sqlVisitor =3D new OracleSQLConversionV= isitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = sqlVisitor.append(expr); = - //System.out.println(" expected: " + expectedStr + " \t actual: " = + sqlVisitor.toString()); assertEquals(expectedStr, sqlVisitor.toString()); = return expr; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestExtractFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestExtractFunctionModifier.java 2009-02-16 21:35:28 UTC (rev 4= 75) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestExtractFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 4= 76) @@ -23,7 +23,6 @@ package com.metamatrix.connector.jdbc.oracle; = import java.sql.Timestamp; -import java.util.Map; import java.util.Properties; = import junit.framework.TestCase; @@ -31,6 +30,7 @@ import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; @@ -62,17 +62,12 @@ IExpression expr =3D mod.modify(func); = OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); + trans.registerFunctionModifier("extract", mod); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); = - OracleSQLConversionVisitor sqlVisitor =3D new OracleSQLConversionV= isitor(); = + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = = - // register this ExtractFunctionModifier with the OracleSQLConvers= ionVisitor - Map modifier =3D trans.getFunctionModifiers(); - modifier.put("extract", mod); //$NON-NLS-1$ - sqlVisitor.setFunctionModifiers(modifier); - //sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = sqlVisitor.append(expr); = //System.out.println(" expected: " + expectedStr + " \t actual: " = + sqlVisitor.toString()); assertEquals(expectedStr, sqlVisitor.toString()); @@ -101,18 +96,18 @@ = public void test5() throws Exception { ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); - helpTestMod(arg1, "EXTRACT(DAY FROM {d'2004-01-21'})", "day"); //$= NON-NLS-1$ //$NON-NLS-2$ + helpTestMod(arg1, "EXTRACT(DAY FROM {d'2004-01-21'})", "dayofmonth= "); //$NON-NLS-1$ //$NON-NLS-2$ } = public void test6() throws Exception { ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 17, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "EXTRACT(DAY FROM {ts'2004-01-21 17:05:00.0'})",= "day"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestMod(arg1, "EXTRACT(DAY FROM {ts'2004-01-21 17:05:00.0'})",= "dayofmonth"); //$NON-NLS-1$ //$NON-NLS-2$ } = = public void test11() throws Exception { IGroup group =3D LANG_FACTORY.createGroup(null, "group", null); //= $NON-NLS-1$ IElement elem =3D LANG_FACTORY.createElement("col", group, null, T= ypeFacility.RUNTIME_TYPES.DATE); //$NON-NLS-1$ - helpTestMod(elem, "EXTRACT(DAY FROM col)", "day"); //$NON-NLS-1$ /= /$NON-NLS-2$ + helpTestMod(elem, "EXTRACT(DAY FROM col)", "dayofmonth"); //$NON-N= LS-1$ //$NON-NLS-2$ } = } Deleted: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conne= ctor/jdbc/oracle/TestFormatFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestFormatFunctionModifier.java 2009-02-16 21:35:28 UTC (rev 47= 5) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestFormatFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 47= 6) @@ -1,98 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.sql.Timestamp; -import java.util.Map; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.query.unittest.TimestampUtil; - -/** - */ -public class TestFormatFunctionModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestMonthFunctionModifier. - * @param name - */ - public TestFormatFunctionModifier(String name) { - super(name); - } - - public IExpression helpTestMod(ILiteral datetime, ILiteral format, Str= ing expectedStr) throws Exception { - IFunction func =3D LANG_FACTORY.createFunction("format", //$NON-N= LS-1$ - new IExpression[] { datetime, format }, - String.class); - = - FormatFunctionModifier mod =3D new FormatFunctionModifier (LANG_FA= CTORY); - IExpression expr =3D mod.modify(func); - - OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); - = - OracleSQLConversionVisitor sqlVisitor =3D new OracleSQLConversionV= isitor(); = - - // register this ExtractFunctionModifier with the OracleSQLConvers= ionVisitor - Map modifier =3D trans.getFunctionModifiers(); - modifier.put("format", mod); //$NON-NLS-1$ - sqlVisitor.setFunctionModifiers(modifier); - - //sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = - sqlVisitor.append(expr); = - //System.out.println(" expected: " + expectedStr + " \t actual: " = + sqlVisitor.toString()); - assertEquals(expectedStr, sqlVisitor.toString()); - = - return expr; - } - public void test1() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); - ILiteral arg2 =3D LANG_FACTORY.createLiteral("YYYY-MM-DD", String.= class); //$NON-NLS-1$ - helpTestMod(arg1, arg2, "to_char({d'2004-01-21'}, 'YYYY-MM-DD')" )= ; //$NON-NLS-1$ - } - = - public void test2() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 17, 5, 0, 0), Timestamp.class); - ILiteral arg2 =3D LANG_FACTORY.createLiteral("YYYY-MM-DD HH24:MI:S= S.fffffffff", String.class); //$NON-NLS-1$ - helpTestMod(arg1, arg2, "to_char({ts'2004-01-21 17:05:00.0'}, 'YYY= Y-MM-DD HH24:MI:SS.fffffffff')"); //$NON-NLS-1$ = - } - = - public void test3() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= ime(12, 1, 21), java.sql.Time.class); - ILiteral arg2 =3D LANG_FACTORY.createLiteral("HH24:MI:SS", String.= class); //$NON-NLS-1$ - helpTestMod(arg1, arg2, "to_char({ts'1970-01-01 12:01:21'}, 'HH24:= MI:SS')"); //$NON-NLS-1$ = - } - -} - Deleted: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conne= ctor/jdbc/oracle/TestHourFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestHourFunctionModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestHourFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,82 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.sql.Timestamp; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.query.unittest.TimestampUtil; - -/** - */ -public class TestHourFunctionModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestHourFunctionModifier. - * @param name - */ - public TestHourFunctionModifier(String name) { - super(name); - } - - public IExpression helpTestMod(ILiteral c, String expectedStr) throws = Exception { - IFunction func =3D LANG_FACTORY.createFunction("hour", //$NON-NLS= -1$ - new IExpression[] { c }, - Integer.class); - = - HourFunctionModifier mod =3D new HourFunctionModifier (LANG_FACTOR= Y); - IExpression expr =3D mod.modify(func); - = - OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); - = - OracleSQLConversionVisitor sqlVisitor =3D new OracleSQLConversionV= isitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = - sqlVisitor.append(expr); = - = - assertEquals(expectedStr, sqlVisitor.toString()); - = - return expr; - } - - public void test1() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "TO_NUMBER(TO_CHAR({ts'2004-01-21 10:05:00.0'}, = 'HH24'))"); //$NON-NLS-1$ - } - - public void test2() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 17, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "TO_NUMBER(TO_CHAR({ts'2004-01-21 17:05:00.0'}, = 'HH24'))"); //$NON-NLS-1$ - } -} Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestLeftOrRightFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLeftOrRightFunctionModifier.java 2009-02-16 21:35:28 UTC (r= ev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLeftOrRightFunctionModifier.java 2009-02-19 17:59:09 UTC (r= ev 476) @@ -28,6 +28,7 @@ = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; @@ -52,15 +53,13 @@ new IExpression[] { c, d }, String.class); = - LeftOrRightFunctionModifier mod =3D new LeftOrRightFunctionModifie= r (LANG_FACTORY, target); + LeftOrRightFunctionModifier mod =3D new LeftOrRightFunctionModifie= r (LANG_FACTORY); IExpression expr =3D mod.modify(func); = OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); = - OracleSQLConversionVisitor sqlVisitor =3D new OracleSQLConversionV= isitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = sqlVisitor.append(expr); = //System.out.println(" expected: " + expectedStr + " \t actual: " = + sqlVisitor.toString()); assertEquals(expectedStr, sqlVisitor.toString()); @@ -72,13 +71,13 @@ ILiteral arg1 =3D LANG_FACTORY.createLiteral("1234214", String.cla= ss); //$NON-NLS-1$ ILiteral count =3D LANG_FACTORY.createLiteral(new Integer(11), Int= eger.class); helpTestMod(arg1, count, "left", //$NON-NLS-1$ - "SUBSTR('1234214', 0, 11)"); //$NON-NLS-1$ + "SUBSTR('1234214', 1, 11)"); //$NON-NLS-1$ } = public void test2() throws Exception { ILiteral arg1 =3D LANG_FACTORY.createLiteral("1234214", String.cla= ss); //$NON-NLS-1$ ILiteral count =3D LANG_FACTORY.createLiteral(new Integer(2), Inte= ger.class); helpTestMod(arg1, count, "right", //$NON-NLS-1$ - "SUBSTR('1234214', (LENGTH('1234214') - 2))"); //$NON-NLS-1$ + "SUBSTR('1234214', (-1 * 2))"); //$NON-NLS-1$ } } \ No newline at end of file Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestLocateFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLocateFunctionModifier.java 2009-02-16 21:35:28 UTC (rev 47= 5) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLocateFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 47= 6) @@ -28,6 +28,7 @@ = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; @@ -55,11 +56,9 @@ IExpression expr =3D mod.modify(func); = OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); = - OracleSQLConversionVisitor sqlVisitor =3D new OracleSQLConversionV= isitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = sqlVisitor.append(expr); = = assertEquals(expectedStr, sqlVisitor.toString()); Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestLog10FunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLog10FunctionModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLog10FunctionModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -64,6 +64,6 @@ assertEquals(Integer.class, newArg.getType()); assertEquals(new Integer(10), newArg.getValue()); = - assertEquals("log(10, 5.2)", SQLStringVisitor.getSQLString(outFunc= , null)); //$NON-NLS-1$ + assertEquals("log(10, 5.2)", SQLStringVisitor.getSQLString(outFunc= )); //$NON-NLS-1$ } } Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-16 21:35:28 UTC= (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-19 17:59:09 UTC= (rev 476) @@ -29,6 +29,7 @@ = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; @@ -58,15 +59,11 @@ IExpression expr =3D mod.modify(func); = OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); = - OracleSQLConversionVisitor sqlVisitor =3D new OracleSQLConversionV= isitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = sqlVisitor.append(expr); = - //System.out.println(" expected: " + expectedStr + " \t actual: " = + sqlVisitor.toString()); assertEquals(expectedStr, sqlVisitor.toString()); - = return expr; } = Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestOracleConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestOracleConvertModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestOracleConvertModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -54,11 +54,9 @@ = public String helpGetString(IExpression expr) throws Exception { OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); = - SQLConversionVisitor sqlVisitor =3D trans.getTranslationVisitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = sqlVisitor.append(expr); = = return sqlVisitor.toString(); = @@ -71,7 +69,7 @@ LANG_FACTORY.createLiteral(tgtType, String.class)}, TypeFacility.getDataTypeClass(tgtType)); = - OracleConvertModifier mod =3D new OracleConvertModifier(LANG_FACTO= RY, null, null); + OracleConvertModifier mod =3D new OracleConvertModifier(LANG_FACTO= RY, null); IExpression expr =3D mod.modify(func); = assertEquals("Error converting from " + srcExpression.getType() + = " to " + tgtType, //$NON-NLS-1$ //$NON-NLS-2$ = @@ -487,7 +485,7 @@ } = public void testDateToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "timestamp", "to_date(to_char({d'2003-11-01'}= , 'YYYY-MM-DD HH24:MI:SS'), 'YYYY-MM-DD HH24:MI:SS')"); //$NON-NLS-1$ //$NO= N-NLS-2$ + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "timestamp", "cast({d'2003-11-01'} AS timesta= mp)"); //$NON-NLS-1$ //$NON-NLS-2$ } = // Source =3D TIME @@ -497,7 +495,7 @@ } = public void testTimeToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "timestamp", "to_date(to_char({ts'1970-01-01 = 23:59:59'}, 'YYYY-MM-DD HH24:MI:SS'), 'YYYY-MM-DD HH24:MI:SS')"); //$NON-NL= S-1$ //$NON-NLS-2$ + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "timestamp", "cast({ts'1970-01-01 23:59:59'} = AS timestamp)"); //$NON-NLS-1$ //$NON-NLS-2$ } = // Source =3D TIMESTAMP @@ -514,7 +512,7 @@ = public void testTimestampToTime() throws Exception { Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "time", = "to_date(('1970-01-01 ' || substr(to_char({ts'2003-11-01 12:05:02.0'}, 'FXY= YYY-MM-DD HH24:MI:SS'), 12)), 'YYYY-MM-DD HH24:MI:SS')"); //$NON-NLS-1$ //$= NON-NLS-2$ + helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "time", = "to_date(('1970-01-01 ' || to_char({ts'2003-11-01 12:05:02.0'}, 'HH24:MI:SS= ')), 'YYYY-MM-DD HH24:MI:SS')"); //$NON-NLS-1$ //$NON-NLS-2$ } = = } Added: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connect= or/jdbc/oracle/TestOracleTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestOracleTranslator.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestOracleTranslator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.connector.jdbc.oracle; + +import java.util.Properties; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.cdk.unittest.FakeTranslationFactory; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.jdbc.access.AccessSQLTranslator; +import com.metamatrix.connector.jdbc.extension.SQLTranslator; +import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.language.ICommand; + +public class TestOracleTranslator extends TestCase { + = + private static SQLTranslator TRANSLATOR; = + + static { + try { + TRANSLATOR =3D new OracleSQLTranslator(); = + TRANSLATOR.initialize(EnvironmentUtility.createEnvironment(new= Properties(), false)); + } catch(ConnectorException e) { + e.printStackTrace(); = + } + } + + public void helpTestVisitor(String input, String expectedOutput) throws C= onnectorException { + // Convert from sql to objects + ICommand obj =3D FakeTranslationFactory.getInstance().getAutoIncre= mentTranslationUtility().parseCommand(input); + = + TranslatedCommand tc =3D new TranslatedCommand(EnvironmentUtility.= createSecurityContext("user"), TRANSLATOR); + tc.translateCommand(obj); + = + // Check stuff + assertEquals("Did not get correct sql", expectedOutput, tc.getSql(= )); //$NON-NLS-1$ + } + = + public void testInsertWithSequnce() throws Exception { + helpTestVisitor("insert into test.group (e0) values (1)", "INSERT INTO g= roup (e0, e1) VALUES (1, MYSEQUENCE.nextVal)"); + } + = + public void testInsertWithSequnce1() throws Exception { + helpTestVisitor("insert into test.group (e0, e1) values (1, 'x')", "INSE= RT INTO group (e0, e1) VALUES (1, 'x')"); + } +} Property changes on: trunk/connectors/connector-jdbc/src/test/java/com/meta= matrix/connector/jdbc/oracle/TestOracleTranslator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conne= ctor/jdbc/oracle/TestParseFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestParseFunctionModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestParseFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,97 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.util.Map; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; - -/** - */ -public class TestParseFunctionModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestMonthFunctionModifier. - * @param name - */ - public TestParseFunctionModifier(String name) { - super(name); - } - - public IExpression helpTestMod(ILiteral datetime, ILiteral format, Cla= ss targetClass, String expectedStr) throws Exception { - IFunction func =3D LANG_FACTORY.createFunction("parse", //$NON-NL= S-1$ - new IExpression[] { datetime, format }, - targetClass); - = - ParseFunctionModifier mod =3D new ParseFunctionModifier (LANG_FACT= ORY, targetClass); - IExpression expr =3D mod.modify(func); - - OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); - = - OracleSQLConversionVisitor sqlVisitor =3D new OracleSQLConversionV= isitor(); = - - // register this ExtractFunctionModifier with the OracleSQLConvers= ionVisitor - Map modifier =3D trans.getFunctionModifiers(); - modifier.put("parse", mod); //$NON-NLS-1$ - sqlVisitor.setFunctionModifiers(modifier); - - //sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = - sqlVisitor.append(expr); = - //System.out.println(" expected: " + expectedStr + " \t actual: " = + sqlVisitor.toString()); - assertEquals(expectedStr, sqlVisitor.toString()); - = - return expr; - } - public void test1() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral("2004-01-21", String.= class); //$NON-NLS-1$ - ILiteral arg2 =3D LANG_FACTORY.createLiteral("YYYY-MM-DD", String.= class); //$NON-NLS-1$ - helpTestMod(arg1, arg2, java.sql.Date.class, "to_date('2004-01-21'= , 'YYYY-MM-DD')" ); //$NON-NLS-1$ = - } - = - public void test2() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral("2004-01-21 17:05:00.= 0", String.class); //$NON-NLS-1$ - ILiteral arg2 =3D LANG_FACTORY.createLiteral("YYYY-MM-DD HH24:MI:S= S.fffffffff", String.class); //$NON-NLS-1$ - helpTestMod(arg1, arg2, java.sql.Timestamp.class, "to_date('2004-0= 1-21 17:05:00.0', 'YYYY-MM-DD HH24:MI:SS.fffffffff')"); //$NON-NLS-1$ = - } - = - public void test3() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral("12:01:21", String.cl= ass); //$NON-NLS-1$ - ILiteral arg2 =3D LANG_FACTORY.createLiteral("HH24:MI:SS", String.= class); //$NON-NLS-1$ - helpTestMod(arg1, arg2, java.sql.Time.class, "to_date('12:01:21', = 'HH24:MI:SS')"); //$NON-NLS-1$ = - } - -} - - Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestSubstringFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestSubstringFunctionModifier.java 2009-02-16 21:35:28 UTC (rev= 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestSubstringFunctionModifier.java 2009-02-19 17:59:09 UTC (rev= 476) @@ -30,6 +30,7 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.jdbc.extension.FunctionModifier; +import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; @@ -54,13 +55,11 @@ args, TypeFacility.RUNTIME_TYPES.STRING); = OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); = IExpression expr =3D ((FunctionModifier)trans.getFunctionModifiers= ().get("substring")).modify(func); //$NON-NLS-1$ = - OracleSQLConversionVisitor sqlVisitor =3D new OracleSQLConversionV= isitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = sqlVisitor.append(expr); = = assertEquals(expectedStr, sqlVisitor.toString()); Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/postgresql/TestPostgreSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/postgresql/TestPostgreSQLTranslator.java 2009-02-16 21:35:28 UTC (rev = 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/postgresql/TestPostgreSQLTranslator.java 2009-02-19 17:59:09 UTC (rev = 476) @@ -22,16 +22,15 @@ = package com.metamatrix.connector.jdbc.postgresql; = -import java.util.Map; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.api.EnvironmentUtility; +import java.util.Map; +import java.util.Properties; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.MetadataFactory; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.jdbc.MetadataFactory; +import com.metamatrix.connector.jdbc.extension.TranslatedCommand; import com.metamatrix.connector.language.ICommand; = /** @@ -39,12 +38,12 @@ public class TestPostgreSQLTranslator extends TestCase { = private static Map MODIFIERS; - private static SQLTranslator TRANSLATOR; = + private static PostgreSQLTranslator TRANSLATOR; = = static { try { TRANSLATOR =3D new PostgreSQLTranslator(); = - TRANSLATOR.initialize(EnvironmentUtility.createEnvironment(new= Properties(), false), null); + TRANSLATOR.initialize(EnvironmentUtility.createEnvironment(new= Properties(), false)); MODIFIERS =3D TRANSLATOR.getFunctionModifiers(); } catch(ConnectorException e) { e.printStackTrace(); = @@ -63,7 +62,7 @@ return MetadataFactory.BQT_VDB; } = - public void helpTestVisitor(String vdb, String input, Map modifiers, i= nt expectedType, String expectedOutput) throws ConnectorException { + public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring expectedOutput) throws ConnectorException { // Convert from sql to objects ICommand obj =3D MetadataFactory.helpTranslate(vdb, input); = @@ -73,7 +72,6 @@ = // Check stuff assertEquals("Did not get correct sql", expectedOutput, tc.getSql(= )); //$NON-NLS-1$ - assertEquals("Did not get expected command type", expectedType, tc= .getExecutionType()); //$NON-NLS-1$ } = public void testRewriteConversion1() throws Exception { @@ -83,7 +81,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -94,7 +91,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -105,7 +101,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -116,7 +111,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion5() throws Exception { @@ -126,7 +120,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion6() throws Exception { @@ -136,7 +129,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion7() throws Exception { @@ -146,7 +138,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion8() throws Exception { @@ -156,7 +147,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion9() throws Exception { @@ -166,7 +156,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion10() throws Exception { @@ -176,7 +165,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion11() throws Exception { @@ -186,7 +174,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion12() throws Exception { @@ -196,7 +183,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion13() throws Exception { @@ -206,7 +192,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion14() throws Exception { @@ -216,7 +201,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion15() throws Exception { @@ -226,7 +210,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion16() throws Exception { @@ -236,7 +219,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion17() throws Exception { @@ -246,7 +228,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion18() throws Exception { @@ -256,17 +237,15 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteConversion19() throws Exception { String input =3D "SELECT convert(convert(PART_WEIGHT, boolean), st= ring) FROM PARTS"; //$NON-NLS-1$ - String output =3D "SELECT CASE WHEN cast(PARTS.PART_WEIGHT AS bool= ean)=3DTRUE THEN '1' ELSE '0' END FROM PARTS"; //$NON-NLS-1$ + String output =3D "SELECT CASE WHEN cast(PARTS.PART_WEIGHT AS bool= ean) =3D TRUE THEN '1' ELSE '0' END FROM PARTS"; //$NON-NLS-1$ = helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -277,7 +256,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); input =3D "SELECT log10(convert(PART_WEIGHT, double)) FROM PARTS";= //$NON-NLS-1$ output =3D "SELECT log(cast(PARTS.PART_WEIGHT AS float8)) FROM PAR= TS"; //$NON-NLS-1$ @@ -285,28 +263,25 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = public void testRewriteLeft() throws Exception { String input =3D "SELECT left(PART_WEIGHT, 2) FROM PARTS"; //$NON-= NLS-1$ - String output =3D "SELECT substr(PARTS.PART_WEIGHT, 1, 2) FROM PAR= TS"; //$NON-NLS-1$ + String output =3D "SELECT SUBSTR(PARTS.PART_WEIGHT, 1, 2) FROM PAR= TS"; //$NON-NLS-1$ = helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRewriteRight() throws Exception { String input =3D "SELECT right(PART_WEIGHT, 2) FROM PARTS"; //$NON= -NLS-1$ - String output =3D "SELECT substr(PARTS.PART_WEIGHT, ((LENGTH(PARTS= .PART_WEIGHT) + 1) - 2)) FROM PARTS"; //$NON-NLS-1$ + String output =3D "SELECT SUBSTR(PARTS.PART_WEIGHT, (-1 * 2)) FROM= PARTS"; //$NON-NLS-1$ = helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -317,7 +292,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testDayOfMonth() throws Exception { @@ -327,7 +301,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testDayOfYear() throws Exception { @@ -337,7 +310,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testHour() throws Exception { @@ -347,7 +319,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testMinute() throws Exception { @@ -357,7 +328,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testMonth() throws Exception { @@ -367,7 +337,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testQuarter() throws Exception { @@ -377,7 +346,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testSecond() throws Exception { @@ -387,7 +355,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testWeek() throws Exception { @@ -397,7 +364,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testYear() throws Exception { @@ -407,7 +373,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testDayName() throws Exception { @@ -417,7 +382,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testMonthName() throws Exception { @@ -427,17 +391,15 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } - public void testNVL() throws Exception { - String input =3D "SELECT nvl(PART_WEIGHT, 'otherString') FROM PART= S"; //$NON-NLS-1$ + public void testIfnull() throws Exception { + String input =3D "SELECT ifnull(PART_WEIGHT, 'otherString') FROM P= ARTS"; //$NON-NLS-1$ String output =3D "SELECT coalesce(PARTS.PART_WEIGHT, 'otherString= ') FROM PARTS"; //$NON-NLS-1$ = helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testSubstring1() throws Exception { @@ -447,7 +409,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testSubstring2() throws Exception { @@ -457,17 +418,15 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testBooleanAggregate() throws Exception { String input =3D "SELECT MIN(convert(PART_WEIGHT, boolean)) FROM P= ARTS"; //$NON-NLS-1$ - String output =3D "SELECT CASE MIN(CASE cast(PARTS.PART_WEIGHT AS = boolean) WHEN TRUE THEN 1 ELSE 0 END) WHEN 1 THEN TRUE ELSE FALSE END FROM = PARTS"; //$NON-NLS-1$ + String output =3D "SELECT bool_and(cast(PARTS.PART_WEIGHT AS boole= an)) FROM PARTS"; //$NON-NLS-1$ = helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } public void testRowLimit2() throws Exception { @@ -477,7 +436,7 @@ helpTestVisitor(getTestBQTVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); = + output); = } public void testRowLimit3() throws Exception { String input =3D "select intkey from bqt1.smalla limit 50, 100"; /= /$NON-NLS-1$ @@ -486,7 +445,7 @@ helpTestVisitor(getTestBQTVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); = + output); = } = = } Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/sqlserver/TestSqlServerConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sqlserver/TestSqlServerConversionVisitor.java 2009-02-16 21:35:28 UTC = (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sqlserver/TestSqlServerConversionVisitor.java 2009-02-19 17:59:09 UTC = (rev 476) @@ -27,10 +27,10 @@ = import junit.framework.TestCase; = -import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.MetadataFactory; +import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; @@ -46,7 +46,7 @@ SqlServerSQLTranslator trans =3D new SqlServerSQLTranslator(); = try { - trans.initialize(EnvironmentUtility.createEnvironment(new Prop= erties(), false), null); + trans.initialize(EnvironmentUtility.createEnvironment(new Prop= erties(), false)); } catch(ConnectorException e) { e.printStackTrace(); } @@ -70,30 +70,28 @@ return MetadataFactory.BQT_VDB; } = - public void helpTestVisitor(String vdb, String input, Map modifiers, i= nt expectedType, String expectedOutput) throws ConnectorException { - helpTestVisitor(vdb, input, modifiers, expectedType, new String[] {expec= tedOutput}, EMPTY_PROPERTIES); + public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring expectedOutput) throws ConnectorException { + helpTestVisitor(vdb, input, modifiers, new String[] {expectedOutput}, EM= PTY_PROPERTIES); } = - public void helpTestVisitor(String vdb, String input, Map modifiers, i= nt expectedType, String[] expectedOutputs, Properties props) throws Connect= orException { + public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring[] expectedOutputs, Properties props) throws ConnectorException { // Convert from sql to objects ICommand obj =3D MetadataFactory.helpTranslate(vdb, input); = // Apply function replacement FunctionReplacementVisitor funcVisitor =3D new FunctionReplacement= Visitor(modifiers); = + SqlServerSQLTranslator trans =3D new SqlServerSQLTranslator(); + trans.initialize(EnvironmentUtility.createEnvironment(props, false= )); // Convert back to SQL - SqlServerSQLConversionVisitor sqlVisitor =3D new SqlServerSQLConve= rsionVisitor(); - sqlVisitor.setProperties(props); - sqlVisitor.setLanguageFactory(CommandBuilder.getLanuageFactory()); - sqlVisitor.setFunctionModifiers(modifiers); = + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = - TranslatedCommand tc =3D new TranslatedCommand(EnvironmentUtility.= createSecurityContext("user"), new SqlServerSQLTranslator(), sqlVisitor, fu= ncVisitor); //$NON-NLS-1$ + TranslatedCommand tc =3D new TranslatedCommand(EnvironmentUtility.= createSecurityContext("user"), trans, sqlVisitor, funcVisitor); //$NON-NLS-= 1$ tc.translateCommand(obj); = // Check stuff = assertEquals("Did not get correct sql", expectedOutputs[0], tc.get= Sql()); //$NON-NLS-1$ - assertEquals("Did not get expected command type", expectedType, tc= .getExecutionType()); //$NON-NLS-1$ } = public void testModFunction() throws Exception { @@ -103,7 +101,6 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = = @@ -114,64 +111,9 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = = - public void testConcatOperatorFunction() throws Exception { - String input =3D "SELECT PART_NAME || 'b' FROM PARTS"; //$NON-NLS-= 1$ - String output =3D "SELECT (PARTS.PART_NAME + 'b') FROM PARTS"; //$= NON-NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); = - } = - - public void testChrFunction() throws Exception { - String input =3D "SELECT chr(CONVERT(PART_ID, INTEGER)) FROM PARTS= "; //$NON-NLS-1$ - String output =3D "SELECT char(convert(int, PARTS.PART_ID)) FROM P= ARTS"; //$NON-NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); = - } = - - public void testLcaseFunction() throws Exception { - String input =3D "SELECT lcase(PART_NAME) FROM PARTS"; //$NON-NLS-= 1$ - String output =3D "SELECT lower(PARTS.PART_NAME) FROM PARTS"; //$N= ON-NLS-1$ - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); - } - = - public void testUcaseFunction() throws Exception { - String input =3D "SELECT ucase(PART_NAME) FROM PARTS"; //$NON-NLS-= 1$ - String output =3D "SELECT upper(PARTS.PART_NAME) FROM PARTS"; //$N= ON-NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); - } - = - public void testLengthFunction() throws Exception { - String input =3D "SELECT length(PART_NAME) FROM PARTS"; //$NON-NLS= -1$ - String output =3D "SELECT len(PARTS.PART_NAME) FROM PARTS"; //$NON= -NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); - } - public void testDayOfMonthFunction() throws Exception { String input =3D "SELECT dayofmonth(convert(PARTS.PART_ID, date)) = FROM PARTS"; //$NON-NLS-1$ String output =3D "SELECT day(convert(datetime, PARTS.PART_ID)) FR= OM PARTS"; //$NON-NLS-1$ @@ -179,110 +121,17 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = - public void testSubstring2ArgFunction() throws Exception { - String input =3D "SELECT substring(PART_NAME, 3) FROM PARTS"; //$N= ON-NLS-1$ - String output =3D "SELECT substring(PARTS.PART_NAME, 3, len(PARTS.= PART_NAME)) FROM PARTS"; //$NON-NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); - } - - public void testSubstring3ArgFunction() throws Exception { - String input =3D "SELECT substring(PART_NAME, 3, 5) FROM PARTS"; /= /$NON-NLS-1$ - String output =3D "SELECT substring(PARTS.PART_NAME, 3, 5) FROM PA= RTS"; //$NON-NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); - } - = - public void testConvertFunctionString() throws Exception { - String input =3D "SELECT convert(PARTS.PART_ID, integer) FROM PART= S"; //$NON-NLS-1$ - String output =3D "SELECT convert(int, PARTS.PART_ID) FROM PARTS";= //$NON-NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); - } - = - public void testConvertFunctionChar() throws Exception { - String input =3D "SELECT convert(PART_NAME, char) FROM PARTS"; //$= NON-NLS-1$ - String output =3D "SELECT convert(char, PARTS.PART_NAME) FROM PART= S"; //$NON-NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); - } - = - public void testConvertFunctionBoolean() throws Exception { - String input =3D "SELECT convert(PART_ID, boolean) FROM PARTS"; //= $NON-NLS-1$ - String output =3D "SELECT convert(bit, PARTS.PART_ID) FROM PARTS";= //$NON-NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); - } - - public void testDateLiteral() throws Exception { - helpTestVisitor(getTestVDB(), - "select {d'2002-12-31'} FROM parts", //$NON-NLS-1$ - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - "SELECT {d'2002-12-31'} FROM PARTS"); //$NON-NLS-1$ - } - - public void testTimeLiteral() throws Exception { - helpTestVisitor(getTestVDB(), - "select {t'13:59:59'} FROM parts", //$NON-NLS-1$ - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - "SELECT {ts'1900-01-01 13:59:59'} FROM PARTS"); //$NON-NLS-1$ - } - - public void testTimestampLiteral() throws Exception { - helpTestVisitor(getTestVDB(), - "select {ts'2002-12-31 13:59:59'} FROM parts", //$NON-NLS-1$ - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - "SELECT {ts'2002-12-31 13:59:59.0'} FROM PARTS"); //$NON-NLS-1$ - } - - public void helpTestVisitor(String vdb, String input, String expectedOutp= ut) throws ConnectorException { - helpTestVisitor(vdb, input, MODIFIERS, TranslatedCommand.EXEC_TYPE_QUERY= , expectedOutput); - } - = public void testRowLimit() throws Exception { String input =3D "select intkey from bqt1.smalla limit 100"; //$NO= N-NLS-1$ - String output =3D "SELECT TOP 100 SmallA.IntKey FROM SmallA "; //$= NON-NLS-1$ + String output =3D "SELECT TOP 100 * FROM (SELECT SmallA.IntKey FRO= M SmallA) AS X"; //$NON-NLS-1$ = helpTestVisitor(getBQTVDB(), input, = MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); = + output); = } = - public void testNonIntMod() throws Exception { - String input =3D "select mod(intkey/1.5, 3) from bqt1.smalla"; //$NON= -NLS-1$ - String output =3D "SELECT ((convert(float, SmallA.IntKey) / 1.5) -= (floor(((convert(float, SmallA.IntKey) / 1.5) / 3.0)) * 3.0)) FROM SmallA"= ; //$NON-NLS-1$ - = - helpTestVisitor(getBQTVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); - } } Deleted: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conne= ctor/jdbc/sqlserver/TestSqlServerConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sqlserver/TestSqlServerConvertModifier.java 2009-02-16 21:35:28 UTC (r= ev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sqlserver/TestSqlServerConvertModifier.java 2009-02-19 17:59:09 UTC (r= ev 476) @@ -1,520 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.sqlserver; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.sql.Timestamp; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.query.unittest.TimestampUtil; - -/** - */ -public class TestSqlServerConvertModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestSybaseConvertModifier. - * @param name - */ - public TestSqlServerConvertModifier(String name) { - super(name); - } - - public String helpGetString(IExpression expr) throws Exception { - SqlServerSQLTranslator trans =3D new SqlServerSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); - = - SQLConversionVisitor sqlVisitor =3D trans.getTranslationVisitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = - sqlVisitor.append(expr); = - = - return sqlVisitor.toString(); = - } - - public void helpTest(IExpression srcExpression, String tgtType, String= expectedExpression) throws Exception { - IFunction func =3D LANG_FACTORY.createFunction("convert", //$NON-= NLS-1$ - new IExpression[] { = - srcExpression, - LANG_FACTORY.createLiteral(tgtType, String.class)}, - DataTypeManager.getDataTypeClass(tgtType)); - = - SqlServerConvertModifier mod =3D new SqlServerConvertModifier(LANG= _FACTORY); - IExpression expr =3D mod.modify(func); - = - assertEquals("Error converting from " + DataTypeManager.getDataTyp= eName(srcExpression.getType()) + " to " + tgtType, //$NON-NLS-1$ //$NON-NLS= -2$ = - expectedExpression, helpGetString(expr)); = - } - - // Source =3D STRING - - public void testStringToChar() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "char", "c= onvert(char, '5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "boolean",= "convert(bit, '5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "byte", "c= onvert(tinyint, '5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "short", "= convert(smallint, '5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "integer",= "convert(int, '5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "long", "c= onvert(numeric, '5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigintege= r", "convert(numeric, '5')"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "float", "= convert(real, '5')");//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "double", = "convert(float, '5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToDate() throws Exception { - helpTest(LANG_FACTORY.createLiteral("2004-06-29", String.class), "= date", "convert(datetime, '2004-06-29')"); //$NON-NLS-1$ //$NON-NLS-2$ //$N= ON-NLS-3$ - } - - public void testStringToTime() throws Exception { - helpTest(LANG_FACTORY.createLiteral("23:59:59", String.class), "ti= me", "convert(datetime, '23:59:59')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-N= LS-3$ - } - - public void testStringToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral("2004-06-29 23:59:59.987", Str= ing.class), "timestamp", "convert(datetime, '2004-06-29 23:59:59.987')"); /= /$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigdecima= l", "convert(float, '5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - // Source =3D CHAR - = - public void testCharToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Character('5'), Character.= class), "string", "convert(varchar, '5')"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D BOOLEAN - = - public void testBooleanToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "string", "convert(varchar, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "byte", "convert(tinyint, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "short", "convert(smallint, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "integer", "convert(int, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "long", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "biginteger", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "float", "convert(real, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "double", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "bigdecimal", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - = - // Source =3D BYTE - = - public void testByteToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "string", "convert(varchar, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "boolean", "convert(bit, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "short", "convert(smallint, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "integer", "convert(int, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "long", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "biginteger", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "float", "convert(real, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "double", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "bigdecimal", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D SHORT - = - public void testShortToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "string", "convert(varchar, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "boolean", "convert(bit, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "byte", "convert(tinyint, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "integer", "convert(int, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "long", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "biginteger", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "float", "convert(real, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "double", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "bigdecimal", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D INTEGER - = - public void testIntegerToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "string", "convert(varchar, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "boolean", "convert(bit, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "byte", "convert(tinyint, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "short", "convert(smallint, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "long", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "biginteger", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "float", "convert(real, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "double", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "bigdecimal", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D LONG - = - public void testLongToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "str= ing", "convert(varchar, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "boo= lean", "convert(bit, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "byt= e", "convert(tinyint, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "sho= rt", "convert(smallint, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "int= eger", "convert(int, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= integer", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "flo= at", "convert(real, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "dou= ble", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= decimal", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D BIGINTEGER - = - public void testBigIntegerToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "string", "convert(varchar, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$= NON-NLS-3$ - } - - public void testBigIntegerToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "boolean", "convert(bit, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON= -NLS-3$ - } - - public void testBigIntegerToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "byte", "convert(tinyint, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NO= N-NLS-3$ - } - - public void testBigIntegerToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "short", "convert(smallint, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$= NON-NLS-3$ - } - - public void testBigIntegerToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "integer", "convert(int, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON= -NLS-3$ - } - - public void testBigIntegerToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "long", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NO= N-NLS-3$ - } - - public void testBigIntegerToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "float", "convert(real, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-= NLS-3$ - } - - public void testBigIntegerToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "double", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NO= N-NLS-3$ - } - - public void testBigIntegerToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "bigdecimal", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ /= /$NON-NLS-3$ - } - - // Source =3D FLOAT - = - public void testFloatToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "string", "convert(varchar, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "boolean", "convert(bit, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "byte", "convert(tinyint, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "short", "convert(smallint, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "integer", "convert(int, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "long", "convert(numeric, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "biginteger", "convert(numeric, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "double", "convert(float, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "bigdecimal", "convert(float, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D DOUBLE - = - public void testDoubleToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "string", "convert(varchar, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "boolean", "convert(bit, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "byte", "convert(tinyint, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "short", "convert(smallint, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "integer", "convert(int, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "long", "convert(numeric, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "biginteger", "convert(numeric, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "float", "convert(real, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "bigdecimal", "convert(float, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D BIGDECIMAL - = - public void testBigDecimalToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "string", "convert(varchar, 1.0)"); //$NON-NLS-1$ //$NON-NLS-2$= //$NON-NLS-3$ - } - - public void testBigDecimalToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "boolean", "convert(bit, 1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //= $NON-NLS-3$ - } - - public void testBigDecimalToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "byte", "convert(tinyint, 1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ /= /$NON-NLS-3$ - } - - public void testBigDecimalToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "short", "convert(smallint, 1.0)"); //$NON-NLS-1$ //$NON-NLS-2$= //$NON-NLS-3$ - } - - public void testBigDecimalToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "integer", "convert(int, 1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //= $NON-NLS-3$ - } - - public void testBigDecimalToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "long", "convert(numeric, 1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ /= /$NON-NLS-3$ - } - - public void testBigDecimalToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "biginteger", "convert(numeric, 1.0)"); //$NON-NLS-1$ //$NON-NL= S-2$ //$NON-NLS-3$ - } - - public void testBigDecimalToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "float", "convert(real, 1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$= NON-NLS-3$ - } - - public void testBigDecimalToDoublel() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "double", "convert(float, 1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ /= /$NON-NLS-3$ - } - - // Source =3D DATE - - public void testDateToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "string", "convert(varchar, {d'2003-11-01'}, = 101)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDateToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "timestamp", "convert(datetime, {d'2003-11-01= '})"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D TIME - - public void testTimeToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "string", "convert(varchar, {ts'1900-01-01 23= :59:59'}, 108)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testTimeToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "timestamp", "convert(datetime, {ts'1900-01-0= 1 23:59:59'})"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D TIMESTAMP - = - public void testTimestampToString() throws Exception { - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "string"= , "convert(varchar, {ts'2003-11-01 12:05:02.0'}, 109)"); //$NON-NLS-1$ //$N= ON-NLS-2$ - } - - public void testTimestampToDate() throws Exception { - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "date", = "convert(datetime, convert(varchar, {ts'2003-11-01 12:05:02.0'}, 109))"); /= /$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testTimestampToTime() throws Exception { - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "time", = "convert(datetime, convert(varchar, {ts'2003-11-01 12:05:02.0'}, 108))"); /= /$NON-NLS-1$ //$NON-NLS-2$ - } = - -} Deleted: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conne= ctor/jdbc/sybase/TestFormatTimestampModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestFormatTimestampModifier.java 2009-02-16 21:35:28 UTC (rev 4= 75) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestFormatTimestampModifier.java 2009-02-19 17:59:09 UTC (rev 4= 76) @@ -1,78 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.sybase; - -import java.sql.Timestamp; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; - -/** - */ -public class TestFormatTimestampModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestFormatTimestampModifier. - * @param name - */ - public TestFormatTimestampModifier(String name) { - super(name); - } - - public void helpTestMod(String format, String expectedStr) throws Exce= ption { - Timestamp ts =3D new Timestamp(103, 10, 1, 12, 5, 2, 0); - IFunction func =3D LANG_FACTORY.createFunction("formattimestamp", = //$NON-NLS-1$ - new IExpression[] { LANG_FACTORY.createLiteral(ts, Timestamp.c= lass), = - LANG_FACTORY.createLiteral(format, String.class) }, = - String.class); - = - FormatTimestampModifier mod =3D new FormatTimestampModifier(LANG_F= ACTORY); - IExpression expr =3D mod.modify(func); - = - SybaseSQLTranslator trans =3D new SybaseSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); - = - SybaseSQLConversionVisitor sqlVisitor =3D new SybaseSQLConversionV= isitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = - sqlVisitor.append(expr); = - assertEquals(expectedStr, sqlVisitor.toString()); - } - = - public void testModStyle1() throws Exception { - helpTestMod("MM/dd/yyyy", "convert(varchar, {ts'2003-11-01 12:05:0= 2.0'}, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testModUnknownFormat() throws Exception { - helpTestMod("MM:yyy", "convert(varchar, {ts'2003-11-01 12:05:02.0'= })"); //$NON-NLS-1$ //$NON-NLS-2$ - } = - -} Deleted: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conne= ctor/jdbc/sybase/TestModFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestModFunctionModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestModFunctionModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,73 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.sybase; - -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; - -/** - */ -public class TestModFunctionModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - - /** - * Constructor for TestModFunctionModifier. - * @param name - */ - public TestModFunctionModifier(String name) { - super(name); - } - - public void helpTestMod(int first, int second, String expectedStr) thr= ows Exception { - IFunction func =3D LANG_FACTORY.createFunction("mod", //$NON-NLS-= 1$ - new IExpression[] { LANG_FACTORY.createLiteral(new Integer(fir= st), Integer.class), = - LANG_FACTORY.createLiteral(new Integer(second), Integer.cl= ass) }, = - String.class); - = - ModFunctionModifier mod =3D new ModFunctionModifier(); - IExpression expr =3D mod.modify(func); - = - SybaseSQLTranslator trans =3D new SybaseSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); - = - SybaseSQLConversionVisitor sqlVisitor =3D new SybaseSQLConversionV= isitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = - sqlVisitor.append(expr); = - assertEquals(expectedStr, sqlVisitor.toString()); - } - = - public void testMod1() throws Exception { - helpTestMod(5, 5, "(5 % 5)"); //$NON-NLS-1$ - } - = -} Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/sybase/TestSybaseConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestSybaseConvertModifier.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestSybaseConvertModifier.java 2009-02-19 17:59:09 UTC (rev 476) @@ -22,6 +22,8 @@ = package com.metamatrix.connector.jdbc.sybase; = +import java.math.BigDecimal; +import java.math.BigInteger; import java.sql.Timestamp; import java.util.Properties; = @@ -29,12 +31,12 @@ = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; +import com.metamatrix.common.types.DataTypeManager; +import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.query.unittest.TimestampUtil; = /** @@ -53,11 +55,9 @@ = public String helpGetString(IExpression expr) throws Exception { SybaseSQLTranslator trans =3D new SybaseSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); = - SybaseSQLConversionVisitor sqlVisitor =3D new SybaseSQLConversionV= isitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = sqlVisitor.append(expr); = = return sqlVisitor.toString(); = @@ -67,15 +67,21 @@ SybaseConvertModifier mod =3D new SybaseConvertModifier(LANG_FACTO= RY); IExpression expr =3D mod.modify(func); = - SybaseSQLTranslator trans =3D new SybaseSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); + assertEquals(expectedStr, helpGetString(expr)); = + } + = + public void helpTest(IExpression srcExpression, String tgtType, String= expectedExpression) throws Exception { + IFunction func =3D LANG_FACTORY.createFunction("convert", //$NON-= NLS-1$ + new IExpression[] { = + srcExpression, + LANG_FACTORY.createLiteral(tgtType, String.class)}, + DataTypeManager.getDataTypeClass(tgtType)); = - SybaseSQLConversionVisitor sqlVisitor =3D new SybaseSQLConversionV= isitor(); = - sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.setLanguageFactory(LANG_FACTORY); = - sqlVisitor.append(expr); - = - assertEquals(expectedStr, sqlVisitor.toString()); = + SybaseConvertModifier mod =3D new SybaseConvertModifier(LANG_FACTO= RY); + IExpression expr =3D mod.modify(func); + = + assertEquals("Error converting from " + DataTypeManager.getDataTyp= eName(srcExpression.getType()) + " to " + tgtType, //$NON-NLS-1$ //$NON-NLS= -2$ = + expectedExpression, helpGetString(expr)); = } = // original test -- this is not a drop one anymore @@ -115,35 +121,9 @@ LANG_FACTORY.createLiteral("date", String.class)}, //$NON-= NLS-1$ java.sql.Date.class); = - helpGetString1(func, "convert(datetime, convert(varchar, {ts'1989= -03-03 07:08:12.000099999'}, 1))"); //$NON-NLS-1$ + helpGetString1(func, "convert(datetime, convert(varchar, {ts'1989= -03-03 07:08:12.000099999'}, 109))"); //$NON-NLS-1$ } = - public void testConvertFormat() throws Exception { - = - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); - IFunction func1 =3D LANG_FACTORY.createFunction("formattimestamp",= //$NON-NLS-1$ - new IExpression[] { = - LANG_FACTORY.createLiteral(ts, Timestamp.class), = - LANG_FACTORY.createLiteral("MM/dd/yyyy", String.class)}, /= /$NON-NLS-1$ - String.class); - - IFunction func2 =3D LANG_FACTORY.createFunction("convert", //$NON= -NLS-1$ - new IExpression[] { = - func1, = - LANG_FACTORY.createLiteral("date", String.class)}, //$NON-= NLS-1$ - java.sql.Date.class); - = - SybaseSQLTranslator trans =3D new SybaseSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false), null); - - // Perform function replacement, per standard function modifiers - FunctionReplacementVisitor functionVisitor =3D new FunctionReplace= mentVisitor(trans.getFunctionModifiers()); - ISelectSymbol holder =3D LANG_FACTORY.createSelectSymbol("holder",= func2); //$NON-NLS-1$ - holder.acceptVisitor(functionVisitor); - IExpression expr =3D holder.getExpression(); - = - assertEquals("convert(datetime, convert(varchar, {ts'2003-11-01 12= :05:02.0'}, 1))", helpGetString(expr)); //$NON-NLS-1$ - } /********************END of convert(INPUT, date) ******************/ /********************Beginning of convert(INPUT, time) ***************= ***/ public void testStringToTime() throws Exception { @@ -188,7 +168,7 @@ LANG_FACTORY.createLiteral("timestamp", String.class)}, //= $NON-NLS-1$ java.sql.Timestamp.class); = - helpGetString1(func, "convert(datetime, {t'12:02:03'})"); //$NON= -NLS-1$ + helpGetString1(func, "convert(datetime, {ts'1970-01-01 12:02:03'}= )"); //$NON-NLS-1$ } = public void testDateToTimestamp() throws Exception { @@ -253,7 +233,7 @@ LANG_FACTORY.createLiteral("string", String.class)}, //$NO= N-NLS-1$ String.class); = - helpGetString1(func, "convert(varchar, {t'03:10:01'}, 108)"); //= $NON-NLS-1$ + helpGetString1(func, "convert(varchar, {ts'1970-01-01 03:10:01'},= 108)"); //$NON-NLS-1$ } = = public void testBigDecimalToString() throws Exception { @@ -829,6 +809,233 @@ java.math.BigDecimal.class); = helpGetString1(func, "convert(float, 0)"); //$NON-NLS-1$ + } = + + // Source =3D CHAR + = + public void testCharToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Character('5'), Character.= class), "string", "convert(varchar, '5')"); //$NON-NLS-1$ //$NON-NLS-2$ } + + // Source =3D BOOLEAN + = + public void testBooleanToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "string", "convert(varchar, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "byte", "convert(tinyint, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "short", "convert(smallint, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "integer", "convert(int, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "long", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "biginteger", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "float", "convert(real, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "double", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "bigdecimal", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + = + // Source =3D BYTE + = + public void testByteToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "string", "convert(varchar, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "long", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "biginteger", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "float", "convert(real, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "double", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "bigdecimal", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D SHORT + = + public void testShortToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "string", "convert(varchar, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "long", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "biginteger", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "float", "convert(real, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "double", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "bigdecimal", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D INTEGER + = + public void testIntegerToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "string", "convert(varchar, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "long", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "biginteger", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "float", "convert(real, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "double", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "bigdecimal", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D LONG + = + public void testLongToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "str= ing", "convert(varchar, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= integer", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "flo= at", "convert(real, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "dou= ble", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= decimal", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D BIGINTEGER + = + public void testBigIntegerToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "string", "convert(varchar, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$= NON-NLS-3$ + } + + public void testBigIntegerToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "long", "convert(numeric, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NO= N-NLS-3$ + } + + public void testBigIntegerToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "float", "convert(real, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-= NLS-3$ + } + + public void testBigIntegerToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "double", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NO= N-NLS-3$ + } + + public void testBigIntegerToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "bigdecimal", "convert(float, 1)"); //$NON-NLS-1$ //$NON-NLS-2$ /= /$NON-NLS-3$ + } + + // Source =3D FLOAT + = + public void testFloatToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "string", "convert(varchar, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "long", "convert(numeric, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "biginteger", "convert(numeric, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "double", "convert(float, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "bigdecimal", "convert(float, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D DOUBLE + = + public void testDoubleToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "string", "convert(varchar, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "long", "convert(numeric, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "biginteger", "convert(numeric, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "float", "convert(real, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "bigdecimal", "convert(float, 1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBigDecimalToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "long", "convert(numeric, 1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ /= /$NON-NLS-3$ + } + + public void testBigDecimalToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "biginteger", "convert(numeric, 1.0)"); //$NON-NLS-1$ //$NON-NL= S-2$ //$NON-NLS-3$ + } + + public void testBigDecimalToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "float", "convert(real, 1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$= NON-NLS-3$ + } + + public void testBigDecimalToDoublel() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "double", "convert(float, 1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ /= /$NON-NLS-3$ + } + = } Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/sybase/TestSybaseSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestSybaseSQLConversionVisitor.java 2009-02-16 21:35:28 UTC (re= v 475) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestSybaseSQLConversionVisitor.java 2009-02-19 17:59:09 UTC (re= v 476) @@ -22,7 +22,6 @@ = package com.metamatrix.connector.jdbc.sybase; = -import java.util.Map; import java.util.Properties; = import junit.framework.TestCase; @@ -30,6 +29,7 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.MetadataFactory; +import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; @@ -38,19 +38,6 @@ */ public class TestSybaseSQLConversionVisitor extends TestCase { = - private static Map MODIFIERS; - = - static { - SybaseSQLTranslator trans =3D new SybaseSQLTranslator(); - = - try { - trans.initialize(EnvironmentUtility.createEnvironment(new Prop= erties(), false), null); - } catch(ConnectorException e) { - e.printStackTrace(); - } - = - MODIFIERS =3D trans.getFunctionModifiers(); - } /** * Constructor for TestSqlServerConversionVisitor. * @param name @@ -67,17 +54,22 @@ return MetadataFactory.BQT_VDB; } = - public void helpTestVisitor(String vdb, String input, Map modifiers, i= nt expectedType, String expectedOutput) { + public void helpTestVisitor(String vdb, String input, String expectedO= utput) { // Convert from sql to objects ICommand obj =3D MetadataFactory.helpTranslate(vdb, input); = // Apply function replacement - FunctionReplacementVisitor funcVisitor =3D new FunctionReplacement= Visitor(modifiers); - = + SybaseSQLTranslator trans =3D new SybaseSQLTranslator(); + try { + trans.initialize(EnvironmentUtility.createEnvironment(new Properties(),= false)); + } catch (ConnectorException e1) { + throw new RuntimeException(e1); + } + FunctionReplacementVisitor funcVisitor =3D new FunctionReplacement= Visitor(trans.getFunctionModifiers()); + // Convert back to SQL - SybaseSQLConversionVisitor sqlVisitor =3D new SybaseSQLConversionV= isitor(); = - sqlVisitor.setFunctionModifiers(modifiers); = - TranslatedCommand tc =3D new TranslatedCommand(EnvironmentUtility.= createSecurityContext("user"), new SybaseSQLTranslator(), sqlVisitor, funcV= isitor); + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = + TranslatedCommand tc =3D new TranslatedCommand(EnvironmentUtility.= createSecurityContext("user"), trans, sqlVisitor, funcVisitor); try { tc.translateCommand(obj); } catch (ConnectorException e) { @@ -88,7 +80,6 @@ // System.out.println("in: " + input); //$NON-NLS-1$ //System.out.println("out: " + tc.getSql()); //$NON-NLS-1$ assertEquals("Did not get correct sql", expectedOutput, tc.getSql(= )); //$NON-NLS-1$ - assertEquals("Did not get expected command type", expectedType, tc= .getExecutionType()); //$NON-NLS-1$ } = public void testModFunction() { @@ -98,8 +89,6 @@ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = = @@ -109,40 +98,14 @@ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = = - public void testConcatOperatorFunction() { - String input =3D "SELECT PART_NAME || 'b' FROM PARTS"; //$NON-NLS-= 1$ - String output =3D "SELECT (PARTS.PART_NAME + 'b') FROM PARTS"; //$= NON-NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); = - } = - - public void testChrFunction() { - String input =3D "SELECT chr(CONVERT(PART_ID, INTEGER)) FROM PARTS= "; //$NON-NLS-1$ - String output =3D "SELECT char(convert(int, PARTS.PART_ID)) FROM P= ARTS"; //$NON-NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); = - } = - public void testLcaseFunction() { String input =3D "SELECT lcase(PART_NAME) FROM PARTS"; //$NON-NLS-= 1$ String output =3D "SELECT lower(PARTS.PART_NAME) FROM PARTS"; //$N= ON-NLS-1$ helpTestVisitor(getTestVDB(), input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -152,8 +115,6 @@ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -163,8 +124,6 @@ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -174,8 +133,6 @@ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -185,8 +142,6 @@ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -197,8 +152,6 @@ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -208,8 +161,6 @@ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -219,8 +170,6 @@ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -230,57 +179,50 @@ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = = - public void testNvlFunction() { - String input =3D "SELECT nvl(PART_NAME, 'abc') FROM PARTS"; //$NON= -NLS-1$ - String output =3D "SELECT isnull(PARTS.PART_NAME, 'abc') FROM PART= S"; //$NON-NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - output); - } = - public void testDateLiteral() { helpTestVisitor(getTestVDB(), "select {d'2002-12-31'} FROM parts", //$NON-NLS-1$ - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT {d'2002-12-31'} FROM PARTS"); //$NON-NLS-1$ } = public void testTimeLiteral() { helpTestVisitor(getTestVDB(), "select {t'13:59:59'} FROM parts", //$NON-NLS-1$ - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, - "SELECT {t'13:59:59'} FROM PARTS"); //$NON-NLS-1$ + "SELECT {ts'1970-01-01 13:59:59'} FROM PARTS"); //$NON-NLS-1$ } = public void testTimestampLiteral() { helpTestVisitor(getTestVDB(), "select {ts'2002-12-31 13:59:59'} FROM parts", //$NON-NLS-1$ - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT {ts'2002-12-31 13:59:59.0'} FROM PARTS"); //$NON-NLS-1$ } = public void testDefect12120() { helpTestVisitor(getBQTVDB(), "SELECT BQT1.SmallA.IntKey FROM BQT1.SmallA WHERE BQT1.SmallA.= BooleanValue IN ({b'false'}, {b'true'}) ORDER BY IntKey", //$NON-NLS-1$ - MODIFIERS, - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT SmallA.IntKey FROM SmallA WHERE SmallA.BooleanValue IN= (0, 1) ORDER BY IntKey"); //$NON-NLS-1$ = } + = + public void testConvertFunctionString() throws Exception { + String input =3D "SELECT convert(PARTS.PART_ID, integer) FROM PART= S"; //$NON-NLS-1$ + String output =3D "SELECT convert(int, PARTS.PART_ID) FROM PARTS";= //$NON-NLS-1$ + = + helpTestVisitor(getTestVDB(), + input, = + output); + } + = + public void testNonIntMod() throws Exception { + String input =3D "select mod(intkey/1.5, 3) from bqt1.smalla"; //$NON= -NLS-1$ + String output =3D "SELECT ((convert(float, SmallA.IntKey) / 1.5) -= (floor(((convert(float, SmallA.IntKey) / 1.5) / 3.0)) * 3.0)) FROM SmallA"= ; //$NON-NLS-1$ + = + helpTestVisitor(getBQTVDB(), + input, = + output); + } = - public void helpTestVisitor(String vdb, String input, String expectedOutp= ut) throws ConnectorException { - helpTestVisitor(vdb, input, MODIFIERS, TranslatedCommand.EXEC_TYPE_QUERY= , expectedOutput); - = - } } Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/IQueryToLdapSearchParser.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/IQueryToLdapSearchParser.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/IQueryToLdapSearchParser.java 2009-02-19 17:59:09 UTC (rev 476) @@ -45,15 +45,14 @@ import java.util.ListIterator; import java.util.Properties; = +import javax.naming.NamingException; import javax.naming.directory.BasicAttribute; import javax.naming.directory.SearchControls; import javax.naming.ldap.SortKey; -import javax.naming.NamingException; = import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.ICaseExpression; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICompoundCriteria; import com.metamatrix.connector.language.ICriteria; @@ -412,8 +411,6 @@ } else { if(e instanceof IAggregate) { logger.logError("Received IAggregate, but it is not supported. Check c= apabilities."); //$NON-NLS-1$ - } else if(e instanceof ICaseExpression) { - logger.logError("Received ICaseExpression, but it is not supported. Ch= eck capabilties."); //$NON-NLS-1$ } else if(e instanceof IFunction) { logger.logError("Received IFunction, but it is not supported. Check ca= pabilties."); //$NON-NLS-1$ } else if(e instanceof IScalarSubquery) { Modified: trunk/connectors/connector-ldap/src/test/java/com/metamatrix/conn= ector/ldap/TestIQueryToLdapSearchParser.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/= ldap/TestIQueryToLdapSearchParser.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/= ldap/TestIQueryToLdapSearchParser.java 2009-02-19 17:59:09 UTC (rev 476) @@ -203,7 +203,7 @@ private LDAPSearchDetails helpGetSearchDetails(String queryString) throws= ConnectorException { ConnectorLogger logger =3D new SysLogger(false); QueryMetadataInterface metadata =3D exampleLdap(); - RuntimeMetadata rm =3D new MetadataFactory(metadata).createRuntimeMet= adata(); + RuntimeMetadata rm =3D new MetadataFactory(metadata).getRuntimeMetada= ta(); Properties props =3D new Properties(); = IQueryToLdapSearchParser searchParser =3D new IQueryToLdapSearchParse= r(logger,rm,props); Property changes on: trunk/connectors/connector-xml-common ___________________________________________________________________ Name: svn:ignore - target + target .project bin Deleted: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/co= m/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialConversionVisitor.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialConversionVisitor.java 2= 009-02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialConversionVisitor.java 2= 009-02-19 17:59:09 UTC (rev 476) @@ -1,70 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - * Created on Mar 23, 2004 - */ -package com.metamatrix.connector.jdbc.oracle.spatial; - -import java.util.Iterator; - -import com.metamatrix.connector.jdbc.oracle.OracleSQLConversionVisitor; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; - -public class OracleSpatialConversionVisitor extends OracleSQLConversionVis= itor { - - public void visit(ISelect obj) { - buffer.append(SELECT); - buffer.append(SPACE); - - // Add a hint here if one is in the SELECT - if (obj instanceof SpatialHint) { - SpatialHint hint =3D (SpatialHint)obj; - buffer.append(hint.getHint()); - buffer.append(SPACE); - } - - // Add DISTINCT if necessary - if (obj.isDistinct()) { - buffer.append(DISTINCT).append(SPACE); - } - - // Add select symbols - Iterator iter =3D obj.getSelectSymbols().iterator(); - while (iter.hasNext()) { - ISelectSymbol sSymbol =3D (ISelectSymbol)iter.next(); - if (sSymbol.getExpression().getType().equals(Object.class)) { - buffer.append(NULL).append(SPACE); - buffer.append(AS).append(SPACE); - String outName =3D sSymbol.getOutputName(); - int lIndx =3D outName.lastIndexOf("."); //$NON-NLS-1$ - buffer.append(outName.substring(lIndx + 1)).append(SPACE); - } else { - append(sSymbol); - } - if (iter.hasNext()) - buffer.append(COMMA).append(SPACE); - } - } - -} \ No newline at end of file Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-= 02-16 21:35:28 UTC (rev 475) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-= 02-19 17:59:09 UTC (rev 476) @@ -25,132 +25,113 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import java.util.Map; = +import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.oracle.OracleSQLTranslator; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.jdbc.extension.SQLTranslator; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ICriteria; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.ISelect; +import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.connector.visitor.util.CollectorVisitor; = -public class OracleSpatialSQLTranslator extends OracleSQLTranslator { +public class OracleSpatialSQLTranslator extends SQLTranslator { = - /** - * This method is overridden to find function modifiers that modify fu= nctions in the incoming command. - */ - public Map getFunctionModifiers() { - Map modifiers =3D super.getFunctionModifiers(); - Iterator iter =3D OracleSpatialFunctions.relateFunctions.iterator(= ); + @Override + public void initialize(ConnectorEnvironment env) throws ConnectorExceptio= n { + Iterator iter =3D OracleSpatialFunctions.relateFunctions.i= terator(); while (iter.hasNext()) { - modifiers.put(iter.next(), new RelateFunctionModifier()); + registerFunctionModifier(iter.next(), new RelateFunctionModifi= er()); } iter =3D OracleSpatialFunctions.nearestNeighborFunctions.iterator(= ); while (iter.hasNext()) { - modifiers.put(iter.next(), new NearestNeighborFunctionModifier= ()); + registerFunctionModifier(iter.next(), new NearestNeighborFunct= ionModifier()); } iter =3D OracleSpatialFunctions.filterFunctions.iterator(); while (iter.hasNext()) { - modifiers.put(iter.next(), new FilterFunctionModifier()); + registerFunctionModifier(iter.next(), new FilterFunctionModifi= er()); } iter =3D OracleSpatialFunctions.withinDistanceFunctions.iterator(); while (iter.hasNext()) { - modifiers.put(iter.next(), new WithinDistanceFunctionModifier(= )); + registerFunctionModifier(iter.next(), new WithinDistanceFuncti= onModifier()); } iter =3D OracleSpatialFunctions.nnDistanceFunctions.iterator(); while (iter.hasNext()) { - modifiers.put(iter.next(), new NnDistanceFunctionModifier()); + registerFunctionModifier(iter.next(), new NnDistanceFunctionMo= difier()); } - return modifiers; } = /** * This method is overridden to modify the incoming command to add the= hint to the ISelect in the command. */ -public ICommand modifyCommand(ICommand command, ExecutionContext context) = throws ConnectorException { + @Override + public ICommand modifyCommand(ICommand command, com.metamatrix.connector.= api.ExecutionContext context) throws ConnectorException { if (command instanceof IQuery) { IQuery query =3D (IQuery)command; - String hint =3D getHint(query); = ISelect select =3D ((IQuery)command).getSelect(); - List symbols =3D select.getSelectSymbols(); - if(symbols.toString().indexOf("SDO_NN_DISTANCE") !=3D -1){ //$= NON-NLS-1$ - ICriteria criteria =3D query.getWhere(); - if(criteria !=3D null && criteria.toString().indexOf("SDO_= NN") =3D=3D -1){ //$NON-NLS-1$ - throw(new ConnectorException( - Messages.getString("OracleSpatialSQLTranslator.SDO_NN_DE= PENDENCY_ERROR"))); //$NON-NLS-1$ - } = - } - /*Iterator iter =3D symbols.iterator(); - while(iter.hasNext()){ - if(((ISelectSymbol)iter.next()).getExpression().compareToI= gnoreCase("SDO_NN_DISTANCE") !=3D 0){ //$NON-NLS-1$ + List symbols =3D select.getSelectSymbols(); + = + Collection functions =3D CollectorVisitor.collectOb= jects(IFunction.class, select); + for (IFunction function : functions) { + if (function.getName().equalsIgnoreCase("SDO_NN_DISTANCE")) {//$NON-NL= S-1$ ICriteria criteria =3D query.getWhere(); - if(criteria !=3D null && criteria.toString().compareTo= IgnoreCase("SDO_NN") !=3D 0){ //$NON-NLS-1$ - break; - } else{ + if(criteria =3D=3D null || criteria.toString().indexOf= ("SDO_NN") =3D=3D -1){ //$NON-NLS-1$ throw(new ConnectorException( Messages.getString("OracleSpatialSQLTranslator.SDO_N= N_DEPENDENCY_ERROR"))); //$NON-NLS-1$ } - } = + break; + } + } + = + for (int i =3D 0; i < symbols.size(); i++) { + ISelectSymbol symbol =3D symbols.get(i); + if (symbol.getExpression().getType().equals(Object.class)) { + String outName =3D symbol.getOutputName(); + int lIndx =3D outName.lastIndexOf("."); //$NON-NLS-1$ + symbol.setOutputName(outName.substring(lIndx + 1)); + symbol.setExpression(getLanguageFactory().createLitera= l(null, TypeFacility.RUNTIME_TYPES.OBJECT)); + symbol.setAlias(true); + } } - */ - if (hint !=3D null) { - SpatialSelectProxy proxy =3D new SpatialSelectProxy(select= , hint); - query.setSelect(proxy); - } } = return command; } - /** - * This method is overridden to use a special variant of the SQL conve= rsion visitor so that the hint can be inserted into the - * SQL. - */ - public SQLConversionVisitor getTranslationVisitor() { - OracleSpatialConversionVisitor visitor =3D new OracleSpatialConver= sionVisitor(); - visitor.setRuntimeMetadata(getRuntimeMetadata()); - visitor.setFunctionModifiers(getFunctionModifiers()); - visitor.setProperties(getConnectorEnvironment().getProperties()); - visitor.setLanguageFactory(getConnectorEnvironment().getLanguageFa= ctory()); - return visitor; = - } = /** * This method figures out what the hint is by looking at the query an= d returns it. - * = * @param query + * = * @return The hint or null for no hint */ - private String getHint(IQuery query) { - // - // This simple algorithm determines the hint which will be added t= o the - // query. - // Right now, we look through all functions passed in the query - // (returned as a collection) - // Then we check if any of those functions contain the strings 'sd= o' and - // 'relate' - // If so, the ORDERED hint is added, if not, it isn't - Class iFunction =3D null; - try { - iFunction =3D Class.forName("com.metamatrix.data.language.IFun= ction"); //$NON-NLS-1$ - } catch (ClassNotFoundException cex) { - System.err.println("BML: IFunction Class Missing"); //$NON-NLS= -1$ - } - Collection col =3D CollectorVisitor.collectObjects(iFunction, quer= y); - Iterator it =3D col.iterator(); - while (it.hasNext()) { - IFunction func =3D (IFunction)it.next(); - String funcName =3D func.getName().toUpperCase(); - int indx1 =3D funcName.indexOf("SDO"); //$NON-NLS-1$ - int indx2 =3D funcName.indexOf("RELATE"); //$NON-NLS-1$ - if (indx1 >=3D 0 && indx2 > indx1) - return "/* + ORDERED */"; //$NON-NLS-1$ - } - return " "; //$NON-NLS-1$ + @Override + public String getSourceComment(ExecutionContext context, ICommand command= ) { + String comment =3D super.getSourceComment(context, command); + = + if (command instanceof IQuery) { + // + // This simple algorithm determines the hint which will be added = to the + // query. + // Right now, we look through all functions passed in the query + // (returned as a collection) + // Then we check if any of those functions contain the strings 's= do' and + // 'relate' + // If so, the ORDERED hint is added, if not, it isn't + Collection col =3D CollectorVisitor.collectObjects(IFu= nction.class, command); + for (IFunction func : col) { + String funcName =3D func.getName().toUpperCase(); + int indx1 =3D funcName.indexOf("SDO"); //$NON-NLS-1$ + int indx2 =3D funcName.indexOf("RELATE"); //$NON-NLS-1$ + if (indx1 >=3D 0 && indx2 > indx1) + return comment + " /* + ORDERED */"; //$NON-NLS-1$ + } + } + return comment; //$NON-NLS-1$ } = } \ No newline at end of file Deleted: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/co= m/metamatrix/connector/jdbc/oracle/spatial/SpatialHint.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/SpatialHint.java 2009-02-16 21:35:28 = UTC (rev 475) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/SpatialHint.java 2009-02-19 17:59:09 = UTC (rev 476) @@ -1,31 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - * Created on Mar 23, 2004 - */ -package com.metamatrix.connector.jdbc.oracle.spatial; - -public interface SpatialHint { - - String getHint(); -} \ No newline at end of file Deleted: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/co= m/metamatrix/connector/jdbc/oracle/spatial/SpatialSelectProxy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/SpatialSelectProxy.java 2009-02-16 21= :35:28 UTC (rev 475) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/SpatialSelectProxy.java 2009-02-19 17= :59:09 UTC (rev 476) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - * Created on Mar 23, 2004 - */ -package com.metamatrix.connector.jdbc.oracle.spatial; - -import java.util.List; - -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; - -public class SpatialSelectProxy implements - ISelect, - SpatialHint { - - private ISelect delegate; - - private String hint; - - public SpatialSelectProxy(ISelect delegate, - String hint) { - this.delegate =3D delegate; - this.hint =3D hint; - } - - public List getSelectSymbols() { - return this.delegate.getSelectSymbols(); - } - - public boolean isDistinct() { - return this.delegate.isDistinct(); - } - - public void setSelectSymbols(List symbols) { - this.delegate.setSelectSymbols(symbols); - } - - public void setDistinct(boolean distinct) { - this.setDistinct(distinct); - } - - public String getHint() { - return this.hint; - } - - /* - * (non-Javadoc) - * = - * @see com.metamatrix.data.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.framework.LanguageObjectVisitor) - */ - public void acceptVisitor(LanguageObjectVisitor visitor) { - visitor.visit(this); - } - -} \ No newline at end of file Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/TypeFacilityImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Typ= eFacilityImpl.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Typ= eFacilityImpl.java 2009-02-19 17:59:09 UTC (rev 476) @@ -22,7 +22,12 @@ = package com.metamatrix.dqp.internal.datamgr.impl; = +import java.util.Calendar; +import java.util.Date; +import java.util.TimeZone; + import com.metamatrix.common.types.*; +import com.metamatrix.common.util.TimestampWithTimezone; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.TypeFacility; = @@ -49,5 +54,11 @@ public Object convertToRuntimeType(Object value) { return DataTypeManager.convertToRuntimeType(value); } + = + @Override + public Object convertDate(Date date, TimeZone initial, Calendar target, + Class targetType) { + return TimestampWithTimezone.create(date, initial, target, targetType); + } = } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/BaseLanguageObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /BaseLanguageObject.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /BaseLanguageObject.java 2009-02-19 17:59:09 UTC (rev 476) @@ -36,7 +36,7 @@ } = public String toString() { - return SQLStringVisitor.getSQLString(this, null); + return SQLStringVisitor.getSQLString(this); } = } Deleted: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/lan= guage/CaseExpressionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /CaseExpressionImpl.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /CaseExpressionImpl.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,130 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.dqp.internal.datamgr.language; - -import java.util.List; - -import com.metamatrix.connector.language.ICaseExpression; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; - -public class CaseExpressionImpl extends BaseLanguageObject implements ICas= eExpression { - = - private IExpression expression =3D null; - private List whenExpressions =3D null; - private List thenExpressions =3D null; - private IExpression elseExpression =3D null; - private Class type =3D null; - - public CaseExpressionImpl(IExpression expression, - List whens, List thens, IExpression elseExpr= ession, - Class type) { - - this.expression =3D expression; - this.whenExpressions =3D whens; - this.thenExpressions =3D thens; - this.elseExpression =3D elseExpression; - this.type =3D type; - } - /** - * @see com.metamatrix.connector.language.ICaseExpression#getElseExpre= ssion() - */ - public IExpression getElseExpression() { - return elseExpression; - } - - /** - * @see com.metamatrix.connector.language.ICaseExpression#getExpressio= n() - */ - public IExpression getExpression() { - return expression; - } - - /** - * @see com.metamatrix.connector.language.ICaseExpression#getThenExpre= ssion(int) - */ - public IExpression getThenExpression(int index) { - return (IExpression)thenExpressions.get(index); - } - - /** - * @see com.metamatrix.connector.language.ICaseExpression#getWhenCount= () - */ - public int getWhenCount() { - return whenExpressions.size(); - } - - /** - * @see com.metamatrix.connector.language.ICaseExpression#getWhenExpre= ssion(int) - */ - public IExpression getWhenExpression(int index) { - return (IExpression)whenExpressions.get(index); - } - - /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) - */ - public void acceptVisitor(LanguageObjectVisitor visitor) { - visitor.visit(this); - } - /* = - * @see com.metamatrix.data.language.ICaseExpression#setExpression(com= .metamatrix.data.language.IExpression) - */ - public void setExpression(IExpression expression) { - this.expression =3D expression; - } - /* = - * @see com.metamatrix.data.language.ICaseExpression#setWhenExpression= (int, com.metamatrix.data.language.IExpression) - */ - public void setWhenExpression(int index, IExpression expression) { - this.whenExpressions.set(index, expression); - } - - /* = - * @see com.metamatrix.data.language.ICaseExpression#setThenExpression= (int, com.metamatrix.data.language.IExpression) - */ - public void setThenExpression(int index, IExpression expression) { - this.thenExpressions.set(index, expression); - } - = - /* = - * @see com.metamatrix.data.language.ICaseExpression#setElseExpression= (com.metamatrix.data.language.IExpression) - */ - public void setElseExpression(IExpression expression) { - this.elseExpression =3D expression; - } - = - /* = - * @see com.metamatrix.data.language.IExpression#getType() - */ - public Class getType() { - return this.type; - } - /* = - * @see com.metamatrix.data.language.IExpression#setType(java.lang.Cla= ss) - */ - public void setType(Class type) { - this.type =3D type; - } - -} Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/LanguageBridgeFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageBridgeFactory.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageBridgeFactory.java 2009-02-19 17:59:09 UTC (rev 476) @@ -31,7 +31,6 @@ import com.metamatrix.common.log.LogManager; import com.metamatrix.connector.language.IAggregate; import com.metamatrix.connector.language.IBatchedUpdates; -import com.metamatrix.connector.language.ICaseExpression; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICompoundCriteria; @@ -71,6 +70,7 @@ import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.language.ISubqueryCompareCriteria.Quantifi= er; import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.metadata.runtime.MetadataID.Type; import com.metamatrix.dqp.DQPPlugin; import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; import com.metamatrix.dqp.internal.datamgr.metadata.ProcedureIDImpl; @@ -483,19 +483,6 @@ return null; } = - ICaseExpression translate(CaseExpression expr) throws MetaMatrixCompon= entException { - ArrayList whens =3D new ArrayList(); - ArrayList thens =3D new ArrayList(); - for (int i =3D 0; i < expr.getWhenCount(); i++) { - whens.add(translate(expr.getWhenExpression(i))); - thens.add(translate(expr.getThenExpression(i))); - } - return new CaseExpressionImpl(translate(expr.getExpression()), - whens, - thens, - translate(expr.getElseExpression()),= expr.getType()); - } - ILiteral translate(Constant constant) { return new LiteralImpl(constant.getValue(), constant.getType()); } @@ -563,7 +550,7 @@ = if(! (mid instanceof TempMetadataID)) { = try { - element.setMetadataID(metadataFactory.createMetadataID(mid= , MetadataID.TYPE_ELEMENT)); + element.setMetadataID(metadataFactory.createMetadataID(mid= , Type.TYPE_ELEMENT)); } catch(QueryMetadataException e) { LogManager.logWarning(LogConstants.CTX_CONNECTOR, e, DQPPl= ugin.Util.getString("LanguageBridgeFactory.Unable_to_set_the_metadata_ID_fo= r_element_{0}._10", symbol.getName())); //$NON-NLS-1$ throw new MetaMatrixComponentException(e); @@ -700,7 +687,7 @@ return group; } try { - group.setMetadataID(metadataFactory.createMetadataID(symbol.ge= tMetadataID(), MetadataID.TYPE_GROUP)); + group.setMetadataID(metadataFactory.createMetadataID(symbol.ge= tMetadataID(), Type.TYPE_GROUP)); } catch(Exception e) { LogManager.logWarning(LogConstants.CTX_CONNECTOR, e, DQPPlugin= .Util.getString("LanguageBridgeFactory.Unable_to_set_the_metadata_ID_for_gr= oup_{0}._11", symbol.getName())); //$NON-NLS-1$ throw new MetaMatrixComponentException(e); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/LanguageFactoryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageFactoryImpl.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageFactoryImpl.java 2009-02-19 17:59:09 UTC (rev 476) @@ -46,18 +46,6 @@ } = /* = - * @see com.metamatrix.data.language.ILanguageFactory#createCaseExpres= sion(com.metamatrix.data.language.IExpression, java.util.List, java.util.Li= st, com.metamatrix.data.language.IExpression, java.lang.Class) - */ - public ICaseExpression createCaseExpression( - IExpression mainExpression, - List whenExpressions, - List thenExpressions, - IExpression elseExpression, - Class type) { - return new CaseExpressionImpl(mainExpression, whenExpressions, the= nExpressions, elseExpression, type); - } - - /* = * @see com.metamatrix.data.language.ILanguageFactory#createCompareCri= teria(int, com.metamatrix.data.language.IExpression, com.metamatrix.data.la= nguage.IExpression) */ public ICompareCriteria createCompareCriteria( Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/MetadataFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataFactory.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataFactory.java 2009-02-19 17:59:09 UTC (rev 476) @@ -30,6 +30,7 @@ import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.*; +import com.metamatrix.connector.metadata.runtime.MetadataID.Type; import com.metamatrix.core.util.ArgCheck; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.metadata.StoredProcedureInfo; @@ -38,14 +39,16 @@ */ public class MetadataFactory { private QueryMetadataInterface metadata; + private RuntimeMetadataImpl runtimeMetadata; = public MetadataFactory (QueryMetadataInterface metadata){ ArgCheck.isNotNull(metadata); this.metadata =3D metadata; + this.runtimeMetadata =3D new RuntimeMetadataImpl(this); } = - public RuntimeMetadata createRuntimeMetadata(){ - return new RuntimeMetadataImpl(this); + public RuntimeMetadataImpl getRuntimeMetadata(){ + return this.runtimeMetadata; } = /** @@ -56,11 +59,11 @@ * @throws QueryMetadataException * @throws MetaMatrixComponentException */ - public MetadataID createMetadataID(Object metadataID, int type) throws= QueryMetadataException, MetaMatrixComponentException{ - if (type =3D=3D MetadataID.TYPE_GROUP && metadata.isVirtualGroup(meta= dataID)) { + public MetadataID createMetadataID(Object metadataID, Type type) throw= s QueryMetadataException, MetaMatrixComponentException{ + if (type =3D=3D Type.TYPE_GROUP && metadata.isVirtualGroup(metadataID= )) { return null; } - MetadataIDImpl id =3D new MetadataIDImpl(metadataID, metadata); + MetadataIDImpl id =3D new MetadataIDImpl(metadataID, getRuntimeMet= adata()); id.setType(type); return id; } @@ -75,8 +78,8 @@ public MetadataID createProcedureID(Object metadataID) throws QueryMet= adataException, MetaMatrixComponentException{ String procName =3D metadata.getFullName(metadataID); StoredProcedureInfo info =3D metadata.getStoredProcedureInfoForPro= cedure(procName); = - MetadataIDImpl id =3D new ProcedureIDImpl(metadataID, info, this, = metadata); - id.setType(MetadataID.TYPE_PROCEDURE); + MetadataIDImpl id =3D new ProcedureIDImpl(metadataID, info, this); + id.setType(Type.TYPE_PROCEDURE); return id; } = @@ -88,8 +91,8 @@ * @throws MetaMatrixComponentException */ public MetadataID createParameterID(ProcedureIDImpl procedureID, Objec= t metadataID) throws QueryMetadataException, MetaMatrixComponentException{ - ParameterIDImpl id =3D new ParameterIDImpl(metadataID, procedureID= , metadata); - id.setType(MetadataID.TYPE_PARAMETER); + ParameterIDImpl id =3D new ParameterIDImpl(metadataID, procedureID= , getRuntimeMetadata()); + id.setType(Type.TYPE_PARAMETER); return id; } = @@ -101,25 +104,25 @@ * @throws MetaMatrixComponentException */ public MetadataID createResultSetID(ProcedureIDImpl procedureID, Objec= t metadataID, List resultSetColumns) throws QueryMetadataException, MetaMat= rixComponentException{ - ParameterIDImpl id =3D new ParameterIDImpl(metadataID, procedureID= , metadata, resultSetColumns); - id.setType(MetadataID.TYPE_PARAMETER); + ParameterIDImpl id =3D new ParameterIDImpl(metadataID, procedureID= , getRuntimeMetadata(), resultSetColumns); + id.setType(Type.TYPE_PARAMETER); return id; } = public MetadataObject createMetadataObject(MetadataID id) throws Query= MetadataException, MetaMatrixComponentException, ConnectorException { - int type =3D id.getType(); + Type type =3D id.getType(); MetadataIDImpl idImpl =3D (MetadataIDImpl) id; MetadataObject mObj =3D null; - if(type =3D=3D MetadataID.TYPE_GROUP){ + if(type =3D=3D Type.TYPE_GROUP){ mObj =3D new GroupImpl(idImpl); = - } else if(type =3D=3D MetadataID.TYPE_ELEMENT){ = + } else if(type =3D=3D Type.TYPE_ELEMENT){ = mObj =3D new ElementImpl(idImpl); = - } else if(type =3D=3D MetadataID.TYPE_PROCEDURE){ + } else if(type =3D=3D Type.TYPE_PROCEDURE){ mObj =3D new ProcedureImpl(idImpl); = - } else if(type =3D=3D MetadataID.TYPE_PARAMETER) { + } else if(type =3D=3D Type.TYPE_PARAMETER) { mObj =3D new ParameterImpl(idImpl); = = } else{ @@ -139,4 +142,8 @@ public String[] getVDBResourcePaths() throws MetaMatrixComponentExcept= ion, QueryMetadataException { return metadata.getVDBResourcePaths(); } + = + public QueryMetadataInterface getMetadata() { + return metadata; + } } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/MetadataIDImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataIDImpl.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataIDImpl.java 2009-02-19 17:59:09 UTC (rev 476) @@ -24,50 +24,55 @@ */ package com.metamatrix.dqp.internal.datamgr.metadata; = -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.MetadataID; -import com.metamatrix.query.metadata.QueryMetadataInterface; +import com.metamatrix.connector.metadata.runtime.MetadataObject; = /** */ public class MetadataIDImpl implements MetadataID { - private int type; + private Type type; private Object actualMetadataID; private String fullName; - private QueryMetadataInterface metadata; + private RuntimeMetadataImpl metadata; = - MetadataIDImpl(Object actualMetadataID, QueryMetadataInterface metadat= a) throws MetaMatrixComponentException { + MetadataIDImpl(Object actualMetadataID, RuntimeMetadataImpl metadata) = throws MetaMatrixComponentException { this.actualMetadataID =3D actualMetadataID; this.metadata =3D metadata; = - try { - fullName =3D metadata.getFullName(getActualMetadataID()); - } catch (QueryMetadataException ex) { - throw new MetaMatrixComponentException(ex, ex.getMessage()); + if (actualMetadataID !=3D null) { + try { + fullName =3D metadata.getMetadata().getFullName(actualMetadat= aID); + } catch (QueryMetadataException ex) { + throw new MetaMatrixComponentException(ex, ex.getMessage()); + } } } = - QueryMetadataInterface getMetadata() { + RuntimeMetadataImpl getMetadata() { return this.metadata; } = - public int getType() { + public Type getType() { return type; } = public List getChildIDs() throws ConnectorException { - if(type =3D=3D MetadataID.TYPE_GROUP){ + if(type =3D=3D Type.TYPE_GROUP && actualMetadataID !=3D null){ try { - List children =3D metadata.getElementIDsInGroupID(actualMe= tadataID); + List children =3D metadata.getMetadata().getElementIDsInGr= oupID(actualMetadataID); List childIDs =3D new ArrayList(children.size()); Iterator iter =3D children.iterator(); while(iter.hasNext()){ MetadataIDImpl id =3D new MetadataIDImpl(iter.next(), = metadata); - id.setType(MetadataID.TYPE_ELEMENT); + id.setType(Type.TYPE_ELEMENT); childIDs.add(id); } return childIDs; @@ -81,10 +86,10 @@ } = public MetadataID getParentID() throws ConnectorException { - if(type =3D=3D MetadataID.TYPE_ELEMENT) { + if(type =3D=3D Type.TYPE_ELEMENT && actualMetadataID !=3D null) { try { - MetadataIDImpl id =3D new MetadataIDImpl(metadata.getGroup= IDForElementID(actualMetadataID), metadata); - id.setType(MetadataID.TYPE_GROUP); + MetadataIDImpl id =3D new MetadataIDImpl(metadata.getMetad= ata().getGroupIDForElementID(actualMetadataID), metadata); + id.setType(Type.TYPE_GROUP); return id; } catch(QueryMetadataException e) { throw new ConnectorException(e); @@ -113,7 +118,7 @@ return actualMetadataID.hashCode(); } = = - void setType(int type){ + void setType(Type type){ this.type =3D type; } = @@ -142,4 +147,9 @@ } return shortName; } + = + @Override + public MetadataObject getMetadataObject() throws ConnectorException { + return this.metadata.getObject(this); + } } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/MetadataObjectImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataObjectImpl.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataObjectImpl.java 2009-02-19 17:59:09 UTC (rev 476) @@ -51,7 +51,7 @@ } = QueryMetadataInterface getMetadata() { - return metadataID.getMetadata(); + return metadataID.getMetadata().getMetadata(); } = public String getNameInSource() throws ConnectorException { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/ParameterIDImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ParameterIDImpl.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ParameterIDImpl.java 2009-02-19 17:59:09 UTC (rev 476) @@ -22,12 +22,14 @@ = package com.metamatrix.dqp.internal.datamgr.metadata; = -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.MetadataID; -import com.metamatrix.query.metadata.QueryMetadataInterface; = /** */ @@ -36,14 +38,14 @@ private ProcedureIDImpl procID; private List resultSetColumns; = - public ParameterIDImpl(Object actualMetadataID, ProcedureIDImpl proced= ureID, QueryMetadataInterface metadata) + public ParameterIDImpl(Object actualMetadataID, ProcedureIDImpl proced= ureID, RuntimeMetadataImpl metadata) throws MetaMatrixComponentException { super(actualMetadataID, metadata); = this.procID =3D procedureID; } = - public ParameterIDImpl(Object actualMetadataID, ProcedureIDImpl proced= ureID, QueryMetadataInterface metadata, List resultSetColumns) + public ParameterIDImpl(Object actualMetadataID, ProcedureIDImpl proced= ureID, RuntimeMetadataImpl metadata, List resultSetColumns) throws MetaMatrixComponentException { super(actualMetadataID, metadata); = @@ -67,7 +69,7 @@ while(iter.hasNext()){ Object colID =3D iter.next(); MetadataIDImpl id =3D new MetadataIDImpl(colID, getMet= adata()); - id.setType(MetadataID.TYPE_ELEMENT); + id.setType(Type.TYPE_ELEMENT); childIDs.add(id); } return childIDs; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/ProcedureIDImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ProcedureIDImpl.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ProcedureIDImpl.java 2009-02-19 17:59:09 UTC (rev 476) @@ -22,13 +22,14 @@ = package com.metamatrix.dqp.internal.datamgr.metadata; = -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.dqp.message.ParameterInfo; -import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.metadata.StoredProcedureInfo; import com.metamatrix.query.sql.lang.SPParameter; = @@ -44,10 +45,10 @@ * @param metadata * @throws MetaMatrixComponentException */ - public ProcedureIDImpl(Object actualMetadataID, StoredProcedureInfo pr= ocInfo, MetadataFactory factory, QueryMetadataInterface metadata) + public ProcedureIDImpl(Object actualMetadataID, StoredProcedureInfo pr= ocInfo, MetadataFactory factory) throws MetaMatrixComponentException { = - super(actualMetadataID, metadata); + super(actualMetadataID, factory.getRuntimeMetadata()); this.procInfo =3D procInfo; this.factory =3D factory; = } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/RuntimeMetadataImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /RuntimeMetadataImpl.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /RuntimeMetadataImpl.java 2009-02-19 17:59:09 UTC (rev 476) @@ -28,6 +28,7 @@ import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.*; +import com.metamatrix.query.metadata.QueryMetadataInterface; = /** */ @@ -78,4 +79,9 @@ throw new ConnectorException(e); } } + = + QueryMetadataInterface getMetadata() { + return this.factory.getMetadata(); + } + = } Modified: trunk/engine/src/main/java/com/metamatrix/query/function/Function= Library.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/function/FunctionLibrar= y.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/query/function/FunctionLibrar= y.java 2009-02-19 17:59:09 UTC (rev 476) @@ -83,6 +83,8 @@ public static final String NULLIF =3D "nullif"; //$NON-NLS-1$ public static final String COALESCE =3D "coalesce"; //$NON-NLS-1$ = + public static final String SPACE =3D "space"; //$NON-NLS-1$ + = // Function tree for system functions (never reloaded) private FunctionTree systemFunctions; = Modified: trunk/engine/src/main/java/com/metamatrix/query/function/Function= Methods.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/function/FunctionMethod= s.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/query/function/FunctionMethod= s.java 2009-02-19 17:59:09 UTC (rev 476) @@ -33,13 +33,11 @@ import java.util.Calendar; import java.util.Date; import java.util.Properties; -import java.util.StringTokenizer; import java.util.TimeZone; = import com.metamatrix.api.exception.query.ExpressionEvaluationException; import com.metamatrix.api.exception.query.FunctionExecutionException; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.common.types.Transform; import com.metamatrix.common.types.TransformationException; import com.metamatrix.common.util.TimestampWithTimezone; import com.metamatrix.query.QueryPlugin; @@ -49,8 +47,6 @@ = public final class FunctionMethods { = - private static final String DEFAULT_DECODE_STRING_DELIMITER =3D ","; /= /$NON-NLS-1$ - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Function =3D pl= us =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D = public static Object plus(Object x, Object y) throws FunctionExecutionExc= eption { @@ -1206,10 +1202,12 @@ int repeatCount =3D ((Integer) count).intValue(); StringBuffer result =3D new StringBuffer(); = - for (int i =3D 0; i < repeatCount; i++) { + for (int i =3D 0; i < repeatCount && result.length() <=3D DataTypeManag= er.MAX_STRING_LENGTH; i++) { result.append((String)str); } - + if (result.length() > DataTypeManager.MAX_STRING_LENGTH) { + return result.substring(0, DataTypeManager.MAX_STRING_LENGTH); + } return result.toString(); } = @@ -1217,26 +1215,6 @@ new Object[] {"repeat", str.getClass().getName(), count.getClass().getN= ame()})); //$NON-NLS-1$ } = - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Function =3D sp= ace =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - public static Object space(Object count) - throws FunctionExecutionException { - if (count =3D=3D null) { - return null; - } else if (count instanceof Integer) { - int repeatCount =3D ((Integer) count).intValue(); - StringBuffer result =3D new StringBuffer(); - - for (int i =3D 0; i < repeatCount; i++) { - result.append(" "); //$NON-NLS-1$ - } - - return result.toString(); - } - - throw new FunctionExecutionException(ErrorMessageKeys.FUNCTION_0066, Que= ryPlugin.Util.getString(ErrorMessageKeys.FUNCTION_0066, - new Object[] {"space", count.getClass().getName()})); //$NON-NLS-1$ - } - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Function =3D= ascii =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D = public static Object ascii(Object ch) @@ -1309,46 +1287,53 @@ = // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Function =3D= lpad =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D = - public static Object lpad(Object inputString, Object padLength, Object= padChar) + public static Object lpad(Object inputString, Object padLength, Object= padStr) throws FunctionExecutionException { = - if(inputString =3D=3D null || padLength =3D=3D null || padChar =3D= =3D null) { - return null; - } + return pad(inputString, padLength, padStr, true); + } = - String str =3D (String) inputString; - int length =3D ((Integer)padLength).intValue(); - if(length < 1) { - throw new FunctionExecutionException(ErrorMessageKeys.FUNCTION= _0025, QueryPlugin.Util.getString(ErrorMessageKeys.FUNCTION_0025)); - } + public static Object pad(Object inputString, Object padLength, Object = padStr, boolean left) + throws FunctionExecutionException { = - int numPadChar =3D length - str.length(); - if(numPadChar <=3D 0) { - return str; - } - // Get pad character - char ch =3D 0; - if(padChar instanceof String) { - String charStr =3D (String) padChar; - if(charStr.length() !=3D 1) { - throw new FunctionExecutionException(ErrorMessageKeys.FUNC= TION_0027, QueryPlugin.Util.getString(ErrorMessageKeys.FUNCTION_0027)); - } - ch =3D charStr.charAt(0); - } else { - ch =3D ((Character)padChar).charValue(); - } + if(inputString =3D=3D null || padLength =3D=3D null || padStr =3D=3D = null) { + return null; + } + = + String str =3D (String) inputString; + int length =3D ((Integer)padLength).intValue(); + if(length < 1) { + throw new FunctionExecutionException(ErrorMessageKeys.FUNCTION_00= 25, QueryPlugin.Util.getString(ErrorMessageKeys.FUNCTION_0025)); + } + if(length < str.length()) { + return str.substring(0, length); + } + if(length > DataTypeManager.MAX_STRING_LENGTH) { + length =3D DataTypeManager.MAX_STRING_LENGTH; + } + // Get pad character + String pad =3D (String) padStr; + if(pad.length() =3D=3D 0) { + throw new FunctionExecutionException(ErrorMessageKeys.FUNCTION_00= 27, QueryPlugin.Util.getString(ErrorMessageKeys.FUNCTION_0027)); + } + // Pad string + StringBuffer outStr =3D new StringBuffer(str); + while(outStr.length() < length) { + if (left) { + outStr.insert(0, pad); + } else { + outStr.append(pad); + } + } + if (left) { + return outStr.substring(outStr.length() - length); + } + return outStr.substring(0, length); + } = - // Pad string - StringBuffer outStr =3D new StringBuffer(); - for(int i=3D0; i ALIASED_FUNCTIONS =3D new Has= hMap(); + = + static { + ALIASED_FUNCTIONS.put("lower", SourceSystemFunctions.LCASE); + ALIASED_FUNCTIONS.put("upper", SourceSystemFunctions.UCASE); + ALIASED_FUNCTIONS.put("cast", SourceSystemFunctions.CONVERT); + ALIASED_FUNCTIONS.put("nvl", SourceSystemFunctions.IFNULL); + ALIASED_FUNCTIONS.put("||", SourceSystemFunctions.CONCAT); + ALIASED_FUNCTIONS.put("chr", SourceSystemFunctions.CHAR); + } = private QueryRewriter() { } = @@ -1981,15 +1991,26 @@ return expression; } = - /** - *

Do 2 things: - *

    - *
  1. If function is a type conversion of type X to type X - elimina= te it
    2. - *
  2. If this is a function totally based on constants, execute it n= ow - * rather than many times in the processor, and return the equivalent = constant
    3. - *

- */ private static Expression rewriteFunction(Function function, Command proc= Command, CommandContext context, QueryMetadataInterface metadata) throws Qu= eryValidatorException { + //rewrite alias functions + String actualName =3DALIASED_FUNCTIONS.get(function.getName().toLowerCas= e()); + if (actualName !=3D null) { + function.setName(actualName); + } + = + //space(x) =3D> repeat(' ', x) + if (function.getName().equalsIgnoreCase(FunctionLibrary.SPACE)) { + //change the function into timestampadd + Function result =3D new Function(SourceSystemFunctions.REPEAT, + new Expression[] {new Constant(" "), function.getArg(0)}); + //resolve the function + FunctionDescriptor descriptor =3D = + FunctionLibraryManager.getFunctionLibrary().findFunction(SourceS= ystemFunctions.REPEAT, new Class[] { DataTypeManager.DefaultDataClasses.STR= ING, DataTypeManager.DefaultDataClasses.INTEGER}); + result.setFunctionDescriptor(descriptor); + result.setType(DataTypeManager.DefaultDataClasses.STRING); + return rewriteFunction(result, procCommand, context, metadata); + } + = //from_unixtime(a) =3D> timestampadd(SQL_TSI_SECOND, a, new Timestamp(0)= ) = if (function.getName().equalsIgnoreCase(FunctionLibrary.FROM_UNIXTIME)) { //change the function into timestampadd @@ -2018,11 +2039,11 @@ if (function.getName().equalsIgnoreCase(FunctionLibrary.COALESCE)) { Expression[] args =3D function.getArgs(); if (args.length =3D=3D 2) { - Function result =3D new Function(FunctionLibrary.IFNULL, + Function result =3D new Function(SourceSystemFunctions.IFNULL, new Expression[] {function.getArg(0), function.getArg(1) }); //resolve the function FunctionDescriptor descriptor =3D = - FunctionLibraryManager.getFunctionLibrary().findFunction(Functi= onLibrary.IFNULL, new Class[] { function.getType(), function.getType() }); + FunctionLibraryManager.getFunctionLibrary().findFunction(Source= SystemFunctions.IFNULL, new Class[] { function.getType(), function.getType(= ) }); result.setFunctionDescriptor(descriptor); result.setType(function.getType()); return rewriteFunction(result, procCommand, context, metadata); @@ -2051,18 +2072,18 @@ Function[] newArgs =3D new Function[args.length]; = for(int i=3D0; i whens =3D new ArrayList(expr.g= etWhenCount()); + for (Expression expression: (List)expr.getWhen()) { + whens.add(new CompareCriteria((Expression)expr.getExpression().clone= (), CompareCriteria.EQ, expression)); + } + SearchedCaseExpression sce =3D new SearchedCaseExpression(whens, expr= .getThen()); + sce.setElseExpression(expr.getElseExpression()); + sce.setType(expr.getType()); + return rewriteCaseExpression(sce, procCommand, context, metadata); + } + + private static Expression rewriteCaseExpression(SearchedCaseExpression= expr, Command procCommand, CommandContext context, QueryMetadataInterface = metadata) + throws QueryValidatorException { int whenCount =3D expr.getWhenCount(); ArrayList whens =3D new ArrayList(whenCount); ArrayList thens =3D new ArrayList(whenCount); - = - boolean tryToSimplify =3D EvaluateExpressionVisitor.isFullyEvaluat= able(rewrittenExpr, true); = + for (int i =3D 0; i < whenCount; i++) { - Expression rewrittenWhen =3D rewriteExpression(expr.getWhenExp= ression(i), procCommand, context, metadata); - if(tryToSimplify && EvaluateExpressionVisitor.isFullyEvaluatab= le(rewrittenWhen, true)) { - CompareCriteria crit =3D new CompareCriteria(rewrittenExpr= , CompareCriteria.EQ, rewrittenWhen); + = + // Check the when to see if this CASE can be rewritten due to = an always true/false when + Criteria rewrittenWhen =3D rewriteCriteria(expr.getWhenCriteri= a(i), procCommand, context, metadata); + if(EvaluateExpressionVisitor.isFullyEvaluatable(rewrittenWhen,= true)) { try { - boolean eval =3D Evaluator.evaluate(crit); + boolean eval =3D Evaluator.evaluate(rewrittenWhen); if(eval) { - // This WHEN will always match, so return the THEN= expression + // WHEN is always true, so just return the THEN return rewriteExpression(expr.getThenExpression(i)= , procCommand, context, metadata); } = - = - // This WHEN will never match, so remove it from the C= ASE + + // WHEN is never true, so just skip this WHEN/THEN pai= r in the lists continue; } catch(Exception e) { // ignore and don't simplify - shouldn't happen - tryToSimplify =3D false; - } = - } else { - tryToSimplify =3D false; - } - = + } + } = + = whens.add(rewrittenWhen); thens.add(rewriteExpression(expr.getThenExpression(i), procCom= mand, context, metadata)); } - = - return simplifyCaseExpression(expr, procCommand,context, whenCount= , whens, thens, metadata); - } = - private static Expression simplifyCaseExpression(AbstractCaseExpressio= n expr, - Command procCommand, - CommandContext cont= ext, - int whenCount, - ArrayList whens, - ArrayList thens, - QueryMetadataInterf= ace metadata) throws QueryValidatorException { - = expr.setElseExpression(rewriteExpression(expr.getElseExpression(),= procCommand, context, metadata)); = Expression elseExpr =3D expr.getElseExpression(); @@ -2246,42 +2313,6 @@ = return expr; } - - private static Expression rewriteCaseExpression(SearchedCaseExpression= expr, Command procCommand, CommandContext context, QueryMetadataInterface = metadata) - throws QueryValidatorException { - int whenCount =3D expr.getWhenCount(); - ArrayList whens =3D new ArrayList(whenCount); - ArrayList thens =3D new ArrayList(whenCount); - - boolean tryToSimplify =3D true; - for (int i =3D 0; i < whenCount; i++) { - = - // Check the when to see if this CASE can be rewritten due to = an always true/false when - Criteria rewrittenWhen =3D rewriteCriteria(expr.getWhenCriteri= a(i), procCommand, context, metadata); - if(tryToSimplify && EvaluateExpressionVisitor.isFullyEvaluatab= le(rewrittenWhen, true)) { - try { - boolean eval =3D Evaluator.evaluate(rewrittenWhen); - if(eval) { - // WHEN is always true, so just return the THEN - return rewriteExpression(expr.getThenExpression(i)= , procCommand, context, metadata); - } = - - // WHEN is never true, so just skip this WHEN/THEN pai= r in the lists - continue; - } catch(Exception e) { - // ignore and don't simplify - shouldn't happen - tryToSimplify =3D false; - } - } else { - tryToSimplify =3D false; - } - = - whens.add(rewrittenWhen); - thens.add(rewriteExpression(expr.getThenExpression(i), procCom= mand, context, metadata)); - } - - return simplifyCaseExpression(expr, procCommand,context, whenCount= , whens, thens, metadata); - } = private static Command rewriteExec(StoredProcedure storedProcedure, Co= mmand procCommand, QueryMetadataInterface metadata, CommandContext context)= throws QueryValidatorException { //After this method, no longer need to display named parameters Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Functi= on.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Function.jav= a 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Function.jav= a 2009-02-19 17:59:09 UTC (rev 476) @@ -62,6 +62,10 @@ return this.name; } = + public void setName(String name) { + this.name =3D name; + } + = /** * Get function arguments * @return Get function arguments Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/SQLSt= ringVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/SQLStringVi= sitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/SQLStringVi= sitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -193,38 +193,18 @@ public void visit(CaseExpression obj) { parts.add(ReservedWords.CASE); parts.add(SPACE); + parts.add(registerNode(obj.getExpression()) ); = + parts.add(SPACE); = - // checking for null compare in decode string case 2969 GCSS - for (int i =3D0; i < obj.getWhenCount(); i++) { = - if (ReservedWords.NULL.equalsIgnoreCase(obj.getWhenExpression(= i).toString() ) ) { - parts.add(ReservedWords.WHEN); - parts.add(SPACE); - parts.add(registerNode(obj.getExpression()) ); - parts.add(SPACE); - parts.add(ReservedWords.IS); - parts.add(SPACE); - parts.add(ReservedWords.NULL); - parts.add(SPACE); - parts.add(ReservedWords.THEN); - parts.add(SPACE); - parts.add(registerNode(obj.getThenExpression(i))); - parts.add(SPACE); - } - } - for (int i =3D 0; i < obj.getWhenCount(); i++) { - if(!ReservedWords.NULL.equalsIgnoreCase(obj.getWhenExpression(= i).toString() ) ) { - parts.add(ReservedWords.WHEN); - parts.add(SPACE); - parts.add(registerNode(obj.getExpression()) ); = - parts.add("=3D"); //$NON-NLS-1$ - parts.add(registerNode(obj.getWhenExpression(i)) ); - parts.add(SPACE); - parts.add(ReservedWords.THEN); - parts.add(SPACE); - parts.add(registerNode(obj.getThenExpression(i))); - parts.add(SPACE); - } + parts.add(ReservedWords.WHEN); + parts.add(SPACE); + parts.add(registerNode(obj.getWhenExpression(i)) ); + parts.add(SPACE); + parts.add(ReservedWords.THEN); + parts.add(SPACE); + parts.add(registerNode(obj.getThenExpression(i))); + parts.add(SPACE); } = if (obj.getElseExpression() !=3D null) { Modified: trunk/engine/src/main/resources/com/metamatrix/query/i18n.propert= ies =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/resources/com/metamatrix/query/i18n.properties 20= 09-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/main/resources/com/metamatrix/query/i18n.properties 20= 09-02-19 17:59:09 UTC (rev 476) @@ -51,9 +51,9 @@ ERR.015.001.0024 =3D Error occurred while taking log10 of {0} ERR.015.001.0025 =3D Pad length must be > 0. ERR.015.001.0026 =3D Error occurred while doing {0} mod {1} -ERR.015.001.0027 =3D Pad character for lpad must be a single character. +ERR.015.001.0027 =3D Pad string for lpad/rpad must have length greater tha= n 0. ERR.015.001.0028 =3D Error occurred while doing {0} ^ {1} -ERR.015.001.0029 =3D Pad character for rpad must be a single character. +ERR.015.001.0029 =3D Pad string for rpad must have length greater than 1. ERR.015.001.0030 =3D Error occurred while taking sign({0}) ERR.015.001.0031 =3D Source and destination character lists must be the sa= me length. ERR.015.001.0032 =3D Error occurred while taking sqrt of {0} Deleted: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/lan= guage/TestCaseExpressionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestCaseExpressionImpl.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestCaseExpressionImpl.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1,152 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.dqp.internal.datamgr.language; - -import com.metamatrix.query.sql.symbol.CaseExpression; -import com.metamatrix.query.sql.symbol.Constant; -import com.metamatrix.query.sql.symbol.ElementSymbol; -import com.metamatrix.query.sql.symbol.TestCaseExpression; - -import junit.framework.TestCase; - -public class TestCaseExpressionImpl extends TestCase { - - /** - * Constructor for TestCaseExpressionImpl. - * @param name - */ - public TestCaseExpressionImpl(String name) { - super(name); - } - - public static CaseExpression helpExample() { - ElementSymbol x =3D TestElementImpl.helpExample("vm1.g1", "e1"); /= /$NON-NLS-1$ //$NON-NLS-2$ - CaseExpression caseExpr =3D new CaseExpression(x, TestCaseExpressi= on.getWhenExpressions(3), TestCaseExpression.getThenExpressions(3)); - caseExpr.setElseExpression(new Constant(new Integer(9999))); - return caseExpr; - } - = - public static CaseExpression helpExampleElementElse() { - ElementSymbol x =3D TestElementImpl.helpExample("vm1.g1", "e1"); /= /$NON-NLS-1$ //$NON-NLS-2$ - CaseExpression caseExpr =3D new CaseExpression(x, TestCaseExpressi= on.getWhenExpressions(3), TestCaseExpression.getThenExpressions(3)); - caseExpr.setElseExpression(x); - return caseExpr; - } - = - public static CaseExpression helpIntExample() { - ElementSymbol x =3D TestElementImpl.helpIntExample("vm1.g1", "e1")= ; //$NON-NLS-1$ //$NON-NLS-2$ - CaseExpression caseExpr =3D new CaseExpression(x, TestCaseExpressi= on.getWhenExpressions(3), TestCaseExpression.getThenExpressions(3)); - caseExpr.setElseExpression(x); - return caseExpr; - } - = - public static CaseExpression helpExampleNullFirst() { - ElementSymbol x =3D TestElementImpl.helpExample("vm1.g1", "e1"); /= /$NON-NLS-1$ //$NON-NLS-2$ - CaseExpression caseExpr =3D new CaseExpression(x, TestCaseExpressi= on.getWhenExpressions(3, 0, true), TestCaseExpression.getThenExpressions(3)= ); - caseExpr.setElseExpression(new Constant(new Integer(9999))); - return caseExpr; - } - = - public static CaseExpression helpExampleNullMiddle() { - ElementSymbol x =3D TestElementImpl.helpExample("vm1.g1", "e1"); /= /$NON-NLS-1$ //$NON-NLS-2$ - CaseExpression caseExpr =3D new CaseExpression(x, TestCaseExpressi= on.getWhenExpressions(3, 1, true), TestCaseExpression.getThenExpressions(3)= ); - caseExpr.setElseExpression(new Constant(new Integer(9999))); - return caseExpr; - } - = - public static CaseExpression helpExampleNullLast() { - ElementSymbol x =3D TestElementImpl.helpExample("vm1.g1", "e1"); /= /$NON-NLS-1$ //$NON-NLS-2$ - CaseExpression caseExpr =3D new CaseExpression(x, TestCaseExpressi= on.getWhenExpressions(3, 2, true), TestCaseExpression.getThenExpressions(3)= ); - caseExpr.setElseExpression(new Constant(new Integer(9999))); - return caseExpr; - } - = - public static CaseExpressionImpl example() throws Exception { - return (CaseExpressionImpl)TstLanguageBridgeFactory.factory.transl= ate(helpExample()); - } - - public static CaseExpressionImpl exampleElementElse() throws Exception= { - return (CaseExpressionImpl)TstLanguageBridgeFactory.factory.transl= ate(helpExampleElementElse()); - } - = - public static CaseExpressionImpl exampleInteger() throws Exception { - return (CaseExpressionImpl)TstLanguageBridgeFactory.factory.transl= ate(helpIntExample()); - } - = - public static CaseExpressionImpl exampleNullFirst() throws Exception { - return (CaseExpressionImpl)TstLanguageBridgeFactory.factory.transl= ate(helpExampleNullFirst()); - } - = - public static CaseExpressionImpl exampleNullMiddle() throws Exception { - return (CaseExpressionImpl)TstLanguageBridgeFactory.factory.transl= ate(helpExampleNullMiddle()); - } - = - public static CaseExpressionImpl exampleNullLast() throws Exception { - return (CaseExpressionImpl)TstLanguageBridgeFactory.factory.transl= ate(helpExampleNullLast()); - } - - public void testGetElseExpression() throws Exception { - assertNotNull(example().getElseExpression()); - CaseExpression expr =3D helpExample(); - expr.setElseExpression(null); - assertNull(TstLanguageBridgeFactory.factory.translate(expr).getEls= eExpression()); - } - - public void testGetExpression() throws Exception { - assertNotNull(example().getExpression()); - } - - public void testGetThenExpression() throws Exception { - assertNotNull(example().getThenExpression(0)); - assertNotNull(example().getThenExpression(1)); - assertNotNull(example().getThenExpression(2)); - } - - public void testGetWhenCount() throws Exception { - assertEquals(3, example().getWhenCount()); - } - - public void testGetWhenExpression() throws Exception { - assertNotNull(example().getWhenExpression(0)); - assertNotNull(example().getWhenExpression(1)); - assertNotNull(example().getWhenExpression(2)); - } - - public void testGetWhenExpressionNullFirst() throws Exception { - assertNotNull(exampleNullFirst().getWhenExpression(0)); - assertNotNull(exampleNullFirst().getWhenExpression(1)); - assertNotNull(exampleNullFirst().getWhenExpression(2)); -} - public void testGetWhenExpressionNullMiddle() throws Exception { - assertNotNull(exampleNullMiddle().getWhenExpression(0)); - assertNotNull(exampleNullMiddle().getWhenExpression(1)); - assertNotNull(exampleNullMiddle().getWhenExpression(2)); - } = - = - public void testGetWhenExpressionNullLast() throws Exception { - assertNotNull(exampleNullLast().getWhenExpression(0)); - assertNotNull(exampleNullLast().getWhenExpression(1)); - assertNotNull(exampleNullLast().getWhenExpression(2)); - } = - -} Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestElementImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestElementImpl.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestElementImpl.java 2009-02-19 17:59:09 UTC (rev 476) @@ -28,6 +28,7 @@ import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IGroup; import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.metadata.runtime.MetadataID.Type; import com.metamatrix.dqp.internal.datamgr.metadata.TestMetadataFactory; import com.metamatrix.query.sql.symbol.ElementSymbol; import com.metamatrix.query.unittest.FakeMetadataObject; @@ -106,7 +107,7 @@ public void testSetMetadataID() throws Exception { Object metadataID =3D TstLanguageBridgeFactory.metadata.getElement= ID("pm1.g1.e1"); //$NON-NLS-1$ ElementImpl element =3D example("pm1.g1", "e1", metadataID); //$NO= N-NLS-1$ //$NON-NLS-2$ - MetadataID connID =3D TstLanguageBridgeFactory.metadataFactory.cre= ateMetadataID(metadataID, MetadataID.TYPE_ELEMENT); + MetadataID connID =3D TstLanguageBridgeFactory.metadataFactory.cre= ateMetadataID(metadataID, Type.TYPE_ELEMENT); element.setMetadataID(connID); assertNotNull(element.getMetadataID()); assertEquals(connID, element.getMetadataID()); Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestInsertImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestInsertImpl.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestInsertImpl.java 2009-02-19 17:59:09 UTC (rev 476) @@ -67,7 +67,7 @@ elements.add(TestElementImpl.helpExample(groupName, "e1")); //$NON= -NLS-1$ = ArrayList values =3D new ArrayList(); - values.add(TestCaseExpressionImpl.helpExample()); + values.add(TestSearchedCaseExpressionImpl.helpExample()); = return new Insert(group, elements, Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/me= tadata/TestMetadataFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/metadata= /TestMetadataFactory.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/metadata= /TestMetadataFactory.java 2009-02-19 17:59:09 UTC (rev 476) @@ -30,8 +30,8 @@ import junit.framework.TestCase; = import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.metadata.runtime.MetadataID.Type; import com.metamatrix.query.unittest.FakeMetadataFacade; import com.metamatrix.query.unittest.FakeMetadataObject; import com.metamatrix.query.unittest.FakeMetadataStore; @@ -108,12 +108,12 @@ public void testCreateMetadataID(){ = try{ = //test create MetadataID for Group - MetadataIDImpl gID =3D (MetadataIDImpl)metadataFactory.createM= etadataID(pm1g1, MetadataID.TYPE_GROUP); + MetadataIDImpl gID =3D (MetadataIDImpl)metadataFactory.createM= etadataID(pm1g1, Type.TYPE_GROUP); assertEquals(gID.getActualMetadataID(), pm1g1); assertEquals(((MetadataIDImpl)gID.getChildIDs().get(0)).getAct= ualMetadataID(), pm1g1e1); = //test create MetadataID for Element - MetadataIDImpl eID =3D (MetadataIDImpl)metadataFactory.createM= etadataID(pm1g1e1, MetadataID.TYPE_ELEMENT); + MetadataIDImpl eID =3D (MetadataIDImpl)metadataFactory.createM= etadataID(pm1g1e1, Type.TYPE_ELEMENT); assertEquals(eID.getActualMetadataID(), pm1g1e1); assertEquals(((MetadataIDImpl)eID.getParentID()).getActualMeta= dataID(), pm1g1); }catch(Exception e){ @@ -124,13 +124,13 @@ = public void testRuntimeMetadata(){ try{ - RuntimeMetadata runtimeMetadata =3D metadataFactory.createRunt= imeMetadata(); - MetadataIDImpl gID =3D (MetadataIDImpl)metadataFactory.createM= etadataID(pm1g1, MetadataID.TYPE_GROUP); + RuntimeMetadata runtimeMetadata =3D metadataFactory.getRuntime= Metadata(); + MetadataIDImpl gID =3D (MetadataIDImpl)metadataFactory.createM= etadataID(pm1g1, Type.TYPE_GROUP); GroupImpl group =3D (GroupImpl)runtimeMetadata.getObject(gID); assertEquals(group.getNameInSource(), "g1"); //$NON-NLS-1$ assertEquals(((MetadataIDImpl)group.getMetadataID()).getActual= MetadataID(), pm1g1); = - MetadataIDImpl eID =3D (MetadataIDImpl)metadataFactory.createM= etadataID(pm1g1e1, MetadataID.TYPE_ELEMENT); + MetadataIDImpl eID =3D (MetadataIDImpl)metadataFactory.createM= etadataID(pm1g1e1, Type.TYPE_ELEMENT); ElementImpl element =3D (ElementImpl)runtimeMetadata.getObject= (eID); assertEquals(element.getLength(), 100); assertEquals(element.getJavaType(), DataTypeManager.DefaultDat= aClasses.STRING); @@ -145,7 +145,7 @@ public void testGetVDBResourcePaths() { String[] expectedPaths =3D new String[] {"my/resource/path"}; //$N= ON-NLS-1$ try { - RuntimeMetadata runtimeMetadata =3D metadataFactory.createRunt= imeMetadata(); + RuntimeMetadata runtimeMetadata =3D metadataFactory.getRuntime= Metadata(); String[] mfPaths =3D metadataFactory.getVDBResourcePaths(); String[] rtmdPaths =3D runtimeMetadata.getVDBResourcePaths(); assertEquals(expectedPaths.length, mfPaths.length); @@ -162,7 +162,7 @@ = public void testGetBinaryVDBResource() { try { - RuntimeMetadata runtimeMetadata =3D metadataFactory.createRunt= imeMetadata(); + RuntimeMetadata runtimeMetadata =3D metadataFactory.getRuntime= Metadata(); byte[] expectedBytes =3D "ResourceContents".getBytes(); //$NON= -NLS-1$ byte[] mfBytes =3D metadataFactory.getBinaryVDBResource(null); byte[] rtmdBytes =3D runtimeMetadata.getBinaryVDBResource(null= ); @@ -180,7 +180,7 @@ = public void testGetCharacterVDBResource() { try { - RuntimeMetadata runtimeMetadata =3D metadataFactory.createRunt= imeMetadata(); + RuntimeMetadata runtimeMetadata =3D metadataFactory.getRuntime= Metadata(); assertEquals("ResourceContents", metadataFactory.getCharacterV= DBResource(null)); //$NON-NLS-1$ assertEquals("ResourceContents", runtimeMetadata.getCharacterV= DBResource(null)); //$NON-NLS-1$ } catch (Exception e) { Modified: trunk/engine/src/test/java/com/metamatrix/query/function/TestFunc= tion.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/function/TestFunction.j= ava 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/query/function/TestFunction.j= ava 2009-02-19 17:59:09 UTC (rev 476) @@ -112,8 +112,8 @@ assertEquals("Didn't get expected result from lpad", expected, act= ual); //$NON-NLS-1$ } = - public static void helpTestLpad(String input, int length, char c, Stri= ng expected) throws FunctionExecutionException { - String actual =3D (String) FunctionMethods.lpad(input, new Integer= (length), new Character(c)); + public static void helpTestLpad(String input, int length, String pad, = String expected) throws FunctionExecutionException { + String actual =3D (String) FunctionMethods.lpad(input, new Integer= (length), pad); assertEquals("Didn't get expected result from lpad", expected, act= ual); //$NON-NLS-1$ } = @@ -122,8 +122,8 @@ assertEquals("Didn't get expected result from rpad", expected, act= ual); //$NON-NLS-1$ } = - public static void helpTestRpad(String input, int length, char c, Stri= ng expected) throws FunctionExecutionException { - String actual =3D (String) FunctionMethods.rpad(input, new Integer= (length), new Character(c)); + public static void helpTestRpad(String input, int length, String c, St= ring expected) throws FunctionExecutionException { + String actual =3D (String) FunctionMethods.rpad(input, new Integer= (length), c); assertEquals("Didn't get expected result from rpad", expected, act= ual); //$NON-NLS-1$ } = @@ -519,152 +519,6 @@ helpConvert(ts, "string", "2003-08-22 22:43:53.003333333"); //$NON= -NLS-1$ //$NON-NLS-2$ } = - /* - * Test for Object decodeInteger(Object, Object) - */ - public void testDecodeIntegerObjectObject() throws FunctionExecutionEx= ception { - decodeIntegerTests(null); - } - - - /* - * Test for Object decodeString(Object, Object) - */ - public void testDecodeStringObjectObject() throws FunctionExecutionExc= eption { - decodeStringTests(null); - } - - /* - * Test for Object decodeInteger(Object, Object, Object) - */ - public void testDecodeIntegerObjectObjectObject() throws FunctionExecu= tionException { - decodeIntegerTests(","); //$NON-NLS-1$ - - } - - /* - * Test for Object decodeString(Object, Object, Object) - */ - public void testDecodeStringObjectObjectObject() throws FunctionExecut= ionException { - decodeStringTests(","); //$NON-NLS-1$ - } - - private void decodeStringTests(String delimiter) throws FunctionExecut= ionException { - String decodeString =3D "a,1,b,2,c, 3, 8"; //$NON-NLS-1$ - - String columnValue =3D "a"; //$NON-NLS-1$ - String expectedResult =3D "1"; //$NON-NLS-1$ - runDecodeStringTest(columnValue, decodeString, expectedResult, del= imiter); - - columnValue =3D "b"; //$NON-NLS-1$ - expectedResult =3D "2"; //$NON-NLS-1$ - runDecodeStringTest(columnValue, decodeString, expectedResult, del= imiter); - - columnValue =3D "g"; //$NON-NLS-1$ - expectedResult =3D "8"; //$NON-NLS-1$ - runDecodeStringTest(columnValue, decodeString, expectedResult, del= imiter); - - decodeString =3D decodeString.substring(0, decodeString.length() -= 3); - columnValue =3D "6"; //$NON-NLS-1$ - expectedResult =3D "6"; //$NON-NLS-1$ - runDecodeStringTest(columnValue, decodeString, expectedResult, del= imiter); - - decodeString =3D "a,1,null,2, g,5"; //$NON-NLS-1$ - columnValue =3D null; - expectedResult =3D "2"; //$NON-NLS-1$ - runDecodeStringTest(columnValue, decodeString, expectedResult, del= imiter); - - columnValue =3D "8"; //$NON-NLS-1$ - expectedResult =3D "8"; //$NON-NLS-1$ - runDecodeStringTest(columnValue, decodeString, expectedResult, del= imiter); - - decodeString =3D "'a', 1, ' b', 2, 'c', '3'"; //$NON-NLS-1$ - columnValue =3D "c"; //$NON-NLS-1$ - expectedResult =3D "3"; //$NON-NLS-1$ - runDecodeStringTest(columnValue, decodeString, expectedResult, del= imiter); - - decodeString =3D "' ', 1, 'b', 2, 'c', '3'"; //$NON-NLS-1$ - columnValue =3D " "; //$NON-NLS-1$ - expectedResult =3D "1"; //$NON-NLS-1$ - runDecodeStringTest(columnValue, decodeString, expectedResult, del= imiter); - } - - private void decodeIntegerTests(String delimiter) throws FunctionExecu= tionException { - - String decodeString =3D "a,1,b,2,c, 3, 8"; //$NON-NLS-1$ - - String columnValue =3D "a"; //$NON-NLS-1$ - Integer expectedResult =3D new Integer(1); - runDecodeIntegerTest(columnValue, decodeString, expectedResult, de= limiter); - - columnValue =3D "b"; //$NON-NLS-1$ - expectedResult =3D new Integer(2); - runDecodeIntegerTest(columnValue, decodeString, expectedResult, de= limiter); - - columnValue =3D "g"; //$NON-NLS-1$ - expectedResult =3D new Integer(8); - runDecodeIntegerTest(columnValue, decodeString, expectedResult, de= limiter); - - decodeString =3D decodeString.substring(0, decodeString.length() -= 3); - columnValue =3D "6"; //$NON-NLS-1$ - expectedResult =3D new Integer(6); - runDecodeIntegerTest(columnValue, decodeString, expectedResult, de= limiter); - - decodeString =3D "a,1,null,2, g,5"; //$NON-NLS-1$ - columnValue =3D null; - expectedResult =3D new Integer(2); - runDecodeIntegerTest(columnValue, decodeString, expectedResult, de= limiter); - - columnValue =3D "8"; //$NON-NLS-1$ - expectedResult =3D new Integer(8); - runDecodeIntegerTest(columnValue, decodeString, expectedResult, de= limiter); - - decodeString =3D "'a', 1, ' b', 2, 'c', '3'"; //$NON-NLS-1$ - columnValue =3D "c"; //$NON-NLS-1$ - expectedResult =3D new Integer(3); - runDecodeIntegerTest(columnValue, decodeString, expectedResult, de= limiter); - - Integer intColumnValue =3D new Integer(12); - expectedResult =3D new Integer(12); - runDecodeIntegerTest(intColumnValue, decodeString, expectedResult,= delimiter); - - - } - - private void runDecodeIntegerTest(Object columnValue, - String decodeString, - Object expectedResult, - String delimiter) throws FunctionExe= cutionException { - Object result =3D null; - if (delimiter =3D=3D null) { - result =3D FunctionMethods.decodeInteger(columnValue, decodeSt= ring); - } else { - result =3D FunctionMethods.decodeInteger(columnValue, decodeSt= ring, delimiter); - } - - assertEquals("Decode did not properly translate column value: " + = columnValue, //$NON-NLS-1$ - expectedResult, - result); - - } - - private void runDecodeStringTest(Object columnValue, - String decodeString, - Object expectedResult, - String delimiter) throws FunctionExec= utionException { - Object result =3D null; - if (delimiter =3D=3D null) { - result =3D FunctionMethods.decodeString(columnValue, decodeStr= ing); - } else { - result =3D FunctionMethods.decodeString(columnValue, decodeStr= ing, delimiter); - } - - assertEquals("Decode did not properly translate column value: " + = columnValue, //$NON-NLS-1$ - expectedResult, - result); - - } - public void testAscii1() throws FunctionExecutionException { Integer code =3D (Integer) FunctionMethods.ascii(new Character(' '= )); assertEquals("Didn't get expected code", 32, code.intValue()); //$= NON-NLS-1$ @@ -704,17 +558,17 @@ } = public void testNvl1() { - String ret =3D (String) FunctionMethods.nvl("x", "y"); //$NON-NLS-= 1$ //$NON-NLS-2$ + String ret =3D (String) FunctionMethods.ifnull("x", "y"); //$NON-N= LS-1$ //$NON-NLS-2$ assertEquals("Didn't get expected value", "x", ret); //$NON-NLS-1$= //$NON-NLS-2$ } = public void testNvl2() { - String ret =3D (String) FunctionMethods.nvl(null, "y"); //$NON-NLS= -1$ + String ret =3D (String) FunctionMethods.ifnull(null, "y"); //$NON-= NLS-1$ assertEquals("Didn't get expected value", "y", ret); //$NON-NLS-1$= //$NON-NLS-2$ } = public void testNvl3() { - String ret =3D (String) FunctionMethods.nvl(null, null); + String ret =3D (String) FunctionMethods.ifnull(null, null); assertEquals("Didn't get expected value", null, ret); //$NON-NLS-1$ } = @@ -751,16 +605,20 @@ } = public void testLpad4() throws FunctionExecutionException { - helpTestLpad("xx", 1, "xx"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestLpad("xx", 1, "x"); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testLpad5() throws FunctionExecutionException { - helpTestLpad("", 4, 'x', "xxxx"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestLpad("", 4, "x", "xxxx"); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testLpad6() throws FunctionExecutionException { - helpTestLpad("10", 6, '0', "000010"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestLpad("10", 6, "0", "000010"); //$NON-NLS-1$ //$NON-NLS-2$ } + = + public void testLpad7() throws FunctionExecutionException { + helpTestLpad("x", 4, "yq", "qyqx" ); //$NON-NLS-1$ //$NON-NLS-2$ //$N= ON-NLS-3$ //$NON-NLS-4$ + } = public void testRpad1() throws FunctionExecutionException { helpTestRpad("x", 4, "x "); //$NON-NLS-1$ //$NON-NLS-2$ @@ -775,15 +633,15 @@ } = public void testRpad4() throws FunctionExecutionException { - helpTestRpad("xx", 1, "xx"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestRpad("xx", 1, "x"); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testRpad5() throws FunctionExecutionException { - helpTestRpad("", 4, 'x', "xxxx"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestRpad("", 4, "x", "xxxx"); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testRpad6() throws FunctionExecutionException { - helpTestRpad("10", 6, '0', "100000"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestRpad("10", 6, "0", "100000"); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testTranslate1() throws FunctionExecutionException { Modified: trunk/engine/src/test/java/com/metamatrix/query/function/TestFunc= tionLibrary.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/function/TestFunctionLi= brary.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/query/function/TestFunctionLi= brary.java 2009-02-19 17:59:09 UTC (rev 476) @@ -123,7 +123,7 @@ private void helpFindFunction(String fname, Class[] types, FunctionDescri= ptor expected) { FunctionDescriptor actual =3D library.findFunction(fname, types); = - assertEquals("Function names do not match: ", expected.getName(), = actual.getName()); //$NON-NLS-1$ + assertEquals("Function names do not match: ", expected.getName().t= oLowerCase(), actual.getName().toLowerCase()); //$NON-NLS-1$ assertEquals("Arg lengths do not match: ", expected.getTypes().len= gth, actual.getTypes().length); //$NON-NLS-1$ } = @@ -731,24 +731,17 @@ } = public void testInvokeLpad2() { - helpInvokeMethod("lpad", new Object[] { "x", new Integer(3), new C= haracter('y') }, "yyx" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + helpInvokeMethod("lpad", new Object[] { "x", new Integer(3), "y" }= , "yyx" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } - - public void testInvokeLpad3() { - helpInvokeMethod("lpad", new Object[] { "x", new Integer(3), "y" }= , "yyx" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - } - + = public void testInvokeRpad1() { helpInvokeMethod("rpad", new Object[] { "x", new Integer(3) }, "x = " ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } = public void testInvokeRpad2() { - helpInvokeMethod("rpad", new Object[] { "x", new Integer(3), new C= haracter('y') }, "xyy" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + helpInvokeMethod("rpad", new Object[] { "x", new Integer(3), "y" }= , "xyy" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } = - public void testInvokeRpad3() { - helpInvokeMethod("rpad", new Object[] { "x", new Integer(3), "y" }= , "xyy" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - } public void testInvokeTranslate() { helpInvokeMethod("translate", new Object[] { "ababcd", "ad", "da" = }, "dbdbca" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$N= ON-NLS-5$ } @@ -1021,10 +1014,6 @@ helpInvokeMethod("repeat", new Object[] {new String("cat"), new Integer(= 3)}, new String("catcatcat")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } = - public void testInvokeSpace() { - helpInvokeMethod("space", new Object[] {new Integer(3)}, new String(" = ")); //$NON-NLS-1$ //$NON-NLS-2$ - } - public void testInvokeChar() { helpInvokeMethod("char", new Object[] {new Integer(32) }, new Character(= ' ')); //$NON-NLS-1$ } @@ -1207,51 +1196,7 @@ tsUtil.createTim= e(23, 59, 59)}, tsUtil.createTim= estamp(103, 4, 15, 23, 59, 59, 0)); = } = - - /** decodeInteger */ = - public void testInvokeDecode1() { - helpInvokeMethod("decodeInteger", new Object[] {"integer", "intege= r, 4", ","}, new Integer(4)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$= NON-NLS-4$ - } - = - public void testInvokeDecode2() { - helpInvokeMethod("decodeString", new Object[] {"string", "string, = 12, integer, 4", ","}, "12"); //$NON-NLS-1$ //$= NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - } = - public void testInvokeDecode3() { - helpInvokeMethod("decodeString", new Object[] {"Not Nullable", "No= t Nullable, 1, Nullable, 2, Unknown, 3", ","}, "1"); //$NON-NLS-1$ //$NON-N= LS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - helpInvokeMethod("convert", new Object[] {"1", "integer"}, new Int= eger(1)); //$NON-N= LS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testInvokeDecode4() { - helpInvokeMethod("decodeString", new Object[] {"Unknown", "Not Nul= lable, YES, Nullable, NO, Unknown, ' '", ","}, " "); //$NON-NLS-1$ //$NON-N= LS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - } - - public void testInvokeDecode5() { - helpInvokeMethod("decodeString", new Object[] {"true", "true, 2, f= alse, 1"}, new String("2")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$N= ON-NLS-4$ - helpInvokeMethod("convert", new Object[] {"2", "short"}, new Short= ((short)2)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - = - public void testInvokeDecode6() { - helpInvokeMethod("decodeString", new Object[] {"string", "char, \'= , string, \""}, "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS= -4$ - } = - - public void testInvokeDecode7() { - helpInvokeMethod("decodeString", new Object[] {"Searchable", "Sear= chable, 3, All Except Like, 2, Like Only, 1, Unsearchable, 0"}, new String(= "3")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - helpInvokeMethod("convert", new Object[] {"3", "short"}, new Short= ((short)3)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } = - - public void testInvokeDecode8() { - helpInvokeMethod("decodeString", new Object[] {"true", "true, 2, f= alse, 1"}, new String("2")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$N= ON-NLS-4$ - helpInvokeMethod("decodeString", new Object[] {"2", "2, false, 1, = true"}, new String("false")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$= NON-NLS-4$ - helpInvokeMethod("convert", new Object[] {"false", "boolean"}, new= Boolean(false)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - helpInvokeMethod("convert", new Object[] {"true", "boolean"}, new = Boolean(true)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } = - - public void testInvokeDecode9() { - helpInvokeMethod("decodeString", new Object[] {"JAVA_OBJECT", "JAV= A_OBJECT,2000 , DISTINCT, 2001, STRUCT, 2002"}, new String("2000")); //$NON= -NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - helpInvokeMethod("convert", new Object[] {"2000", "integer"}, new = Integer(2000)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - = public void testInvokeBitand() { helpInvokeMethod("bitand", new Object[] {new Integer(0xFFF), new I= nteger(0x0F0)}, new Integer(0x0F0)); //$NON-NLS-1$ } Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoi= nOptimization.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoinOptim= ization.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoinOptim= ization.java 2009-02-19 17:59:09 UTC (rev 476) @@ -31,6 +31,7 @@ import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.api.exception.query.QueryParserException; import com.metamatrix.api.exception.query.QueryResolverException; +import com.metamatrix.connector.api.SourceSystemFunctions; import com.metamatrix.query.optimizer.capabilities.BasicSourceCapabilities; import com.metamatrix.query.optimizer.capabilities.FakeCapabilitiesFinder; import com.metamatrix.query.optimizer.capabilities.SourceCapabilities.Capa= bility; @@ -936,7 +937,7 @@ caps.setCapabilitySupport(Capability.QUERY_ORDERBY, true); = caps.setCapabilitySupport(Capability.FUNCTION, true); caps.setCapabilitySupport(Capability.QUERY_FROM_INLINE_VIEWS, true= ); - caps.setFunctionSupport("nvl", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.IFNULL, true); //$NO= N-NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = FakeMetadataFacade metadata =3D FakeMetadataFactory.example1Cached= (); @@ -944,7 +945,7 @@ ProcessorPlan plan =3D TestOptimizer.helpPlan(sql, metadata, null, capFinder, = new String[] { = - "SELECT v_0.c_0 FROM pm1.g1 AS g= _0 LEFT OUTER JOIN (SELECT nvl(g_1.e2, 1) AS c_0 FROM pm1.g2 AS g_1) AS v_0= ON g_0.e2 =3D v_0.c_0" }, //$NON-NLS-1$ + "SELECT v_0.c_0 FROM pm1.g1 AS g= _0 LEFT OUTER JOIN (SELECT ifnull(g_1.e2, 1) AS c_0 FROM pm1.g2 AS g_1) AS = v_0 ON g_0.e2 =3D v_0.c_0" }, //$NON-NLS-1$ TestOptimizer.ComparisonMode.EXA= CT_COMMAND_STRING); = = TestOptimizer.checkNodeTypes(plan, TestOptimizer.FULL_PUSHDOWN); = = Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestLim= it.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestLimit.jav= a 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestLimit.jav= a 2009-02-19 17:59:09 UTC (rev 476) @@ -266,7 +266,7 @@ = String sql =3D "SELECT * FROM pm1.g1 limit 50, 100";//$NON-NLS-1$ String[] expectedSql =3D new String[] { - "SELECT pm1.g1.e1, pm1.g1.e2, pm1.g1.e3, pm1.g1.e4 FROM pm1.g1= LIMIT (100 + 50)" //$NON-NLS-1$ + "SELECT pm1.g1.e1 AS c_0, pm1.g1.e2 AS c_1, pm1.g1.e3 AS c_2, = pm1.g1.e4 AS c_3 FROM pm1.g1 LIMIT (100 + 50)" //$NON-NLS-1$ }; ProcessorPlan plan =3D TestOptimizer.helpPlan(sql, FakeMetadataFac= tory.example1Cached(), = null, capFinder, expec= tedSql, TestOptimizer.ComparisonMode.EXACT_COMMAND_STRING); = @@ -532,7 +532,7 @@ = String sql =3D "SELECT * FROM pm1.g1 UNION SELECT * FROM PM1.g2 LI= MIT 50, 100";//$NON-NLS-1$ String[] expectedSql =3D new String[] { - "SELECT PM1.g2.e1, PM1.g2.e2, PM1.g2.e3, PM1.g2.e4 FROM PM1.g2= LIMIT (100 + 50)", "SELECT pm1.g1.e1, pm1.g1.e2, pm1.g1.e3, pm1.g1.e4 FROM= pm1.g1 LIMIT (100 + 50)" //$NON-NLS-1$ //$NON-NLS-2$ + "SELECT PM1.g2.e1 AS c_0, PM1.g2.e2 AS c_1, PM1.g2.e3 AS c_2, = PM1.g2.e4 AS c_3 FROM PM1.g2 LIMIT (100 + 50)", "SELECT pm1.g1.e1 AS c_0, p= m1.g1.e2 AS c_1, pm1.g1.e3 AS c_2, pm1.g1.e4 AS c_3 FROM pm1.g1 LIMIT (100 = + 50)" //$NON-NLS-1$ //$NON-NLS-2$ }; ProcessorPlan plan =3D TestOptimizer.helpPlan(sql, FakeMetadataFac= tory.example1Cached(), = null, capFinder, expec= tedSql, TestOptimizer.ComparisonMode.EXACT_COMMAND_STRING); = @@ -598,7 +598,7 @@ = String sql =3D "SELECT * from (SELECT pm1.g1.e1 FROM pm1.g1 LIMIT = 10, 100) x LIMIT 20, 75";//$NON-NLS-1$ String[] expectedSql =3D new String[] { - "SELECT pm1.g1.e1 FROM pm1.g1 LIMIT CASE WHEN (75 + (20 + 10))= < (100 + 10) THEN (75 + (20 + 10)) ELSE (100 + 10) END" //$NON-NLS-1$ + "SELECT pm1.g1.e1 AS c_0 FROM pm1.g1 LIMIT CASE WHEN (75 + (20= + 10)) < (100 + 10) THEN (75 + (20 + 10)) ELSE (100 + 10) END" //$NON-NLS-= 1$ }; ProcessorPlan plan =3D TestOptimizer.helpPlan(sql, FakeMetadataFac= tory.example1Cached(), = null, capFinder, expec= tedSql, TestOptimizer.ComparisonMode.EXACT_COMMAND_STRING); = @@ -632,7 +632,7 @@ = String sql =3D "SELECT * from (SELECT pm1.g1.e1 FROM pm1.g1 LIMIT = 10, 100) x LIMIT 20, 75";//$NON-NLS-1$ String[] expectedSql =3D new String[] { - "SELECT pm1.g1.e1 FROM pm1.g1 LIMIT (20 + 10), CASE WHEN 75 < = 100 THEN 75 ELSE 100 END" //$NON-NLS-1$ + "SELECT pm1.g1.e1 AS c_0 FROM pm1.g1 LIMIT (20 + 10), CASE WHE= N 75 < 100 THEN 75 ELSE 100 END" //$NON-NLS-1$ }; ProcessorPlan plan =3D TestOptimizer.helpPlan(sql, FakeMetadataFac= tory.example1Cached(), = null, capFinder, expec= tedSql, TestOptimizer.ComparisonMode.EXACT_COMMAND_STRING); = Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOpt= imizer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer= .java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer= .java 2009-02-19 17:59:09 UTC (rev 476) @@ -39,6 +39,7 @@ import com.metamatrix.api.exception.query.QueryResolverException; import com.metamatrix.api.exception.query.QueryValidatorException; import com.metamatrix.common.types.DataTypeManager; +import com.metamatrix.connector.api.SourceSystemFunctions; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.query.analysis.AnalysisRecord; import com.metamatrix.query.mapping.relational.QueryNode; @@ -2505,7 +2506,7 @@ caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE, true); caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE_EQ, true); caps.setCapabilitySupport(Capability.FUNCTION, true); - caps.setFunctionSupport("upper", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.UCASE, true); //$NON= -NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = // Add join capability to pm1 @@ -2515,7 +2516,7 @@ "SELECT e1 FROM pm1.g1 WHERE upper(e1) =3D 'X'", //$NON-NLS-1$ metadata, null, capFinder, - new String[] {"SELECT e1 FROM pm1.g1 WHERE upper(e1) =3D 'X'"}= , //$NON-NLS-1$ + new String[] {"SELECT e1 FROM pm1.g1 WHERE ucase(e1) =3D 'X'"}= , //$NON-NLS-1$ SHOULD_SUCCEED ); = checkNodeTypes(plan, FULL_PUSHDOWN); = = @@ -2528,8 +2529,8 @@ caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE, true); caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE_EQ, true); caps.setCapabilitySupport(Capability.FUNCTION, true); - caps.setFunctionSupport("upper", true); //$NON-NLS-1$ - caps.setFunctionSupport("lower", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.UCASE, true); //$NON= -NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.LCASE, true); //$NON= -NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = // Add join capability to pm1 @@ -2539,7 +2540,7 @@ "SELECT lower(e1) FROM pm1.g1 WHERE upper(e1) =3D 'X'", //$NO= N-NLS-1$ metadata, null, capFinder, - new String[] {"SELECT lower(e1) FROM pm1.g1 WHERE upper(e1) = =3D 'X'"}, //$NON-NLS-1$ + new String[] {"SELECT lower(e1) FROM pm1.g1 WHERE ucase(e1) = =3D 'X'"}, //$NON-NLS-1$ SHOULD_SUCCEED ); = checkNodeTypes(plan, FULL_PUSHDOWN); = = @@ -2552,8 +2553,8 @@ caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE, true); caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE_EQ, true); caps.setCapabilitySupport(Capability.FUNCTION, true); - caps.setFunctionSupport("upper", true); //$NON-NLS-1$ - caps.setFunctionSupport("lower", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.UCASE, true); //$NON= -NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.LCASE, true); //$NON= -NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = // Add join capability to pm1 @@ -2563,7 +2564,7 @@ "SELECT lower(e1), upper(e1), e2 FROM pm1.g1 WHERE upper(e1) = =3D 'X'", //$NON-NLS-1$ metadata, null, capFinder, - new String[] {"SELECT lower(e1), upper(e1), e2 FROM pm1.g1 WHE= RE upper(e1) =3D 'X'"}, //$NON-NLS-1$ + new String[] {"SELECT lower(e1), upper(e1), e2 FROM pm1.g1 WHE= RE ucase(e1) =3D 'X'"}, //$NON-NLS-1$ SHOULD_SUCCEED ); = checkNodeTypes(plan, FULL_PUSHDOWN); = = @@ -2576,8 +2577,8 @@ caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE, true); caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE_EQ, true); caps.setCapabilitySupport(Capability.FUNCTION, true); - caps.setFunctionSupport("upper", true); //$NON-NLS-1$ - caps.setFunctionSupport("lower", false); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.UCASE, true); //$NON= -NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.LCASE, false); //$NO= N-NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = // Add join capability to pm1 @@ -2587,7 +2588,7 @@ "SELECT lower(e1), upper(e1) FROM pm1.g1 WHERE upper(e1) =3D '= X'", //$NON-NLS-1$ metadata, null, capFinder, - new String[] {"SELECT e1 FROM pm1.g1 WHERE upper(e1) =3D 'X'"}= , //$NON-NLS-1$ + new String[] {"SELECT e1 FROM pm1.g1 WHERE ucase(e1) =3D 'X'"}= , //$NON-NLS-1$ SHOULD_SUCCEED ); = checkNodeTypes(plan, new int[] { @@ -2615,8 +2616,8 @@ caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE, true); caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE_EQ, true); caps.setCapabilitySupport(Capability.FUNCTION, true); - caps.setFunctionSupport("upper", true); //$NON-NLS-1$ - caps.setFunctionSupport("lower", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.UCASE, true); //$NON= -NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.LCASE, true); //$NON= -NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = // Add join capability to pm1 @@ -2626,7 +2627,7 @@ "SELECT x FROM (SELECT lower(e1) AS x, upper(e1) AS y FROM pm1= .g1 WHERE upper(e1) =3D 'X') AS z", //$NON-NLS-1$ metadata, null, capFinder, - new String[] {"SELECT lower(e1) FROM pm1.g1 WHERE upper(e1) = =3D 'X'"}, //$NON-NLS-1$ + new String[] {"SELECT lcase(e1) FROM pm1.g1 WHERE ucase(e1) = =3D 'X'"}, //$NON-NLS-1$ SHOULD_SUCCEED ); = checkNodeTypes(plan, FULL_PUSHDOWN); = = @@ -2639,8 +2640,8 @@ caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE, true); caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE_EQ, true); caps.setCapabilitySupport(Capability.FUNCTION, true); - caps.setFunctionSupport("upper", true); //$NON-NLS-1$ - caps.setFunctionSupport("lower", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.UCASE, true); //$NON= -NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.LCASE, true); //$NON= -NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = // Add join capability to pm1 @@ -2650,7 +2651,7 @@ "SELECT y, e, x FROM (SELECT lower(e1) AS x, upper(e1) AS y, 5= as z, e1 AS e FROM pm1.g1 WHERE upper(e1) =3D 'X') AS w", //$NON-NLS-1$ metadata, null, capFinder, - new String[] {"SELECT upper(e1), e1, lower(e1) FROM pm1.g1 WHE= RE upper(e1) =3D 'X'"}, //$NON-NLS-1$ + new String[] {"SELECT ucase(e1), e1, lcase(e1) FROM pm1.g1 WHE= RE ucase(e1) =3D 'X'"}, //$NON-NLS-1$ SHOULD_SUCCEED ); = checkNodeTypes(plan, FULL_PUSHDOWN); = = @@ -2700,8 +2701,8 @@ caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE_EQ, true); caps.setCapabilitySupport(Capability.FUNCTION, true); caps.setCapabilitySupport(Capability.QUERY_ORDERBY, true); - caps.setFunctionSupport("upper", true); //$NON-NLS-1$ - caps.setFunctionSupport("lower", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.UCASE, true); //$NON= -NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.LCASE, true); //$NON= -NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = // Add join capability to pm1 @@ -2711,7 +2712,7 @@ "SELECT e1, lower(e1) FROM pm1.g1 WHERE upper(e1) =3D 'X' ORDE= R BY e1", //$NON-NLS-1$ metadata, null, capFinder, - new String[] {"SELECT e1, lower(e1) FROM pm1.g1 WHERE upper(e1= ) =3D 'X' ORDER BY e1"}, //$NON-NLS-1$ + new String[] {"SELECT e1, lcase(e1) FROM pm1.g1 WHERE ucase(e1= ) =3D 'X' ORDER BY e1"}, //$NON-NLS-1$ SHOULD_SUCCEED ); = checkNodeTypes(plan, FULL_PUSHDOWN); = = @@ -2726,8 +2727,8 @@ caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE_EQ, true); caps.setCapabilitySupport(Capability.FUNCTION, true); caps.setCapabilitySupport(Capability.QUERY_ORDERBY, true); - caps.setFunctionSupport("upper", true); //$NON-NLS-1$ - caps.setFunctionSupport("lower", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.UCASE, true); //$NON= -NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.LCASE, true); //$NON= -NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = // Add join capability to pm1 @@ -2737,7 +2738,7 @@ "SELECT e1, lower(e1) AS x FROM pm1.g1 WHERE upper(e1) =3D 'X'= ORDER BY x", //$NON-NLS-1$ metadata, null, capFinder, - new String[] {"SELECT e1, lower(e1) AS x FROM pm1.g1 WHERE upp= er(e1) =3D 'X' ORDER BY x"}, //$NON-NLS-1$ + new String[] {"SELECT e1, lcase(e1) AS x FROM pm1.g1 WHERE uca= se(e1) =3D 'X' ORDER BY x"}, //$NON-NLS-1$ SHOULD_SUCCEED ); = checkNodeTypes(plan, FULL_PUSHDOWN); = = @@ -2752,8 +2753,8 @@ caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE_EQ, true); caps.setCapabilitySupport(Capability.FUNCTION, true); caps.setCapabilitySupport(Capability.QUERY_ORDERBY, true); - caps.setFunctionSupport("upper", true); //$NON-NLS-1$ - caps.setFunctionSupport("lower", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.UCASE, true); //$NON= -NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.LCASE, true); //$NON= -NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = // Add join capability to pm1 @@ -2763,7 +2764,7 @@ "SELECT e1, x FROM (SELECT e1, lower(e1) AS x FROM pm1.g1 WHER= E upper(e1) =3D 'X') AS z ORDER BY x", //$NON-NLS-1$ metadata, null, capFinder, - new String[] {"SELECT e1, lower(e1) AS EXPR FROM pm1.g1 WHERE = upper(e1) =3D 'X' ORDER BY EXPR"}, //$NON-NLS-1$ + new String[] {"SELECT e1, lcase(e1) AS EXPR FROM pm1.g1 WHERE = ucase(e1) =3D 'X' ORDER BY EXPR"}, //$NON-NLS-1$ SHOULD_SUCCEED ); = checkNodeTypes(plan, FULL_PUSHDOWN); = = @@ -2777,7 +2778,7 @@ caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE_EQ, true); caps.setCapabilitySupport(Capability.QUERY_FROM_JOIN, true); caps.setCapabilitySupport(Capability.FUNCTION, true); - caps.setFunctionSupport("upper", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.UCASE, true); //$NON= -NLS-1$ caps.setFunctionSupport("convert", true); //$NON-NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = @@ -2788,7 +2789,7 @@ "SELECT pm1.g1.e1, pm1.g2.e3 FROM pm1.g1, pm1.g2 WHERE pm1.g1.= e1 =3D convert(pm1.g2.e2, string) AND upper(pm1.g1.e1) =3D 'X'", //$NON-NL= S-1$ metadata, null, capFinder, - new String[] {"SELECT pm1.g1.e1, pm1.g2.e3 FROM pm1.g1, pm1.g2= WHERE (pm1.g1.e1 =3D convert(pm1.g2.e2, string)) AND (upper(pm1.g1.e1) =3D= 'X') AND (upper(convert(pm1.g2.e2, string)) =3D 'X')"}, //$NON-NLS-1$ + new String[] {"SELECT pm1.g1.e1, pm1.g2.e3 FROM pm1.g1, pm1.g2= WHERE (pm1.g1.e1 =3D convert(pm1.g2.e2, string)) AND (ucase(pm1.g1.e1) =3D= 'X') AND (ucase(convert(pm1.g2.e2, string)) =3D 'X')"}, //$NON-NLS-1$ SHOULD_SUCCEED ); = checkNodeTypes(plan, FULL_PUSHDOWN); = = @@ -2802,7 +2803,7 @@ caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE_EQ, true); caps.setCapabilitySupport(Capability.QUERY_FROM_JOIN, true); caps.setCapabilitySupport(Capability.FUNCTION, true); - caps.setFunctionSupport("upper", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.UCASE, true); //$NON= -NLS-1$ caps.setFunctionSupport("convert", true); //$NON-NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = @@ -2813,7 +2814,7 @@ "SELECT pm1.g1.e1, pm1.g2.e3 FROM pm1.g1, pm1.g2, pm1.g3 WHERE= pm1.g1.e1 =3D convert(pm1.g2.e2, string) AND pm1.g1.e1 =3D concat(pm1.g3.e= 1, 'a') AND upper(pm1.g1.e1) =3D 'X'", //$NON-NLS-1$ metadata, null, capFinder, - new String[] {"SELECT pm1.g1.e1, pm1.g2.e3 FROM pm1.g1, pm1.g2= WHERE (pm1.g1.e1 =3D convert(pm1.g2.e2, string)) AND (upper(pm1.g1.e1) =3D= 'X') AND (upper(convert(pm1.g2.e2, string)) =3D 'X')", //$NON-NLS-1$ + new String[] {"SELECT pm1.g1.e1, pm1.g2.e3 FROM pm1.g1, pm1.g2= WHERE (pm1.g1.e1 =3D convert(pm1.g2.e2, string)) AND (ucase(pm1.g1.e1) =3D= 'X') AND (ucase(convert(pm1.g2.e2, string)) =3D 'X')", //$NON-NLS-1$ "SELECT pm1.g3.e1 FROM pm1.g3"}, //$NON-NLS-1$ SHOULD_SUCCEED ); = @@ -2843,7 +2844,7 @@ caps.setCapabilitySupport(Capability.QUERY_WHERE_COMPARE_EQ, true); caps.setCapabilitySupport(Capability.QUERY_FROM_JOIN, true); caps.setCapabilitySupport(Capability.FUNCTION, true); - caps.setFunctionSupport("upper", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.UCASE, true); //$NON= -NLS-1$ caps.setFunctionSupport("convert", true); //$NON-NLS-1$ capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$ = @@ -2854,7 +2855,7 @@ "SELECT pm1.g1.e1, pm1.g2.e3 FROM pm1.g1, pm1.g2, (SELECT e1 A= S x FROM pm1.g3) AS g WHERE pm1.g1.e1 =3D convert(pm1.g2.e2, string) AND pm= 1.g1.e1 =3D concat(g.x, 'a') AND upper(pm1.g1.e1) =3D 'X'", //$NON-NLS-1$ metadata, null, capFinder, - new String[] {"SELECT pm1.g1.e1, pm1.g2.e3 FROM pm1.g1, pm1.g2= WHERE (pm1.g1.e1 =3D convert(pm1.g2.e2, string)) AND (upper(pm1.g1.e1) =3D= 'X') AND (upper(convert(pm1.g2.e2, string)) =3D 'X')", //$NON-NLS-1$ + new String[] {"SELECT pm1.g1.e1, pm1.g2.e3 FROM pm1.g1, pm1.g2= WHERE (pm1.g1.e1 =3D convert(pm1.g2.e2, string)) AND (ucase(pm1.g1.e1) =3D= 'X') AND (ucase(convert(pm1.g2.e2, string)) =3D 'X')", //$NON-NLS-1$ "SELECT e1 FROM pm1.g3"}, //$NON-NLS-1$ SHOULD_SUCCEED ); = @@ -3508,7 +3509,7 @@ caps.setCapabilitySupport(Capability.QUERY_FROM_JOIN, true); caps.setCapabilitySupport(Capability.QUERY_FROM_JOIN_SELFJOIN, tru= e); caps.setCapabilitySupport(Capability.FUNCTION, true); - caps.setFunctionSupport("||", true); //$NON-NLS-1$ + caps.setFunctionSupport(SourceSystemFunctions.CONCAT, true); //$NO= N-NLS-1$ caps.setFunctionSupport("convert", true); //$NON-NLS-1$ capFinder.addCapabilities("BQT1", caps); //$NON-NLS-1$ = @@ -7156,7 +7157,7 @@ = ProcessorPlan plan =3D helpPlan("select * from (select v1.e1, v2.e= 1 as e1_1, v1.e2, v2.e2 as e2_2 from (select * from vm1.g7 where vm1.g7.e2 = =3D 1) v1 left outer join (select * from vm1.g7 where vm1.g7.e2 =3D 1) v2 o= n v1.e2 =3D v2.e2) as v3 where v3.e2 =3D 1", metadata, //$NON-NLS-1$ null, capFinder, - new String[] { "SELECT CASE WHEN g_0.e1=3D'S' THEN 'Pay' WHEN = g_0.e1=3D'P' THEN 'Rec' ELSE g_0.e1 END, CASE WHEN g_1.e1=3D'S' THEN 'Pay' = WHEN g_1.e1=3D'P' THEN 'Rec' ELSE g_1.e1 END, g_0.e2, g_1.e2 FROM pm1.g1 AS= g_0 LEFT OUTER JOIN pm1.g1 AS g_1 ON g_1.e2 =3D 1 WHERE g_0.e2 =3D 1" }, C= omparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$ + new String[] { "SELECT CASE WHEN g_0.e1 =3D 'S' THEN 'Pay' WHE= N g_0.e1 =3D 'P' THEN 'Rec' ELSE g_0.e1 END, CASE WHEN g_1.e1 =3D 'S' THEN = 'Pay' WHEN g_1.e1 =3D 'P' THEN 'Rec' ELSE g_1.e1 END, g_0.e2, g_1.e2 FROM p= m1.g1 AS g_0 LEFT OUTER JOIN pm1.g1 AS g_1 ON g_1.e2 =3D 1 WHERE g_0.e2 =3D= 1" }, ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$ checkNodeTypes(plan, FULL_PUSHDOWN); = = checkSubPlanCount(plan, 0); = Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/relatio= nal/TestAliasGenerator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/Te= stAliasGenerator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/Te= stAliasGenerator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -62,7 +62,7 @@ = public void testLongOrderByAlias() throws Exception { String sql =3D "select pm1.g1.e1 || pm1.g1.e2 as asfasdfadfasdfasd= fadfasdfadsfasdfasdfasdfasdfasdfadfa, pm1.g1.e2 from pm1.g1 order by asfasd= fadfasdfasdfadfasdfadsfasdfasdfasdfasdfasdfadfa"; //$NON-NLS-1$ - String expected =3D "SELECT (g_0.e1 || g_0.e2) AS c_0, g_0.e2 AS c= _1 FROM pm1.g1 AS g_0 ORDER BY c_0"; //$NON-NLS-1$ + String expected =3D "SELECT concat(g_0.e1, g_0.e2) AS c_0, g_0.e2 = AS c_1 FROM pm1.g1 AS g_0 ORDER BY c_0"; //$NON-NLS-1$ helpTest(sql, expected, true, FakeMetadataFactory.example1Cached()= ); } = @@ -112,13 +112,13 @@ = public void testCorrelatedRefernce() throws Exception { String sql =3D "select intnum, stringnum from (select intnum, stringn= um from bqt1.smallb) b where intnum in (select b.stringnum || b.intnum from= (select intnum from bqt1.smalla) b) "; //$NON-NLS-1$ - String expected =3D "SELECT v_0.c_0, v_0.c_1 FROM (SELECT g_0.intn= um AS c_0, g_0.stringnum AS c_1 FROM bqt1.smallb AS g_0) AS v_0 WHERE v_0.c= _0 IN (SELECT (v_0.c_1 || v_1.c_0) FROM (SELECT g_1.intnum AS c_0 FROM bqt1= .smalla AS g_1) AS v_1)"; //$NON-NLS-1$ + String expected =3D "SELECT v_0.c_0, v_0.c_1 FROM (SELECT g_0.intn= um AS c_0, g_0.stringnum AS c_1 FROM bqt1.smallb AS g_0) AS v_0 WHERE v_0.c= _0 IN (SELECT concat(v_0.c_1, v_1.c_0) FROM (SELECT g_1.intnum AS c_0 FROM = bqt1.smalla AS g_1) AS v_1)"; //$NON-NLS-1$ helpTest(sql, expected, true, FakeMetadataFactory.exampleBQTCached= ()); } = public void testCorrelatedRefernce1() throws Exception { String sql =3D "select intnum, stringnum from bqt1.smallb where intnu= m in (select stringnum || b.intnum from (select intnum from bqt1.smalla) b)= "; //$NON-NLS-1$ - String expected =3D "SELECT g_0.intnum, g_0.stringnum FROM bqt1.sm= allb AS g_0 WHERE g_0.intnum IN (SELECT (g_0.stringnum || v_0.c_0) FROM (SE= LECT g_1.intnum AS c_0 FROM bqt1.smalla AS g_1) AS v_0)"; //$NON-NLS-1$ + String expected =3D "SELECT g_0.intnum, g_0.stringnum FROM bqt1.sm= allb AS g_0 WHERE g_0.intnum IN (SELECT concat(g_0.stringnum, v_0.c_0) FROM= (SELECT g_1.intnum AS c_0 FROM bqt1.smalla AS g_1) AS v_0)"; //$NON-NLS-1$ helpTest(sql, expected, true, FakeMetadataFactory.exampleBQTCached= ()); } = Modified: trunk/engine/src/test/java/com/metamatrix/query/parser/TestParser= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/parser/TestParser.java = 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/query/parser/TestParser.java = 2009-02-19 17:59:09 UTC (rev 476) @@ -6059,17 +6059,8 @@ .append(" ELSE 9999") //$NON-NLS-1$ .append(" END") //$NON-NLS-1$ .append(" FROM m.g").toString(); //$NON-NLS-1$ - String expected =3D new StringBuffer("SELECT y, z, ") //$NON-NLS-1$ - .append("CASE") //$NON-NLS-1$ - .append(" WHEN x=3D'a' THEN 0") //$NON-NLS-1$ - .append(" WHEN x=3D'b' THEN 1") //$NON-NLS-1$ - .append(" WHEN x=3D'c' THEN 2") //$NON-NLS-1$ - .append(" WHEN x=3D'd' THEN 3") //$NON-NLS-1$ - .append(" ELSE 9999") //$NON-NLS-1$ - .append(" END") //$NON-NLS-1$ - .append(" FROM m.g").toString(); //$NON-NLS-1$ = - helpTest(query, expected, q); + helpTest(query, query, q); } = public void testCaseExpression2() { @@ -6094,15 +6085,8 @@ .append(" WHEN 'd' THEN 3") //$NON-NLS-1$ .append(" END") //$NON-NLS-1$ .append(" FROM m.g").toString(); //$NON-NLS-1$ - String expected =3D new StringBuffer("SELECT y, z, ") //$NON-NLS-1$ - .append("CASE") //$NON-NLS-1$ - .append(" WHEN x=3D'a' THEN 0") //$NON-NLS-1$ - .append(" WHEN x=3D'b' THEN 1") //$NON-NLS-1$ - .append(" WHEN x=3D'c' THEN 2") //$NON-NLS-1$ - .append(" WHEN x=3D'd' THEN 3") //$NON-NLS-1$ - .append(" END") //$NON-NLS-1$ - .append(" FROM m.g").toString(); //$NON-NLS-1$ - helpTest(query, expected, q); + = + helpTest(query, query, q); } = public void testCaseExpression3() { Modified: trunk/engine/src/test/java/com/metamatrix/query/processor/TestPro= cessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/processor/TestProcessor= .java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/query/processor/TestProcessor= .java 2009-02-19 17:59:09 UTC (rev 476) @@ -7940,7 +7940,7 @@ FakeDataManager dataManager =3D new FakeDataManager(); sampleData2(dataManager); = - ProcessorPlan plan =3D TestOptimizer.helpPlan(sql, FakeMetadataFac= tory.example1Cached(), null, capFinder, new String[] {"SELECT pm1.g1.e1 FRO= M pm1.g1 LIMIT (5 + 1)"}, TestOptimizer.ComparisonMode.EXACT_COMMAND_STRING= ); //$NON-NLS-1$ + ProcessorPlan plan =3D TestOptimizer.helpPlan(sql, FakeMetadataFac= tory.example1Cached(), null, capFinder, new String[] {"SELECT pm1.g1.e1 AS = c_0 FROM pm1.g1 LIMIT (5 + 1)"}, TestOptimizer.ComparisonMode.EXACT_COMMAND= _STRING); //$NON-NLS-1$ helpProcess(plan, dataManager, expected); = } = Modified: trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQuer= yRewriter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewri= ter.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewri= ter.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1691,9 +1691,8 @@ helpTestRewriteCriteria("case 0 when 1 then 1 else 2 end =3D 1", "= 1 =3D 0"); //$NON-NLS-1$ //$NON-NLS-2$ } = - // First WHEN can't be rewritten, so no changes public void testRewriteSearchedCaseExpr3() { - helpTestRewriteCriteria("case 0 when pm1.g1.e2 then 1 else 2 end = =3D 1", "CASE 0 WHEN pm1.g1.e2 THEN 1 ELSE 2 END =3D 1"); //$NON-NLS-1$ //$= NON-NLS-2$ + helpTestRewriteCriteria("case 0 when pm1.g1.e2 then 1 else 2 end = =3D 1", "CASE WHEN pm1.g1.e2 =3D 0 THEN 1 ELSE 2 END =3D 1"); //$NON-NLS-1$= //$NON-NLS-2$ } = public void testRewriteSearchedCaseExpr4() { @@ -1704,35 +1703,35 @@ = // First WHEN always false, so remove it public void testRewriteSearchedCaseExpr5() { - helpTestRewriteCriteria("case 0 when 1 then 1 when pm1.g1.e2 then = 2 else 3 end =3D 1", "CASE 0 WHEN pm1.g1.e2 THEN 2 ELSE 3 END =3D 1"); //$N= ON-NLS-1$ //$NON-NLS-2$ + helpTestRewriteCriteria("case 0 when 1 then 1 when pm1.g1.e2 then = 2 else 3 end =3D 1", "CASE WHEN pm1.g1.e2 =3D 0 THEN 2 ELSE 3 END =3D 1"); = //$NON-NLS-1$ //$NON-NLS-2$ } = public void testDefect16879_1(){ - helpTestRewriteCommand("SELECT decodestring(e1, 'a, b') FROM pm1.g1",= "SELECT CASE WHEN e1=3D'a' THEN 'b' ELSE e1 END FROM pm1.g1"); //$NON-NLS-= 1$ //$NON-NLS-2$ + helpTestRewriteCommand("SELECT decodestring(e1, 'a, b') FROM pm1.g1",= "SELECT CASE WHEN e1 =3D 'a' THEN 'b' ELSE e1 END FROM pm1.g1"); //$NON-NL= S-1$ //$NON-NLS-2$ } = public void testDefect16879_2(){ - helpTestRewriteCommand("SELECT decodestring(e1, 'a, b, c, d') FROM pm= 1.g1", "SELECT CASE WHEN e1=3D'a' THEN 'b' WHEN e1=3D'c' THEN 'd' ELSE e1 E= ND FROM pm1.g1"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestRewriteCommand("SELECT decodestring(e1, 'a, b, c, d') FROM pm= 1.g1", "SELECT CASE WHEN e1 =3D 'a' THEN 'b' WHEN e1 =3D 'c' THEN 'd' ELSE = e1 END FROM pm1.g1"); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testDefect16879_3(){ - helpTestRewriteCommand("SELECT decodeinteger(e1, 'a, b') FROM pm1.g1"= , "SELECT CASE WHEN e1=3D'a' THEN 'b' ELSE e1 END FROM pm1.g1"); //$NON-NLS= -1$ //$NON-NLS-2$ + helpTestRewriteCommand("SELECT decodeinteger(e1, 'a, b') FROM pm1.g1"= , "SELECT CASE WHEN e1 =3D 'a' THEN 'b' ELSE e1 END FROM pm1.g1"); //$NON-N= LS-1$ //$NON-NLS-2$ } = public void testDefect16879_4(){ - helpTestRewriteCommand("SELECT decodeinteger(e1, 'a, b, c, d') FROM p= m1.g1", "SELECT CASE WHEN e1=3D'a' THEN 'b' WHEN e1=3D'c' THEN 'd' ELSE e1 = END FROM pm1.g1"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestRewriteCommand("SELECT decodeinteger(e1, 'a, b, c, d') FROM p= m1.g1", "SELECT CASE WHEN e1 =3D 'a' THEN 'b' WHEN e1 =3D 'c' THEN 'd' ELSE= e1 END FROM pm1.g1"); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testDefect16879_5(){ - helpTestRewriteCommand("SELECT decodeinteger(e1, 'null, b, c, d') = FROM pm1.g1", "SELECT CASE WHEN e1 IS NULL THEN 'b' WHEN e1=3D'c' THEN 'd' = ELSE e1 END FROM pm1.g1"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestRewriteCommand("SELECT decodeinteger(e1, 'null, b, c, d') = FROM pm1.g1", "SELECT CASE WHEN e1 IS NULL THEN 'b' WHEN e1 =3D 'c' THEN 'd= ' ELSE e1 END FROM pm1.g1"); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testDefect16879_6(){ - helpTestRewriteCommand("SELECT decodeinteger(e1, 'a, b, null, d') = FROM pm1.g1", "SELECT CASE WHEN e1 IS NULL THEN 'd' WHEN e1=3D'a' THEN 'b' = ELSE e1 END FROM pm1.g1"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestRewriteCommand("SELECT decodeinteger(e1, 'a, b, null, d') = FROM pm1.g1", "SELECT CASE WHEN e1 =3D 'a' THEN 'b' WHEN e1 IS NULL THEN 'd= ' ELSE e1 END FROM pm1.g1"); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testDefect16879_7(){ - helpTestRewriteCommand("SELECT decodeinteger(e1, 'a, b, null, d, e= ') FROM pm1.g1", "SELECT CASE WHEN e1 IS NULL THEN 'd' WHEN e1=3D'a' THEN '= b' ELSE 'e' END FROM pm1.g1"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestRewriteCommand("SELECT decodeinteger(e1, 'a, b, null, d, e= ') FROM pm1.g1", "SELECT CASE WHEN e1 =3D 'a' THEN 'b' WHEN e1 IS NULL THEN= 'd' ELSE 'e' END FROM pm1.g1"); //$NON-NLS-1$ //$NON-NLS-2$ } = //note that the env is now treated as deterministic, however it is rea= lly only deterministic within a session @@ -1770,7 +1769,7 @@ } = public void testRewriteWithReference() { - helpTestRewriteCommand("SELECT e1 FROM pm1.g1 where parsetimestamp= (e1, 'yyyy-MM-dd') !=3D ?", "SELECT e1 FROM pm1.g1 WHERE e1 <> formatTimest= amp(?, 'yyyy-MM-dd')"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestRewriteCommand("SELECT e1 FROM pm1.g1 where parsetimestamp= (e1, 'yyyy-MM-dd') !=3D ?", "SELECT e1 FROM pm1.g1 WHERE e1 <> formattimest= amp(?, 'yyyy-MM-dd')"); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testRewiteJoinCriteria() { @@ -2067,15 +2066,15 @@ } = public void testRewriteConcat2_2() throws Exception { - helpTestRewriteCriteria("concat2(pm1.g1.e1, null) =3D 'xyz'", "CAS= E WHEN pm1.g1.e1 IS NULL THEN null ELSE CONCAT(NVL(pm1.g1.e1, ''), '') END = =3D 'xyz'", true); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestRewriteCriteria("concat2(pm1.g1.e1, null) =3D 'xyz'", "CAS= E WHEN pm1.g1.e1 IS NULL THEN null ELSE concat(ifnull(pm1.g1.e1, ''), '') E= ND =3D 'xyz'", true); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testRewriteConcat2_3() throws Exception { - helpTestRewriteCriteria("concat2(pm1.g1.e1, convert(pm1.g1.e2, str= ing)) =3D 'xyz'", "CASE WHEN (pm1.g1.e1 IS NULL) AND (convert(pm1.g1.e2, st= ring) IS NULL) THEN null ELSE CONCAT(NVL(pm1.g1.e1, ''), NVL(convert(pm1.g1= .e2, string), '')) END =3D 'xyz'", true); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestRewriteCriteria("concat2(pm1.g1.e1, convert(pm1.g1.e2, str= ing)) =3D 'xyz'", "CASE WHEN (pm1.g1.e1 IS NULL) AND (convert(pm1.g1.e2, st= ring) IS NULL) THEN null ELSE concat(ifnull(pm1.g1.e1, ''), ifnull(convert(= pm1.g1.e2, string), '')) END =3D 'xyz'", true); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testRewriteConcat2_4() throws Exception { - helpTestRewriteCriteria("concat2('a', pm1.g1.e1) =3D 'xyz'", "CONC= AT('a', NVL(pm1.g1.e1, '')) =3D 'xyz'"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTestRewriteCriteria("concat2('a', pm1.g1.e1) =3D 'xyz'", "conc= at('a', ifnull(pm1.g1.e1, '')) =3D 'xyz'"); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testRewiteEvaluatableAggregate() { Modified: trunk/engine/src/test/java/com/metamatrix/query/sql/util/TestUpda= teProcedureGenerator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/sql/util/TestUpdateProc= edureGenerator.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/query/sql/util/TestUpdateProc= edureGenerator.java 2009-02-19 17:59:09 UTC (rev 476) @@ -68,8 +68,12 @@ throw new RuntimeException(e); } } - = + public static FakeMetadataFacade example1() { = + return example1(true); + } + + public static FakeMetadataFacade example1(boolean allUpdatable) { = // Create models FakeMetadataObject pm1 =3D FakeMetadataFactory.createPhysicalModel("pm1"= ); //$NON-NLS-1$ FakeMetadataObject vm1 =3D FakeMetadataFactory.createVirtualModel("vm1")= ; //$NON-NLS-1$ @@ -83,6 +87,9 @@ List pm1g1e =3D FakeMetadataFactory.createElements(pm1g1, = new String[] { "e1", "e2", "e3", "e4" }, //$NON-NLS-1$ //$NON-NLS-2$ //= $NON-NLS-3$ //$NON-NLS-4$ new String[] { DataTypeManager.DefaultDataTypes.STRING, DataTypeManager= .DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.BOOLEAN, DataTy= peManager.DefaultDataTypes.DOUBLE }); + if (!allUpdatable) { + ((FakeMetadataObject)pm1g1e.get(0)).putProperty(FakeMetadataObject.Prop= s.UPDATE, Boolean.FALSE); + } = List pm1g2e =3D FakeMetadataFactory.createElements(pm1g2, = new String[] { "e1", "e2", "e3", "e4" }, //$NON-NLS-1$ //$NON-NLS-2$ //= $NON-NLS-3$ //$NON-NLS-4$ @@ -163,105 +170,8 @@ = // Create the facade from the store return new FakeMetadataFacade(store); - } = - = - public static FakeMetadataFacade example2() { = - // Create models - FakeMetadataObject pm1 =3D FakeMetadataFactory.createPhysicalModel= ("pm1"); //$NON-NLS-1$ - FakeMetadataObject vm1 =3D FakeMetadataFactory.createVirtualModel(= "vm1"); //$NON-NLS-1$ - - // Create physical groups - FakeMetadataObject pm1g1 =3D FakeMetadataFactory.createPhysicalGro= up("pm1.g1", pm1); //$NON-NLS-1$ - FakeMetadataObject pm1g2 =3D FakeMetadataFactory.createPhysicalGro= up("pm1.g2", pm1); //$NON-NLS-1$ - FakeMetadataObject pm1g3 =3D FakeMetadataFactory.createPhysicalGro= up("pm1.g3", pm1); //$NON-NLS-1$ - = - // Create physical elements - List pm1g1e =3D FakeMetadataFactory.createElements(pm1g1, = - new String[] { "e1", "e2", "e3", "e4" }, //$NON-NLS-1$ //$NON-= NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - new String[] { DataTypeManager.DefaultDataTypes.STRING, DataTy= peManager.DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.BOOLEA= N, DataTypeManager.DefaultDataTypes.DOUBLE }); - ((FakeMetadataObject)pm1g1e.get(0)).putProperty(FakeMetadataObject= .Props.UPDATE, Boolean.FALSE); - = - List pm1g2e =3D FakeMetadataFactory.createElements(pm1g2, = - new String[] { "e1", "e2", "e3", "e4" }, //$NON-NLS-1$ //$NON-= NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - new String[] { DataTypeManager.DefaultDataTypes.STRING, DataTy= peManager.DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.BOOLEA= N, DataTypeManager.DefaultDataTypes.DOUBLE }); - - List pm1g3e =3D FakeMetadataFactory.createElements(pm1g3, = - new String[] { "e1", "e2", "e3", "e4" }, //$NON-NLS-1$ //$NON-= NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - new String[] { DataTypeManager.DefaultDataTypes.STRING, DataTy= peManager.DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.BOOLEA= N, DataTypeManager.DefaultDataTypes.DOUBLE }); - ((FakeMetadataObject)pm1g3e.get(0)).putProperty(FakeMetadataObject= .Props.NULL, Boolean.FALSE); - ((FakeMetadataObject)pm1g3e.get(0)).putProperty(FakeMetadataObject= .Props.DEFAULT_VALUE, null); - = - ((FakeMetadataObject)pm1g3e.get(1)).putProperty(FakeMetadataObject= .Props.NULL, Boolean.FALSE); - ((FakeMetadataObject)pm1g3e.get(1)).putProperty(FakeMetadataObject= .Props.AUTO_INCREMENT, Boolean.TRUE); - ((FakeMetadataObject)pm1g3e.get(1)).putProperty(FakeMetadataObject= .Props.DEFAULT_VALUE, null); - = - ((FakeMetadataObject)pm1g3e.get(2)).putProperty(FakeMetadataObject= .Props.NULL, Boolean.FALSE); - ((FakeMetadataObject)pm1g3e.get(2)).putProperty(FakeMetadataObject= .Props.DEFAULT_VALUE, "xyz"); //$NON-NLS-1$ - - // Create virtual groups - QueryNode vm1g1n1 =3D new QueryNode("vm1.g1", "SELECT e1 as a, e2 = FROM pm1.g1 WHERE e3 > 5"); //$NON-NLS-1$ //$NON-NLS-2$ - FakeMetadataObject vm1g1 =3D FakeMetadataFactory.createUpdatableVi= rtualGroup("vm1.g1", vm1, vm1g1n1); //$NON-NLS-1$ - QueryNode vm1g2n1 =3D new QueryNode("vm1.g2", "SELECT e1, e2, e3, = e4 FROM pm1.g2 WHERE e3 > 5"); //$NON-NLS-1$ //$NON-NLS-2$ - FakeMetadataObject vm1g2 =3D FakeMetadataFactory.createUpdatableVi= rtualGroup("vm1.g2", vm1, vm1g2n1); //$NON-NLS-1$ - QueryNode vm1g3n1 =3D new QueryNode("vm1.g3", "SELECT e1, e3 FROM = pm1.g3"); //$NON-NLS-1$ //$NON-NLS-2$ - FakeMetadataObject vm1g3 =3D FakeMetadataFactory.createUpdatableVi= rtualGroup("vm1.g3", vm1, vm1g3n1); //$NON-NLS-1$ - QueryNode vm1g4n1 =3D new QueryNode("vm1.g4", "SELECT e1, e2 FROM = pm1.g3"); //$NON-NLS-1$ //$NON-NLS-2$ - FakeMetadataObject vm1g4 =3D FakeMetadataFactory.createUpdatableVi= rtualGroup("vm1.g4", vm1, vm1g4n1); //$NON-NLS-1$ - QueryNode vm1g5n1 =3D new QueryNode("vm1.g5", "SELECT e2, e3 FROM = pm1.g3"); //$NON-NLS-1$ //$NON-NLS-2$ - FakeMetadataObject vm1g5 =3D FakeMetadataFactory.createUpdatableVi= rtualGroup("vm1.g5", vm1, vm1g5n1); //$NON-NLS-1$ - - // Create virtual elements - List vm1g1e =3D FakeMetadataFactory.createElements(vm1g1, = - new String[] { "a", "e2"}, //$NON-NLS-1$ //$NON-NLS-2$ - new String[] { DataTypeManager.DefaultDataTypes.STRING, DataTy= peManager.DefaultDataTypes.INTEGER}); - List vm1g2e =3D FakeMetadataFactory.createElements(vm1g2, = - new String[] { "e1", "e2","e3", "e4"}, //$NON-NLS-1$ //$NON-NL= S-2$ //$NON-NLS-3$ //$NON-NLS-4$ - new String[] { DataTypeManager.DefaultDataTypes.STRING, DataTy= peManager.DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.BOOLEA= N, DataTypeManager.DefaultDataTypes.DOUBLE }); - List vm1g3e =3D FakeMetadataFactory.createElements(vm1g3, = - new String[] { "e1", "e2"}, //$NON-NLS-1$ //$NON-NLS-2$ - new String[] { DataTypeManager.DefaultDataTypes.STRING, DataTy= peManager.DefaultDataTypes.INTEGER, }); - List vm1g4e =3D FakeMetadataFactory.createElements(vm1g4, = - new String[] { "e1", "e3"}, //$NON-NLS-1$ //$NON-NLS-2$ - new String[] { DataTypeManager.DefaultDataTypes.STRING, DataTy= peManager.DefaultDataTypes.BOOLEAN }); - List vm1g5e =3D FakeMetadataFactory.createElements(vm1g5, = - new String[] { "e2","e3"}, //$NON-NLS-1$ //$NON-NLS-2$ - new String[] { DataTypeManager.DefaultDataTypes.INTEGER, DataT= ypeManager.DefaultDataTypes.BOOLEAN }); - - // Stored queries - FakeMetadataObject rs1 =3D FakeMetadataFactory.createResultSet("pm= 1.rs1", pm1, new String[] { "e1", "e2" }, new String[] { DataTypeManager.De= faultDataTypes.STRING, DataTypeManager.DefaultDataTypes.INTEGER }); //$NON-= NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - FakeMetadataObject rs1p1 =3D FakeMetadataFactory.createParameter("= ret", 1, ParameterInfo.RESULT_SET, DataTypeManager.DefaultDataTypes.OBJECT,= rs1); //$NON-NLS-1$ - QueryNode sq1n1 =3D new QueryNode("pm1.sq1", "CREATE VIRTUAL PROCE= DURE BEGIN SELECT e1, e2 FROM pm1.g1; END"); //$NON-NLS-1$ //$NON-NLS-2$ - FakeMetadataObject sq1 =3D FakeMetadataFactory.createVirtualProced= ure("pm1.sq1", pm1, Arrays.asList(new FakeMetadataObject[] { rs1p1 }), sq1n= 1); //$NON-NLS-1$ - - // Add all objects to the store - FakeMetadataStore store =3D new FakeMetadataStore(); - store.addObject(pm1); - store.addObject(pm1g1); = - store.addObjects(pm1g1e); - store.addObject(pm1g2); = - store.addObjects(pm1g2e); - store.addObject(pm1g3); = - store.addObjects(pm1g3e); - = - store.addObject(vm1); - store.addObject(vm1g1); - store.addObjects(vm1g1e); - store.addObject(vm1g2); - store.addObjects(vm1g2e); - store.addObject(vm1g3); - store.addObjects(vm1g3e); - store.addObject(vm1g4); - store.addObjects(vm1g4e); - store.addObject(vm1g5); - store.addObjects(vm1g5e); - = - store.addObject(rs1); - store.addObject(sq1); - - // Create the facade from the store - return new FakeMetadataFacade(store); - } - = + } = + = //actual tests public void testCreateInsertCommand(){ helpTest(UpdateProcedureGenerator.INSERT_PROCEDURE, = @@ -455,7 +365,7 @@ helpTest(UpdateProcedureGenerator.UPDATE_PROCEDURE, = "vm1.g1", //$NON-NLS-1$ "select e1 as a, e2 from pm1.g1 where e4 > 5", = //$NON-NLS-1$ - TestUpdateProcedureGenerator.example2(), + TestUpdateProcedureGenerator.example1(false), "CREATE PROCEDURE\nBEGIN\nROWS_UPDATED =3D UPDATE pm1.= g1 SET e2 =3D INPUT.e2 WHERE TRANSLATE CRITERIA;\nEND"); //$NON-NLS-1$ } = @@ -464,7 +374,7 @@ helpTest(UpdateProcedureGenerator.INSERT_PROCEDURE, "vm1.g1", //$NON-NLS-1$ "SELECT e1, e2 FROM pm1.g1", //$NON-NLS-1$ - TestUpdateProcedureGenerator.example2(), + TestUpdateProcedureGenerator.example1(false), "CREATE PROCEDURE\nBEGIN\nROWS_UPDATED =3D INSERT INTO pm1.g1 = (pm1.g1.e2) VALUES (INPUT.e2);\nEND"); //$NON-NLS-1$ } = Modified: trunk/engine/src/test/java/com/metamatrix/query/sql/visitor/TestS= QLStringVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/sql/visitor/TestSQLStri= ngVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/query/sql/visitor/TestSQLStri= ngVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -1840,24 +1840,24 @@ = public void testCaseExpression1() { helpTest(TestCaseExpression.example(2), - "CASE WHEN x=3D'a' THEN 0 WHEN x=3D'b' THEN 1 ELSE 9999 E= ND"); //$NON-NLS-1$ + "CASE x WHEN 'a' THEN 0 WHEN 'b' THEN 1 ELSE 9999 END"); = //$NON-NLS-1$ } = public void testCaseExpression2() { CaseExpression example =3D TestCaseExpression.example(2); example.setElseExpression(null); - helpTest(example, "CASE WHEN x=3D'a' THEN 0 WHEN x=3D'b' THEN 1 EN= D"); //$NON-NLS-1$ + helpTest(example, "CASE x WHEN 'a' THEN 0 WHEN 'b' THEN 1 END"); /= /$NON-NLS-1$ } = public void testCaseExpression3() { CaseExpression example =3D TestCaseExpression.example(3, 0, true); - helpTest(example, "CASE WHEN x IS NULL THEN 0 WHEN x=3D'b' THEN 1 = WHEN x=3D'c' THEN 2 ELSE 9999 END"); //$NON-NLS-1$ + helpTest(example, "CASE x WHEN null THEN 0 WHEN 'b' THEN 1 WHEN 'c= ' THEN 2 ELSE 9999 END"); //$NON-NLS-1$ } = public void testCaseExpression4() { CaseExpression example =3D TestCaseExpression.example(3, 2, true); example.setElseExpression(null); - helpTest(example, "CASE WHEN x IS NULL THEN 2 WHEN x=3D'a' THEN 0 = WHEN x=3D'b' THEN 1 END"); //$NON-NLS-1$ + helpTest(example, "CASE x WHEN 'a' THEN 0 WHEN 'b' THEN 1 WHEN nul= l THEN 2 END"); //$NON-NLS-1$ } = public void testSearchedCaseExpression1() { Modified: trunk/engine/src/test/java/com/metamatrix/query/validator/TestVal= idator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator= .java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator= .java 2009-02-19 17:59:09 UTC (rev 476) @@ -255,7 +255,7 @@ return new FakeMetadataFacade(store); } = - public FakeMetadataFacade exampleMetadata3() { + public static FakeMetadataFacade exampleMetadata3() { // Create metadata objects = FakeMetadataObject modelObj =3D FakeMetadataFactory.createPhysical= Model("test"); //$NON-NLS-1$ FakeMetadataObject groupObj =3D FakeMetadataFactory.createPhysical= Group("test.group", modelObj); //$NON-NLS-1$ @@ -266,6 +266,7 @@ elemObj1.putProperty(FakeMetadataObject.Props.NULL, Boolean.FALSE); elemObj1.putProperty(FakeMetadataObject.Props.DEFAULT_VALUE, Boole= an.FALSE); elemObj1.putProperty(FakeMetadataObject.Props.AUTO_INCREMENT, Bool= ean.TRUE); + elemObj1.putProperty(FakeMetadataObject.Props.NAME_IN_SOURCE, "e1:= SEQUENCE=3DMYSEQUENCE.nextVal"); //$NON-NLS-1$ = // set up validator metadata FakeMetadataStore store =3D new FakeMetadataStore(); @@ -905,7 +906,7 @@ } = = public void testXMLQueryRowLimitInvalidCriteria6a() { - helpValidate("SELECT * FROM vm1.doc1 where 2 =3D CASE rowlimit(a2)= WHEN 2 THEN 2 END", new String[] {"2 =3D CASE WHEN rowlimit(a2)=3D2 THEN 2= END"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ + helpValidate("SELECT * FROM vm1.doc1 where 2 =3D CASE rowlimit(a2)= WHEN 2 THEN 2 END", new String[] {"2 =3D CASE rowlimit(a2) WHEN 2 THEN 2 E= ND"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ } = = public void testXMLQueryRowLimitInvalidCriteria7() { @@ -1025,7 +1026,7 @@ } = = public void testXMLQueryRowLimitExceptionInvalidCriteria6a() { - helpValidate("SELECT * FROM vm1.doc1 where 2 =3D CASE rowlimitexce= ption(a2) WHEN 2 THEN 2 END", new String[] {"2 =3D CASE WHEN rowlimitexcept= ion(a2)=3D2 THEN 2 END"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ + helpValidate("SELECT * FROM vm1.doc1 where 2 =3D CASE rowlimitexce= ption(a2) WHEN 2 THEN 2 END", new String[] {"2 =3D CASE rowlimitexception(a= 2) WHEN 2 THEN 2 END"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ } = = public void testXMLQueryRowLimitExceptionInvalidCriteria7() { Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/extension/TestSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -22,48 +22,45 @@ = package com.metamatrix.connector.jdbc.extension; = -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.connector.api.ConnectorEnvironment; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.jdbc.JDBCPropertyNames; -import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; +import com.metamatrix.connector.jdbc.JDBCPropertyNames; +import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ILanguageObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.core.util.UnitTestUtil; -import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; -import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl; -import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory; -import com.metamatrix.dqp.internal.datamgr.language.LanguageFactoryImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestDeleteImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestInsertImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestProcedureImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestSelectImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestUpdateImpl; -import com.metamatrix.dqp.internal.datamgr.language.TstLanguageBridgeFacto= ry; -import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; -import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; -import com.metamatrix.metadata.runtime.VDBMetadataFactory; -import com.metamatrix.query.metadata.QueryMetadataInterface; -import com.metamatrix.query.resolver.QueryResolver; -import com.metamatrix.query.rewriter.QueryRewriter; -import com.metamatrix.query.sql.lang.Command; -import com.metamatrix.query.sql.lang.From; -import com.metamatrix.query.sql.lang.GroupBy; -import com.metamatrix.query.sql.lang.Query; -import com.metamatrix.query.sql.lang.Select; -import com.metamatrix.query.sql.symbol.Constant; -import com.metamatrix.query.sql.symbol.ElementSymbol; -import com.metamatrix.query.sql.symbol.Expression; -import com.metamatrix.query.sql.symbol.Function; -import com.metamatrix.query.sql.symbol.GroupSymbol; +import com.metamatrix.core.util.UnitTestUtil; +import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; +import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl; +import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory; +import com.metamatrix.dqp.internal.datamgr.language.TestDeleteImpl; +import com.metamatrix.dqp.internal.datamgr.language.TestInsertImpl; +import com.metamatrix.dqp.internal.datamgr.language.TestProcedureImpl; +import com.metamatrix.dqp.internal.datamgr.language.TestSelectImpl; +import com.metamatrix.dqp.internal.datamgr.language.TestUpdateImpl; +import com.metamatrix.dqp.internal.datamgr.language.TstLanguageBridgeFacto= ry; +import com.metamatrix.metadata.runtime.VDBMetadataFactory; +import com.metamatrix.query.metadata.QueryMetadataInterface; +import com.metamatrix.query.resolver.QueryResolver; +import com.metamatrix.query.rewriter.QueryRewriter; +import com.metamatrix.query.sql.lang.Command; +import com.metamatrix.query.sql.lang.From; +import com.metamatrix.query.sql.lang.GroupBy; +import com.metamatrix.query.sql.lang.Query; +import com.metamatrix.query.sql.lang.Select; +import com.metamatrix.query.sql.symbol.Constant; +import com.metamatrix.query.sql.symbol.ElementSymbol; +import com.metamatrix.query.sql.symbol.Expression; +import com.metamatrix.query.sql.symbol.Function; +import com.metamatrix.query.sql.symbol.GroupSymbol; = /** */ @@ -95,103 +92,69 @@ return util.parseCommand(sql); } = - public void helpTestVisitor(String vdb, String input, Map modifiers, i= nt expectedType, String expectedOutput) { - helpTestVisitor(vdb, input, modifiers, expectedType, expectedOutpu= t, false); + public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring expectedOutput) { + helpTestVisitor(vdb, input, modifiers, expectedOutput, false); } = - public void helpTestVisitor(String vdb, String input, Map modifiers, i= nt expectedType, String expectedOutput, boolean useMetadata) { - helpTestVisitor(vdb, input, modifiers, expectedType, expectedOutpu= t, useMetadata, false); + public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring expectedOutput, boolean useMetadata) { + helpTestVisitor(vdb, input, modifiers, expectedOutput, useMetadata= , false); } = - public void helpTestVisitor(String vdb, String input, Map modifiers, i= nt expectedType, String expectedOutput, boolean useMetadata, boolean usePre= paredStatement) { + public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring expectedOutput, boolean useMetadata, boolean usePreparedStatement) { // Convert from sql to objects ICommand obj =3D helpTranslate(vdb, input); = try { - helpTestVisitorWithCommand(modifiers, expectedType, expectedOutput, obj= , useMetadata, usePreparedStatement); + helpTestVisitorWithCommand(modifiers, expectedOutput, obj, useMetadata,= usePreparedStatement); } catch (ConnectorException e) { throw new RuntimeException(e); } = } - public static final RuntimeMetadata metadata =3D TstLanguageBridgeFact= ory.metadataFactory.createRuntimeMetadata(); + public static final RuntimeMetadata metadata =3D TstLanguageBridgeFact= ory.metadataFactory.getRuntimeMetadata(); = - private String getStringWithContext(ILanguageObject obj) { + private String getStringWithContext(ILanguageObject obj) throws Connec= torException { Properties props =3D new Properties(); = - props.setProperty(JDBCPropertyNames.USE_COMMENTS_SOURCE_QUERY, "tr= ue"); - = - SQLConversionVisitor visitor =3D new SQLConversionVisitor(); - visitor.setRuntimeMetadata(metadata); + props.setProperty(JDBCPropertyNames.USE_COMMENTS_SOURCE_QUERY, Boo= lean.TRUE.toString()); + SQLTranslator trans =3D new SQLTranslator(); + trans.initialize(EnvironmentUtility.createEnvironment(props, false= )); + SQLConversionVisitor visitor =3D new SQLConversionVisitor(trans); visitor.setExecutionContext(context); - visitor.setProperties(props); visitor.append(obj); return visitor.toString(); } = = /** = - * @param modifiers - * @param expectedType - * @param expectedOutput + * @param modifiers + * @param expectedOutput * @param obj * @throws ConnectorException = * @since 4.2 */ private void helpTestVisitorWithCommand(Map modifiers, - int expectedType, String expectedOutput, - ICommand obj, boolean useMetad= ata, boolean usePreparedStatement) throws ConnectorException { + ICommand obj, + boolean useMetadata, boolean u= sePreparedStatement) throws ConnectorException { // Apply function replacement FunctionReplacementVisitor funcVisitor =3D new FunctionReplacement= Visitor(modifiers); - = + SQLTranslator trans =3D new SQLTranslator(); + Properties p =3D new Properties(); + if (usePreparedStatement) { + p.setProperty(JDBCPropertyNames.USE_BIND_VARIABLES, Boolean.TRUE.= toString()); + } + trans.initialize(EnvironmentUtility.createEnvironment(p, false)); // Convert back to SQL - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor() { - //set the max alias lengths to test alias truncation - protected int getMaxSelectAliasLength() { - return 30; - } - = - protected int getMaxTableAliasLength() { - return 30; - } - }; - if (usePreparedStatement) { - sqlVisitor.setStmtType(TranslatedCommand.STMT_TYPE_PREPARED_ST= ATEMENT); - } - sqlVisitor.setLanguageFactory(LanguageFactoryImpl.INSTANCE); + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = - if (useMetadata) { - QueryMetadataInterface metadata =3D VDBMetadataFactory.getVDBMeta= data(getTestVDB()); = - sqlVisitor.setRuntimeMetadata(new RuntimeMetadataImpl(new Meta= dataFactory(metadata))); - } - TranslatedCommand tc =3D new TranslatedCommand(new FakeExecutionCo= ntextImpl(), new SQLTranslator() { - - public void initialize(ConnectorEnvironment env, RuntimeMetadata metada= ta) throws ConnectorException {} - - public ICommand modifyCommand(ICommand command, ExecutionContext contex= t) throws ConnectorException { - return command; - } - - public SQLConversionVisitor getTranslationVisitor() { - return null; - } - - public Map getFunctionModifiers() { - return null; - }}, sqlVisitor, funcVisitor); + TranslatedCommand tc =3D new TranslatedCommand(new FakeExecutionCo= ntextImpl(), trans, sqlVisitor, funcVisitor); tc.translateCommand(obj); = - // Check stuff -// System.out.println("in: " + input); //$NON-NLS-1$ -// System.out.println("out: " + tc.getSql()); //$NON-NLS-1$ assertEquals("Did not get correct sql", expectedOutput, tc.getSql(= )); //$NON-NLS-1$ - assertEquals("Did not get expected command type", expectedType, tc= .getExecutionType()); //$NON-NLS-1$ - } = public void testSimple() { helpTestVisitor(getTestVDB(), "select part_name from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME FROM PARTS"); //$NON-NLS-1$ } = @@ -199,7 +162,6 @@ helpTestVisitor(getTestVDB(), "select part_name as x from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME AS x FROM PARTS"); //$NON-NLS-1$ } = @@ -207,7 +169,6 @@ helpTestVisitor(getTestVDB(), "select y.part_name from parts y", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT y.PART_NAME FROM PARTS AS y"); //$NON-NLS-1$ } = @@ -215,7 +176,6 @@ helpTestVisitor(getTestVDB(), "select y.part_name AS z from parts y", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT y.PART_NAME AS z FROM PARTS AS y"); //$NON-NLS-1$ } = @@ -223,7 +183,6 @@ helpTestVisitor(getTestVDB(), "select 'x' from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT 'x' FROM PARTS"); //$NON-NLS-1$ } = @@ -231,7 +190,6 @@ helpTestVisitor(getTestVDB(), "select 5 from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT 5 FROM PARTS"); //$NON-NLS-1$ } = @@ -239,7 +197,6 @@ helpTestVisitor(getTestVDB(), "select 5.2 from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT 5.2 FROM PARTS"); //$NON-NLS-1$ } = @@ -247,7 +204,6 @@ helpTestVisitor(getTestVDB(), "select 0.012 from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT 0.012 FROM PARTS"); //$NON-NLS-1$ } = @@ -255,7 +211,6 @@ helpTestVisitor(getTestVDB(), "select 0.00012 from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT 0.00012 FROM PARTS"); //$NON-NLS-1$ } = = @@ -263,7 +218,6 @@ helpTestVisitor(getTestVDB(), "select 12345.123 from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT 12345.123 FROM PARTS"); //$NON-NLS-1$ } = @@ -271,7 +225,6 @@ helpTestVisitor(getTestVDB(), "select 1234567890.1234567 from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT 1234567890.1234567 FROM PARTS"); //$NON-NLS-1$ } = @@ -279,7 +232,6 @@ helpTestVisitor(getTestVDB(), "select {b'true'}, {b'false'} from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT 1, 0 FROM PARTS"); //$NON-NLS-1$ } = @@ -287,7 +239,6 @@ helpTestVisitor(getTestVDB(), "select {d'2003-12-31'} from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT {d'2003-12-31'} FROM PARTS"); //$NON-NLS-1$ } = @@ -295,7 +246,6 @@ helpTestVisitor(getTestVDB(), "select {t'23:59:59'} from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT {t'23:59:59'} FROM PARTS"); //$NON-NLS-1$ } = @@ -303,7 +253,6 @@ helpTestVisitor(getTestVDB(), "select null from parts", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT NULL FROM PARTS"); //$NON-NLS-1$ } = @@ -311,7 +260,6 @@ helpTestVisitor(getTestVDB(), "select {ts'2003-12-31 23:59:59.123'} from parts", //$NON-NLS-= 1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT {ts'2003-12-31 23:59:59.123'} FROM PARTS"); //$NON-NLS= -1$ } = @@ -319,7 +267,6 @@ helpTestVisitor(getTestVDB(), "select p.part_name from parts p, supplier_parts s where p.par= t_id =3D s.part_id", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT p.PART_NAME FROM PARTS AS p, SUPPLIER_PARTS AS s WHERE= p.PART_ID =3D s.PART_ID"); //$NON-NLS-1$ } = @@ -327,7 +274,6 @@ helpTestVisitor(getTestVDB(), "select p.part_name from parts p join supplier_parts s on p.pa= rt_id =3D s.part_id", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT p.PART_NAME FROM PARTS AS p INNER JOIN SUPPLIER_PARTS = AS s ON p.PART_ID =3D s.PART_ID"); //$NON-NLS-1$ } = @@ -335,7 +281,6 @@ helpTestVisitor(getTestVDB(), "select p.part_name from parts p join parts p2 on p.part_id = =3D p2.part_id", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT p.PART_NAME FROM PARTS AS p INNER JOIN PARTS AS p2 ON = p.PART_ID =3D p2.PART_ID"); //$NON-NLS-1$ } = @@ -343,7 +288,6 @@ helpTestVisitor(getTestVDB(), "select p.part_name from parts p right join supplier_parts s o= n p.part_id =3D s.part_id", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT p.PART_NAME FROM SUPPLIER_PARTS AS s LEFT OUTER JOIN P= ARTS AS p ON p.PART_ID =3D s.PART_ID"); //$NON-NLS-1$ } = @@ -351,7 +295,6 @@ helpTestVisitor(getTestVDB(), "select p.part_name from parts p left join supplier_parts s on= p.part_id =3D s.part_id", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT p.PART_NAME FROM PARTS AS p LEFT OUTER JOIN SUPPLIER_P= ARTS AS s ON p.PART_ID =3D s.PART_ID"); //$NON-NLS-1$ } = @@ -359,7 +302,6 @@ helpTestVisitor(getTestVDB(), "select p.part_name from parts p full join supplier_parts s on= p.part_id =3D s.part_id", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT p.PART_NAME FROM PARTS AS p FULL OUTER JOIN SUPPLIER_P= ARTS AS s ON p.PART_ID =3D s.PART_ID"); //$NON-NLS-1$ } = @@ -367,7 +309,6 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where part_id =3D 'x'", //$NON-NL= S-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID =3D 'x'= "); //$NON-NLS-1$ } = @@ -375,7 +316,6 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where part_id <> 'x'", //$NON-NLS= -1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID <> 'x'"= ); //$NON-NLS-1$ } = @@ -383,7 +323,6 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where part_id < 'x'", //$NON-NLS-= 1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID < 'x'")= ; //$NON-NLS-1$ } = @@ -391,7 +330,6 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where part_id <=3D 'x'", //$NON-N= LS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID <=3D 'x= '"); //$NON-NLS-1$ } = @@ -399,7 +337,6 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where part_id > 'x'", //$NON-NLS-= 1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID > 'x'")= ; //$NON-NLS-1$ } = @@ -407,7 +344,6 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where part_id >=3D 'x'", //$NON-N= LS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID >=3D 'x= '"); //$NON-NLS-1$ } = @@ -415,7 +351,6 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where part_id in ('x')", //$NON-N= LS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID =3D 'x'= "); //$NON-NLS-1$ } = @@ -423,7 +358,6 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where part_id in ('x', 'y')", //$= NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID IN ('x'= , 'y')"); //$NON-NLS-1$ } = @@ -431,7 +365,6 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where part_id not in ('x', 'y')",= //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID NOT IN = ('x', 'y')"); //$NON-NLS-1$ } = @@ -439,7 +372,6 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where part_id is null", //$NON-NL= S-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID IS NULL= "); //$NON-NLS-1$ } = @@ -447,7 +379,6 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where part_id is not null", //$NO= N-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID IS NOT = NULL"); //$NON-NLS-1$ } = @@ -455,7 +386,6 @@ helpTestVisitor(getTestVDB(), "insert into parts (part_id, part_name, part_color, part_weigh= t) values ('a', null, 'c', 'd')", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_UPDATE, "INSERT INTO PARTS (PART_ID, PART_NAME, PART_COLOR, PART_WEIGH= T) VALUES ('a', NULL, 'c', 'd')"); //$NON-NLS-1$ } = @@ -463,7 +393,6 @@ helpTestVisitor(getTestVDB(), "update parts set part_weight =3D null where part_color =3D 'b= '", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_UPDATE, "UPDATE PARTS SET PART_WEIGHT =3D NULL WHERE PARTS.PART_COLOR = =3D 'b'"); //$NON-NLS-1$ } = @@ -471,7 +400,6 @@ helpTestVisitor(getTestVDB(), "update parts set part_weight =3D 'a' where part_weight =3D nu= ll", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_UPDATE, "UPDATE PARTS SET PART_WEIGHT =3D 'a' WHERE NULL <> NULL"); //= $NON-NLS-1$ } = @@ -495,41 +423,41 @@ = ICommand result =3D new LanguageBridgeFactory(metadata).translate= (command); = - helpTestVisitorWithCommand(new HashMap(), TranslatedCommand.EXEC_T= YPE_QUERY, = - "SELECT PARTS.PART_NAME FROM PARTS GROUP BY concat(PARTS.PART_= ID, 'a')", //$NON-NLS-1$ - result, false, false); + helpTestVisitorWithCommand(new HashMap(), "SELECT PARTS.PART_NAME = FROM PARTS GROUP BY concat(PARTS.PART_ID, 'a')", = + result, //$NON-NLS-1$ + false, false); } = public void testPreparedStatementCreationWithUpdate() { helpTestVisitor(getTestVDB(), "update parts set part_weight =3D 'a' where part_w= eight < 5", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_UPDATE, - "UPDATE PARTS SET PART_WEIGHT =3D ? WHERE PARTS.PA= RT_WEIGHT < ?", false, true); //$NON-NLS-1$ + "UPDATE PARTS SET PART_WEIGHT =3D ? WHERE PARTS.PA= RT_WEIGHT < ?", + false, true); //$NON-NLS-1$ } = public void testPreparedStatementCreationWithInsert() { helpTestVisitor(getTestVDB(), "insert into parts (part_weight) values (5)", //$N= ON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_UPDATE, - "INSERT INTO PARTS (PART_WEIGHT) VALUES (?)", fals= e, true); //$NON-NLS-1$ + "INSERT INTO PARTS (PART_WEIGHT) VALUES (?)", + false, true); //$NON-NLS-1$ } = public void testPreparedStatementCreationWithSelect() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id not in = ('x', 'y') and part_weight < 6", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, - "SELECT PARTS.PART_NAME FROM PARTS WHERE (PARTS.PA= RT_ID NOT IN (?, ?)) AND (PARTS.PART_WEIGHT < ?)", false, true); //$NON-NLS= -1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE (PARTS.PA= RT_ID NOT IN (?, ?)) AND (PARTS.PART_WEIGHT < ?)", + false, true); //$NON-NLS-1$ } = public void testPreparedStatementCreationWithLike() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_name like = '%foo'", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, - "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PAR= T_NAME LIKE ?", false, true); //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PAR= T_NAME LIKE ?", + false, true); //$NON-NLS-1$ } = /** @@ -540,8 +468,8 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where 'x' =3D 'y'", /= /$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, - "SELECT PARTS.PART_NAME FROM PARTS WHERE 1 =3D ?",= false, true); //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE 1 =3D ?", + false, true); //$NON-NLS-1$ } = /** @@ -552,42 +480,42 @@ helpTestVisitor(getTestVDB(), "select part_name from parts where concat(part_nam= e, 'x') =3D concat('y', part_weight)", //$NON-NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, - "SELECT PARTS.PART_NAME FROM PARTS WHERE concat(PA= RTS.PART_NAME, 'x') =3D concat('y', PARTS.PART_WEIGHT)", false, true); //$N= ON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE concat(PA= RTS.PART_NAME, 'x') =3D concat('y', PARTS.PART_WEIGHT)", + false, true); //$NON-NLS-1$ } = public void testPreparedStatementCreationWithCase() { helpTestVisitor(getTestVDB(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PAR= T_WEIGHT =3D CASE WHEN PARTS.PART_NAME=3D'a' THEN 'b' ELSE 'c' END", //$NON= -NLS-1$ new HashMap(), - TranslatedCommand.EXEC_TYPE_QUERY, - "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PAR= T_WEIGHT =3D CASE WHEN PARTS.PART_NAME =3D ? THEN 'b' ELSE 'c' END", false,= true); //$NON-NLS-1$ + "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PAR= T_WEIGHT =3D CASE WHEN PARTS.PART_NAME =3D ? THEN 'b' ELSE 'c' END", + false, true); //$NON-NLS-1$ } = public void testVisitIDeleteWithComment() throws Exception { - String expected =3D "DELETE /*metamatrix sessionid:ConnectionID, r= equestid:RequestID.PartID*/ FROM g1 WHERE (100 >=3D 200) AND (500 < 600)"; = //$NON-NLS-1$ + String expected =3D "DELETE /*teiid sessionid:ConnectionID, reques= tid:RequestID.PartID*/ FROM g1 WHERE (100 >=3D 200) AND (500 < 600)"; //$NO= N-NLS-1$ assertEquals(expected, getStringWithContext(TestDeleteImpl.example= ())); } = public void testVisitIInsertWithComment() throws Exception { - String expected =3D "INSERT /*metamatrix sessionid:ConnectionID, r= equestid:RequestID.PartID*/ INTO g1 (e1, e2, e3, e4) VALUES (1, 2, 3, 4)"; = //$NON-NLS-1$ + String expected =3D "INSERT /*teiid sessionid:ConnectionID, reques= tid:RequestID.PartID*/ INTO g1 (e1, e2, e3, e4) VALUES (1, 2, 3, 4)"; //$NO= N-NLS-1$ assertEquals(expected, getStringWithContext(TestInsertImpl.example= ("g1"))); //$NON-NLS-1$ } = = public void testVisitISelectWithComment() throws Exception { - String expected =3D "SELECT /*metamatrix sessionid:ConnectionID, r= equestid:RequestID.PartID*/ g1.e1, g1.e2, g1.e3, g1.e4"; //$NON-NLS-1$ + String expected =3D "SELECT /*teiid sessionid:ConnectionID, reques= tid:RequestID.PartID*/ g1.e1, g1.e2, g1.e3, g1.e4"; //$NON-NLS-1$ assertEquals(expected, getStringWithContext(TestSelectImpl.example= (false))); - expected =3D "SELECT /*metamatrix sessionid:ConnectionID, requesti= d:RequestID.PartID*/ DISTINCT g1.e1, g1.e2, g1.e3, g1.e4"; //$NON-NLS-1$ + expected =3D "SELECT /*teiid sessionid:ConnectionID, requestid:Req= uestID.PartID*/ DISTINCT g1.e1, g1.e2, g1.e3, g1.e4"; //$NON-NLS-1$ assertEquals(expected, getStringWithContext(TestSelectImpl.example= (true))); } = public void testVisitIUpdateWithComment() throws Exception { - String expected =3D "UPDATE /*metamatrix sessionid:ConnectionID, r= equestid:RequestID.PartID*/ g1 SET e1 =3D 1, e2 =3D 1, e3 =3D 1, e4 =3D 1 W= HERE 1 =3D 1"; //$NON-NLS-1$ + String expected =3D "UPDATE /*teiid sessionid:ConnectionID, reques= tid:RequestID.PartID*/ g1 SET e1 =3D 1, e2 =3D 1, e3 =3D 1, e4 =3D 1 WHERE = 1 =3D 1"; //$NON-NLS-1$ assertEquals(expected, getStringWithContext(TestUpdateImpl.example= ())); } = = public void testVisitIProcedureWithComment() throws Exception { - String expected =3D "{ /*metamatrix sessionid:ConnectionID, reques= tid:RequestID.PartID*/ call sq3(?,?)}"; //$NON-NLS-1$ + String expected =3D "{ /*teiid sessionid:ConnectionID, requestid:R= equestID.PartID*/ call sq3(?,?)}"; //$NON-NLS-1$ assertEquals(expected, getStringWithContext(TestProcedureImpl.exam= ple())); } = } Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/oracle/TestOracleSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/orac= le/TestOracleSQLConversionVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/orac= le/TestOracleSQLConversionVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -24,7 +24,6 @@ = import java.util.Map; import java.util.Properties; -import java.util.TimeZone; = import junit.framework.TestCase; = @@ -34,6 +33,8 @@ import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.jdbc.JDBCPropertyNames; +import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; import com.metamatrix.connector.jdbc.extension.TranslatedCommand; import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; @@ -42,7 +43,6 @@ import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl; -import com.metamatrix.dqp.internal.datamgr.language.LanguageFactoryImpl; import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.query.metadata.QueryMetadataInterface; @@ -61,7 +61,7 @@ OracleSQLTranslator trans =3D new OracleSQLTranslator(); = try { - trans.initialize(new ConnectorEnvironmentImpl(new Properties()= , null, null), null); + trans.initialize(new ConnectorEnvironmentImpl(new Properties()= , null, null)); } catch(ConnectorException e) { e.printStackTrace(); } @@ -84,59 +84,51 @@ return UnitTestUtil.getTestDataPath() + "/PartsSupplierOracle.vdb"= ; //$NON-NLS-1$ } = - private String getTimestampTestVDB() { - return UnitTestUtil.getTestDataPath() + "/tstest.vdb"; //$NON-NLS-= 1$ + private void helpTestVisitor(String vdb, String input, Map modifiers, = String dbmsTimeZone, String expectedOutput) throws ConnectorException { + helpTestVisitor(vdb, input, modifiers, EMPTY_CONTEXT, dbmsTimeZone= , expectedOutput, false); } = - private void helpTestVisitor(String vdb, String input, Map modifiers, = String dbmsTimeZone, int expectedType, String expectedOutput) throws Connec= torException { - helpTestVisitor(vdb, input, modifiers, EMPTY_CONTEXT, dbmsTimeZone= , expectedType, expectedOutput, false); + private void helpTestVisitor(String vdb, String input, Map modifiers, = String dbmsTimeZone, String expectedOutput, boolean correctNaming) throws C= onnectorException { + helpTestVisitor(vdb, input, modifiers, EMPTY_CONTEXT, dbmsTimeZone= , expectedOutput, correctNaming); } = - private void helpTestVisitor(String vdb, String input, Map modifiers, = String dbmsTimeZone, int expectedType, String expectedOutput, boolean corre= ctNaming) throws ConnectorException { - helpTestVisitor(vdb, input, modifiers, EMPTY_CONTEXT, dbmsTimeZone= , expectedType, expectedOutput, correctNaming); - } - - private void helpTestVisitor(String vdb, String input, Map modifiers, = ExecutionContext context, String dbmsTimeZone, int expectedType, String exp= ectedOutput, boolean correctNaming) throws ConnectorException { + private void helpTestVisitor(String vdb, String input, Map modifiers, = ExecutionContext context, String dbmsTimeZone, String expectedOutput, boole= an correctNaming) throws ConnectorException { // Convert from sql to objects TranslationUtility util =3D new TranslationUtility(vdb); ICommand obj =3D util.parseCommand(input, correctNaming, true); = = - this.helpTestVisitor(obj, util.createRuntimeMetadata(), modifiers, conte= xt, dbmsTimeZone, expectedType, expectedOutput); + this.helpTestVisitor(obj, util.createRuntimeMetadata(), modifiers, conte= xt, dbmsTimeZone, expectedOutput); } = /** Helper method takes a QueryMetadataInterface impl instead of a VDB= filename = * @throws ConnectorException = */ - private void helpTestVisitor(QueryMetadataInterface metadata, String i= nput, Map modifiers, ExecutionContext context, String dbmsTimeZone, int exp= ectedType, String expectedOutput) throws ConnectorException { + private void helpTestVisitor(QueryMetadataInterface metadata, String i= nput, Map modifiers, ExecutionContext context, String dbmsTimeZone, String = expectedOutput) throws ConnectorException { // Convert from sql to objects CommandBuilder commandBuilder =3D new CommandBuilder(metadata); ICommand obj =3D commandBuilder.getCommand(input); RuntimeMetadata runtimeMetadata =3D new RuntimeMetadataImpl(new Me= tadataFactory(metadata)); - this.helpTestVisitor(obj, runtimeMetadata, modifiers, context, dbmsTimeZ= one, expectedType, expectedOutput); + this.helpTestVisitor(obj, runtimeMetadata, modifiers, context, dbmsTimeZ= one, expectedOutput); } = - private void helpTestVisitor(ICommand obj, RuntimeMetadata metadata, M= ap modifiers, ExecutionContext context, String dbmsTimeZone, int expectedTy= pe, String expectedOutput) throws ConnectorException { + private void helpTestVisitor(ICommand obj, RuntimeMetadata metadata, M= ap modifiers, ExecutionContext context, String dbmsTimeZone, String expecte= dOutput) throws ConnectorException { = = // Apply function replacement FunctionReplacementVisitor funcVisitor =3D new FunctionReplacement= Visitor(modifiers); - = + OracleSQLTranslator translator =3D new OracleSQLTranslator(); + Properties p =3D new Properties(); + if (dbmsTimeZone !=3D null) { + p.setProperty(JDBCPropertyNames.DATABASE_TIME_ZONE, dbmsTimeZone); + } + translator.initialize(EnvironmentUtility.createEnvironment(p, fals= e)); // Convert back to SQL - OracleSQLConversionVisitor sqlVisitor =3D new OracleSQLConversionV= isitor(); = - sqlVisitor.setFunctionModifiers(modifiers); = + SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= lator); = sqlVisitor.setExecutionContext(context); - sqlVisitor.setRuntimeMetadata(metadata); = - if(dbmsTimeZone !=3D null && dbmsTimeZone.trim().length() > 0) { - sqlVisitor.setDatabaseTimeZone(TimeZone.getTimeZone(dbmsTimeZo= ne)); = - } = - sqlVisitor.setLanguageFactory(LanguageFactoryImpl.INSTANCE); - OracleSQLTranslator translator =3D new OracleSQLTranslator(); - translator.initialize(EnvironmentUtility.createEnvironment(new Pro= perties(), false), metadata); TranslatedCommand tc =3D new TranslatedCommand(context, translator= , sqlVisitor, funcVisitor); tc.translateCommand(obj); = // Check stuff assertEquals("Did not get correct sql", expectedOutput, tc.getSql(= )); //$NON-NLS-1$ - assertEquals("Did not get expected command type", expectedType, tc= .getExecutionType()); //$NON-NLS-1$ } = /** @@ -151,19 +143,17 @@ helpTestVisitor(getTestVDB(), input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = /** defect 21775 */ public void testDateStuff() throws Exception { String input =3D "SELECT ((CASE WHEN month(datevalue) < 10 THEN ('= 0' || convert(month(datevalue), string)) ELSE convert(month(datevalue), str= ing) END || CASE WHEN dayofmonth(datevalue) < 10 THEN ('0' || convert(dayof= month(datevalue), string)) ELSE convert(dayofmonth(datevalue), string) END)= || convert(year(datevalue), string)), SUM(intkey) FROM bqt1.SMALLA GROUP B= Y datevalue"; //$NON-NLS-1$ - String output =3D "SELECT CASE WHEN (CASE WHEN (CASE WHEN EXTRACT(= MONTH FROM SmallA.DateValue) < 10 THEN CASE WHEN to_char(EXTRACT(MONTH FROM= SmallA.DateValue)) IS NULL THEN NULL ELSE ('0' || to_char(EXTRACT(MONTH FR= OM SmallA.DateValue))) END ELSE to_char(EXTRACT(MONTH FROM SmallA.DateValue= )) END IS NULL) OR (CASE WHEN TO_NUMBER(TO_CHAR(SmallA.DateValue, 'DD')) < = 10 THEN CASE WHEN to_char(TO_NUMBER(TO_CHAR(SmallA.DateValue, 'DD'))) IS NU= LL THEN NULL ELSE ('0' || to_char(TO_NUMBER(TO_CHAR(SmallA.DateValue, 'DD')= ))) END ELSE to_char(TO_NUMBER(TO_CHAR(SmallA.DateValue, 'DD'))) END IS NUL= L) THEN NULL ELSE (CASE WHEN EXTRACT(MONTH FROM SmallA.DateValue) < 10 THEN= CASE WHEN to_char(EXTRACT(MONTH FROM SmallA.DateValue)) IS NULL THEN NULL = ELSE ('0' || to_char(EXTRACT(MONTH FROM SmallA.DateValue))) END ELSE to_cha= r(EXTRACT(MONTH FROM SmallA.DateValue)) END || CASE WHEN TO_NUMBER(TO_CHAR(= SmallA.DateValue, 'DD')) < 10 THEN CASE WHEN to_char(TO_NUMBER(TO_CHAR(Smal= lA.DateValue, 'D! D'))) IS NULL THEN NULL ELSE ('0' || to_char(TO_NUMBER(TO_CHAR(SmallA.Date= Value, 'DD')))) END ELSE to_char(TO_NUMBER(TO_CHAR(SmallA.DateValue, 'DD'))= ) END) END IS NULL) OR (to_char(EXTRACT(YEAR FROM SmallA.DateValue)) IS NUL= L) THEN NULL ELSE (CASE WHEN (CASE WHEN EXTRACT(MONTH FROM SmallA.DateValue= ) < 10 THEN CASE WHEN to_char(EXTRACT(MONTH FROM SmallA.DateValue)) IS NULL= THEN NULL ELSE ('0' || to_char(EXTRACT(MONTH FROM SmallA.DateValue))) END = ELSE to_char(EXTRACT(MONTH FROM SmallA.DateValue)) END IS NULL) OR (CASE WH= EN TO_NUMBER(TO_CHAR(SmallA.DateValue, 'DD')) < 10 THEN CASE WHEN to_char(T= O_NUMBER(TO_CHAR(SmallA.DateValue, 'DD'))) IS NULL THEN NULL ELSE ('0' || t= o_char(TO_NUMBER(TO_CHAR(SmallA.DateValue, 'DD')))) END ELSE to_char(TO_NUM= BER(TO_CHAR(SmallA.DateValue, 'DD'))) END IS NULL) THEN NULL ELSE (CASE WHE= N EXTRACT(MONTH FROM SmallA.DateValue) < 10 THEN CASE WHEN to_char(EXTRACT(= MONTH FROM SmallA.DateValue)) IS NULL THEN NULL ELSE ('0' || to_char(EXTRAC= T(MONTH FROM S! mallA.DateValue))) END ELSE to_char(EXTRACT(MONTH FROM SmallA.DateValu e)) END || CASE WHEN TO_NUMBER(TO_CHAR(SmallA.DateValue, 'DD')) < 10 THEN C= ASE WHEN to_char(TO_NUMBER(TO_CHAR(SmallA.DateValue, 'DD'))) IS NULL THEN N= ULL ELSE ('0' || to_char(TO_NUMBER(TO_CHAR(SmallA.DateValue, 'DD')))) END E= LSE to_char(TO_NUMBER(TO_CHAR(SmallA.DateValue, 'DD'))) END) END || to_char= (EXTRACT(YEAR FROM SmallA.DateValue))) END, SUM(SmallA.IntKey) FROM SmallA = GROUP BY SmallA.DateValue"; //$NON-NLS-1$ + String output =3D "SELECT CASE WHEN (CASE WHEN (CASE WHEN EXTRACT(= MONTH FROM SmallA.DateValue) < 10 THEN CASE WHEN to_char(EXTRACT(MONTH FROM= SmallA.DateValue)) IS NULL THEN NULL ELSE concat('0', to_char(EXTRACT(MONT= H FROM SmallA.DateValue))) END ELSE to_char(EXTRACT(MONTH FROM SmallA.DateV= alue)) END IS NULL) OR (CASE WHEN EXTRACT(DAY FROM SmallA.DateValue) < 10 T= HEN CASE WHEN to_char(EXTRACT(DAY FROM SmallA.DateValue)) IS NULL THEN NULL= ELSE concat('0', to_char(EXTRACT(DAY FROM SmallA.DateValue))) END ELSE to_= char(EXTRACT(DAY FROM SmallA.DateValue)) END IS NULL) THEN NULL ELSE concat= (CASE WHEN EXTRACT(MONTH FROM SmallA.DateValue) < 10 THEN CASE WHEN to_char= (EXTRACT(MONTH FROM SmallA.DateValue)) IS NULL THEN NULL ELSE concat('0', t= o_char(EXTRACT(MONTH FROM SmallA.DateValue))) END ELSE to_char(EXTRACT(MONT= H FROM SmallA.DateValue)) END, CASE WHEN EXTRACT(DAY FROM SmallA.DateValue)= < 10 THEN CASE WHEN to_char(EXTRACT(DAY FROM SmallA.DateValue)) IS NULL TH= EN NULL ELSE con! cat('0', to_char(EXTRACT(DAY FROM SmallA.DateValue))) END ELSE to_char(EXT= RACT(DAY FROM SmallA.DateValue)) END) END IS NULL) OR (to_char(EXTRACT(YEAR= FROM SmallA.DateValue)) IS NULL) THEN NULL ELSE concat(CASE WHEN (CASE WHE= N EXTRACT(MONTH FROM SmallA.DateValue) < 10 THEN CASE WHEN to_char(EXTRACT(= MONTH FROM SmallA.DateValue)) IS NULL THEN NULL ELSE concat('0', to_char(EX= TRACT(MONTH FROM SmallA.DateValue))) END ELSE to_char(EXTRACT(MONTH FROM Sm= allA.DateValue)) END IS NULL) OR (CASE WHEN EXTRACT(DAY FROM SmallA.DateVal= ue) < 10 THEN CASE WHEN to_char(EXTRACT(DAY FROM SmallA.DateValue)) IS NULL= THEN NULL ELSE concat('0', to_char(EXTRACT(DAY FROM SmallA.DateValue))) EN= D ELSE to_char(EXTRACT(DAY FROM SmallA.DateValue)) END IS NULL) THEN NULL E= LSE concat(CASE WHEN EXTRACT(MONTH FROM SmallA.DateValue) < 10 THEN CASE WH= EN to_char(EXTRACT(MONTH FROM SmallA.DateValue)) IS NULL THEN NULL ELSE con= cat('0', to_char(EXTRACT(MONTH FROM SmallA.DateValue))) END ELSE to_char(EX= TRACT(MONTH FR! OM SmallA.DateValue)) END, CASE WHEN EXTRACT(DAY FROM SmallA.DateValue ) < 10 THEN CASE WHEN to_char(EXTRACT(DAY FROM SmallA.DateValue)) IS NULL T= HEN NULL ELSE concat('0', to_char(EXTRACT(DAY FROM SmallA.DateValue))) END = ELSE to_char(EXTRACT(DAY FROM SmallA.DateValue)) END) END, to_char(EXTRACT(= YEAR FROM SmallA.DateValue))) END, SUM(SmallA.IntKey) FROM SmallA GROUP BY = SmallA.DateValue"; //$NON-NLS-1$ = helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), input, = MODIFIERS, EMPTY_CONTEXT, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -180,7 +170,6 @@ helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), input, = MODIFIERS, EMPTY_CONTEXT, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = @@ -192,7 +181,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = = public void testLcaseFunction() throws Exception { @@ -203,7 +192,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = public void testUcaseFunction() throws Exception { @@ -214,7 +203,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = public void testIfnullFunction() throws Exception { @@ -225,7 +214,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = public void testLogFunction() throws Exception { @@ -236,7 +225,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = public void testLog10Function() throws Exception { @@ -247,7 +236,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = public void testConvertFunctionInteger() throws Exception { @@ -259,7 +248,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = public void testConvertFunctionChar() throws Exception { @@ -270,7 +259,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = public void testConvertFunctionBoolean() throws Exception { @@ -282,7 +271,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = public void testConvertFunctionDate() throws Exception { @@ -293,7 +282,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = public void testConvertFunctionTime() throws Exception { @@ -305,7 +294,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = public void testConvertFunctionTimestamp() throws Exception { @@ -317,7 +306,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = public void testExtractFunctionTimestamp() throws Exception { @@ -327,38 +316,14 @@ helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), input, = MODIFIERS, EMPTY_CONTEXT, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); } = - public void testFormatFunctionTimestamp() throws Exception { - String input =3D "SELECT formattimestamp(TIMESTAMPVALUE, 'YYYY-DD-= MM HH24:MI:SS.fffffffff') FROM BQT1.Smalla"; //$NON-NLS-1$ - String output =3D "SELECT to_char(SmallA.TimestampValue, 'YYYY-DD-= MM HH24:MI:SS.fffffffff') FROM SmallA"; //$NON-NLS-1$ - = - helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), - input, = - MODIFIERS, EMPTY_CONTEXT, null, - TranslatedCommand.EXEC_TYPE_QUERY, - output); - } - - public void testFormatFunctionTime() throws Exception { - String input =3D "SELECT formattime(TIMEVALUE, 'HH24:MI:SS') FROM = BQT1.Smalla"; //$NON-NLS-1$ - String output =3D "SELECT to_char(SmallA.TimeValue, 'HH24:MI:SS') = FROM SmallA"; //$NON-NLS-1$ - = - helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), - input, = - MODIFIERS, EMPTY_CONTEXT, null, - TranslatedCommand.EXEC_TYPE_QUERY, - output); - } - = public void testAliasedGroup() throws Exception { helpTestVisitor(getTestVDB(), "select y.part_name from parts as y", //$NON-NLS-1$ MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT y.PART_NAME FROM PARTS y"); //$NON-NLS-1$ } = @@ -367,7 +332,6 @@ "select {d'2002-12-31'} FROM parts", //$NON-NLS-1$ MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT {d'2002-12-31'} FROM PARTS"); //$NON-NLS-1$ } = @@ -376,7 +340,6 @@ "select {t'13:59:59'} FROM parts", //$NON-NLS-1$ MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT {ts'1970-01-01 13:59:59'} FROM PARTS"); //$NON-NLS-1$ } = @@ -385,34 +348,14 @@ "select {ts'2002-12-31 13:59:59'} FROM parts", //$NON-NLS-1$ MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT {ts'2002-12-31 13:59:59.0'} FROM PARTS"); //$NON-NLS-1$ } = - public void testTimestampLiteralInCriteria() throws Exception { - helpTestVisitor(getTimestampTestVDB(), - "select timestampvalue FROM hugea WHERE timestampvalue =3D {ts= '2002-12-31 13:59:59.0'}", //$NON-NLS-1$ - MODIFIERS, - null, - TranslatedCommand.EXEC_TYPE_QUERY, - "SELECT HUGEA.TIMESTAMPVALUE FROM HUGEA WHERE HUGEA.TIMESTAMPV= ALUE =3D to_timestamp('2002-12-31 13:59:59.0','YYYY-MM-DD HH24:MI:SS.FF')")= ; //$NON-NLS-1$ - } - - public void testTimestampLiteralInCriteria2() throws Exception { - helpTestVisitor(getTimestampTestVDB(), - "select datevalue FROM hugea WHERE datevalue =3D {ts'2002-12-3= 1 13:59:59.0'}", //$NON-NLS-1$ - MODIFIERS, - null, - TranslatedCommand.EXEC_TYPE_QUERY, - "SELECT HUGEA.DATEVALUE FROM HUGEA WHERE HUGEA.DATEVALUE =3D t= o_date('2002-12-31 13:59:59','YYYY-MM-DD HH24:MI:SS')"); //$NON-NLS-1$ - } - = public void testUnionOrderByWithThreeBranches() throws Exception { helpTestVisitor(getTestVDB(), "select part_id id FROM parts UNION ALL select par= t_name FROM parts UNION ALL select part_id FROM parts ORDER BY id", //$NON-= NLS-1$ MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, "(SELECT g_2.PART_ID AS c_0 FROM PARTS g_2 UNION A= LL SELECT g_1.PART_NAME AS c_0 FROM PARTS g_1) UNION ALL SELECT g_0.PART_ID= AS c_0 FROM PARTS g_0 ORDER BY c_0", true); //$NON-NLS-1$ } = @@ -421,7 +364,6 @@ "select part_id FROM parts UNION ALL select part_n= ame FROM parts ORDER BY part_id", //$NON-NLS-1$ MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT g_1.PART_ID AS c_0 FROM PARTS g_1 UNION AL= L SELECT g_0.PART_NAME AS c_0 FROM PARTS g_0 ORDER BY c_0", true); //$NON-N= LS-1$ } = @@ -430,7 +372,6 @@ "select part_id as p FROM parts UNION ALL select p= art_name FROM parts ORDER BY p", //$NON-NLS-1$ MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, "SELECT PARTS.PART_ID AS p FROM PARTS UNION ALL SE= LECT PARTS.PART_NAME FROM PARTS ORDER BY p"); //$NON-NLS-1$ } = @@ -441,7 +382,6 @@ helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), input, = MODIFIERS, EMPTY_CONTEXT, null, - TranslatedCommand.EXEC_TYPE_UPDATE, output); } = @@ -463,7 +403,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); + output); } = /** @@ -482,7 +422,7 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); = + output); = } = /** @@ -500,34 +440,10 @@ input, = MODIFIERS, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); = + output); = } = = /** - * Test using an Oracle sequence object to generate (via "nextVal") a = value to use - * in an insert statement. Currently, MM does not allow column names = in the value list - * of an Insert statement. This depends on the column being modeled w= ith special stuff - * in it's "name in source" field. Case 3743 - * = - * @since 4.3 - */ - public void testInsertUsingSequence() throws Exception { - = - String input =3D "INSERT INTO PARTS (PART_ID, PART_NAME, PART_COLO= R, PART_WEIGHT) VALUES ('blah', 'Toaster', 'Beige', '2 kilos')"; //$NON-NLS= -1$ - = - // Column "PART_ID" is modeled with a name in source of 'PART_ID:U= SE_SEQUENCE=3DMY_SEQ.nextVal', - // the Oracle SQL Connector will extract the sequence value and pu= t it in the db-specific SQL - String output =3D "INSERT INTO PARTS (PART_ID, PART_NAME, PART_COL= OR, PART_WEIGHT) VALUES (MY_SEQ.nextVal, 'Toaster', 'Beige', '2 kilos')"; /= /$NON-NLS-1$ - = - helpTestVisitor(getTestVDB(), - input, = - MODIFIERS, - null, - TranslatedCommand.EXEC_TYPE_UPDATE, output); = - = - } - = - /** * Case 3744. Test that an Oracle-specific db hint, delivered as a St= ring via command * payload, is added to the translated SQL. * = @@ -545,7 +461,7 @@ MODIFIERS, context, null, - TranslatedCommand.EXEC_TYPE_QUERY, output, false); = + output, false); = } = /** @@ -559,7 +475,7 @@ = FakeMetadataFacade metadata =3D exampleCase3845(); = - helpTestVisitor(metadata, input, MODIFIERS, EMPTY_CONTEXT, null, T= ranslatedCommand.EXEC_TYPE_QUERY, output); + helpTestVisitor(metadata, input, MODIFIERS, EMPTY_CONTEXT, null, o= utput); } = /** create fake BQT metadata to test this case, name in source is impo= rtant */ @@ -578,61 +494,36 @@ } = public void helpTestVisitor(String vdb, String input, String expectedOutp= ut) throws ConnectorException { - helpTestVisitor(vdb, input, MODIFIERS, null, TranslatedCommand.EXEC_TYPE= _QUERY, expectedOutput); + helpTestVisitor(vdb, input, MODIFIERS, null, expectedOutput); } = public void testRowLimit2() throws Exception { String input =3D "select intkey from bqt1.smalla limit 100"; //$NO= N-NLS-1$ - String output =3D "SELECT MM_VIEW_FOR_LIMIT.intkey FROM (SELECT MM= _VIEW_FOR_LIMIT.intkey, ROWNUM AS MM_ROWNUM FROM (SELECT SmallA.IntKey AS i= ntkey FROM SmallA) MM_VIEW_FOR_LIMIT) MM_VIEW_FOR_LIMIT WHERE MM_VIEW_FOR_L= IMIT.MM_ROWNUM <=3D 100"; //$NON-NLS-1$ + String output =3D "SELECT * FROM (SELECT SmallA.IntKey FROM SmallA= ) WHERE ROWNUM <=3D 100"; //$NON-NLS-1$ = helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), input, = MODIFIERS, EMPTY_CONTEXT, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); = } = public void testRowLimit3() throws Exception { String input =3D "select intkey from bqt1.smalla limit 50, 100"; /= /$NON-NLS-1$ - String output =3D "SELECT MM_VIEW_FOR_LIMIT.intkey FROM (SELECT MM= _VIEW_FOR_LIMIT.intkey, ROWNUM AS MM_ROWNUM FROM (SELECT SmallA.IntKey AS i= ntkey FROM SmallA) MM_VIEW_FOR_LIMIT) MM_VIEW_FOR_LIMIT WHERE (MM_VIEW_FOR_= LIMIT.MM_ROWNUM > 50) AND (MM_VIEW_FOR_LIMIT.MM_ROWNUM <=3D 150)"; //$NON-N= LS-1$ + String output =3D "SELECT * FROM (SELECT VIEW_FOR_LIMIT.*, ROWNUM = ROWNUM_ FROM (SELECT SmallA.IntKey FROM SmallA) VIEW_FOR_LIMIT WHERE ROWNUM= <=3D 100) WHERE ROWNUM_ > 50"; //$NON-NLS-1$ = helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), input, = MODIFIERS, EMPTY_CONTEXT, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); = } - = - public void testRowLimit4() throws Exception { - String input =3D "select intkey, null, null, null from bqt1.smalla= limit 50, 100"; //$NON-NLS-1$ - String output =3D "SELECT MM_VIEW_FOR_LIMIT.intkey, MM_VIEW_FOR_LI= MIT.expr, MM_VIEW_FOR_LIMIT.expr0, MM_VIEW_FOR_LIMIT.expr1 FROM (SELECT MM_= VIEW_FOR_LIMIT.intkey, MM_VIEW_FOR_LIMIT.expr, MM_VIEW_FOR_LIMIT.expr0, MM_= VIEW_FOR_LIMIT.expr1, ROWNUM AS MM_ROWNUM FROM (SELECT SmallA.IntKey AS int= key, NULL AS expr, NULL AS expr0, NULL AS expr1 FROM SmallA) MM_VIEW_FOR_LI= MIT) MM_VIEW_FOR_LIMIT WHERE (MM_VIEW_FOR_LIMIT.MM_ROWNUM > 50) AND (MM_VIE= W_FOR_LIMIT.MM_ROWNUM <=3D 150)"; //$NON-NLS-1$ - = - helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), - input, = - MODIFIERS, EMPTY_CONTEXT, null, - TranslatedCommand.EXEC_TYPE_QUERY, - output); = - } - = - public void testRowLimitWithOrderBy() throws Exception { - String input =3D "select null, intkey as expr, null from bqt1.smal= la order by expr limit 50, 100"; //$NON-NLS-1$ - String output =3D "SELECT MM_VIEW_FOR_LIMIT.expr, MM_VIEW_FOR_LIMI= T.expr0, MM_VIEW_FOR_LIMIT.expr1 FROM (SELECT MM_VIEW_FOR_LIMIT.expr, MM_VI= EW_FOR_LIMIT.expr0, MM_VIEW_FOR_LIMIT.expr1, ROWNUM AS MM_ROWNUM FROM (SELE= CT NULL AS expr, SmallA.IntKey AS expr0, NULL AS expr1 FROM SmallA ORDER BY= expr0) MM_VIEW_FOR_LIMIT) MM_VIEW_FOR_LIMIT WHERE (MM_VIEW_FOR_LIMIT.MM_RO= WNUM > 50) AND (MM_VIEW_FOR_LIMIT.MM_ROWNUM <=3D 150)"; //$NON-NLS-1$ - = - helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), - input, = - MODIFIERS, EMPTY_CONTEXT, null, - TranslatedCommand.EXEC_TYPE_QUERY, - output); = - } - = + = public void testLimitWithNestedInlineView() throws Exception { String input =3D "select max(intkey), stringkey from (select intke= y, stringkey from bqt1.smalla order by intkey limit 100) x group by intkey"= ; //$NON-NLS-1$ - String output =3D "SELECT MAX(x.intkey), x.stringkey FROM (SELECT = MM_VIEW_FOR_LIMIT.intkey, MM_VIEW_FOR_LIMIT.stringkey FROM (SELECT MM_VIEW_= FOR_LIMIT.intkey, MM_VIEW_FOR_LIMIT.stringkey, ROWNUM AS MM_ROWNUM FROM (SE= LECT SmallA.IntKey AS intkey, SmallA.StringKey AS stringkey FROM SmallA ORD= ER BY intkey) MM_VIEW_FOR_LIMIT) MM_VIEW_FOR_LIMIT WHERE MM_VIEW_FOR_LIMIT.= MM_ROWNUM <=3D 100) x GROUP BY x.intkey"; //$NON-NLS-1$ + String output =3D "SELECT MAX(x.intkey), x.stringkey FROM (SELECT = * FROM (SELECT SmallA.IntKey, SmallA.StringKey FROM SmallA ORDER BY intkey)= WHERE ROWNUM <=3D 100) x GROUP BY x.intkey"; //$NON-NLS-1$ = helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), input, = MODIFIERS, EMPTY_CONTEXT, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); = } = @@ -643,7 +534,6 @@ helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), input, = MODIFIERS, EMPTY_CONTEXT, null, - TranslatedCommand.EXEC_TYPE_QUERY, output); = } = Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestMetadataID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestMetadataID.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestMetadataID.java 2009-02-19 17:59:09 UTC (rev 476) @@ -38,6 +38,7 @@ import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.metadata.runtime.MetadataID.Type; import com.metamatrix.core.util.UnitTestUtil; = /** @@ -75,7 +76,7 @@ MetadataID groupID =3D getGroupID(fullGroupName, transUtil); = assertEquals(fullGroupName, groupID.getFullName()); assertEquals(shortGroupName, groupID.getName()); - assertEquals(MetadataID.TYPE_GROUP, groupID.getType()); + assertEquals(Type.TYPE_GROUP, groupID.getType()); assertNull(groupID.getParentID()); = // Check children @@ -84,7 +85,7 @@ Iterator childIter =3D children.iterator(); while(childIter.hasNext()) { MetadataID childID =3D (MetadataID) childIter.next(); - assertEquals(MetadataID.TYPE_ELEMENT, childID.getType()); + assertEquals(Type.TYPE_ELEMENT, childID.getType()); assertEquals(groupID, childID.getParentID()); assertTrue(childID.getFullName().startsWith(groupID.getFullNam= e())); = } @@ -109,7 +110,7 @@ = public void helpTestElementID(String groupName, String elementName, Tr= anslationUtility transUtil) throws Exception { MetadataID elementID =3D getElementID(groupName, elementName, tran= sUtil); = - assertEquals(MetadataID.TYPE_ELEMENT, elementID.getType()); + assertEquals(Type.TYPE_ELEMENT, elementID.getType()); assertEquals(groupName + "." + elementName, elementID.getFullName(= )); //$NON-NLS-1$ assertEquals(elementName, elementID.getName()); assertEquals(Collections.EMPTY_LIST, elementID.getChildIDs()); @@ -145,7 +146,7 @@ = public void helpTestProcedureID(String procName, String shortName, int= inputParamCount, String[] paramNames, TranslationUtility transUtil) throws= Exception { MetadataID procID =3D getProcedureID(procName, inputParamCount, tr= ansUtil); = - assertEquals(MetadataID.TYPE_PROCEDURE, procID.getType()); + assertEquals(Type.TYPE_PROCEDURE, procID.getType()); assertEquals(procName, procID.getFullName()); //$NON-NLS-1$ assertNull(procID.getParentID()); assertEquals(shortName, procID.getName()); @@ -157,7 +158,7 @@ Iterator childIter =3D children.iterator(); while(childIter.hasNext()) { MetadataID childID =3D (MetadataID) childIter.next(); - assertEquals(MetadataID.TYPE_PARAMETER, childID.getType()); + assertEquals(Type.TYPE_PARAMETER, childID.getType()); assertEquals(procID, childID.getParentID()); assertTrue(childID.getFullName().startsWith(procID.getFullName= ())); = Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestParams.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestParams.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestParams.java 2009-02-19 17:59:09 UTC (rev 476) @@ -35,6 +35,7 @@ import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.Parameter; import com.metamatrix.connector.metadata.runtime.TypeModel; +import com.metamatrix.connector.metadata.runtime.MetadataID.Type; import com.metamatrix.core.util.UnitTestUtil; = = @@ -103,7 +104,7 @@ assertEquals(scale, p.getScale()); assertEquals(null, param.getValue()); assertEquals(false, param.getValueSpecified()); = - assertEquals(MetadataID.TYPE_PARAMETER, metadataID.getType()); + assertEquals(Type.TYPE_PARAMETER, metadataID.getType()); = //System.out.println("\n" + p.getModeledType() + "\n" + p.getModel= edBaseType() + "\n" + p.getModeledPrimitiveType()); = Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestProcedure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestProcedure.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestProcedure.java 2009-02-19 17:59:09 UTC (rev 476) @@ -36,6 +36,7 @@ import com.metamatrix.connector.metadata.runtime.Parameter; import com.metamatrix.connector.metadata.runtime.Procedure; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.metadata.runtime.MetadataID.Type; import com.metamatrix.core.util.UnitTestUtil; = /** @@ -130,7 +131,7 @@ MetadataID elemID =3D (MetadataID) rsCols.get(0); assertEquals("RSCol1", elemID.getName()); //$NON-NLS-1$ assertEquals("ConnectorMetadata.TestProc2.RSParam.RSCol1", elemID.= getFullName()); //$NON-NLS-1$ - assertEquals(MetadataID.TYPE_ELEMENT, elemID.getType()); = + assertEquals(Type.TYPE_ELEMENT, elemID.getType()); = Element e1 =3D (Element) rmd.getObject(elemID); assertEquals("Result set column name in source", e1.getNameInSourc= e()); //$NON-NLS-1$ assertEquals(java.sql.Timestamp.class, e1.getJavaType()); @@ -139,7 +140,7 @@ MetadataID elemID2 =3D (MetadataID) rsCols.get(1); = assertEquals("RSCol2", elemID2.getName()); //$NON-NLS-1$ assertEquals("ConnectorMetadata.TestProc2.RSParam.RSCol2", elemID2= .getFullName()); //$NON-NLS-1$ - assertEquals(MetadataID.TYPE_ELEMENT, elemID2.getType()); = + assertEquals(Type.TYPE_ELEMENT, elemID2.getType()); = Element e2 =3D (Element) rmd.getObject(elemID2); assertEquals(null, e2.getNameInSource()); //$NON-NLS-1$ assertEquals(String.class, e2.getJavaType()); Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/= util/TestSQLStringVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estSQLStringVisitor.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estSQLStringVisitor.java 2009-02-19 17:59:09 UTC (rev 476) @@ -34,8 +34,8 @@ import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.IGroup; import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.metadata.runtime.MetadataID.Type; import com.metamatrix.connector.visitor.util.SQLStringVisitor; import com.metamatrix.dqp.internal.datamgr.language.AggregateImpl; import com.metamatrix.dqp.internal.datamgr.language.ElementImpl; @@ -43,7 +43,6 @@ import com.metamatrix.dqp.internal.datamgr.language.GroupImpl; import com.metamatrix.dqp.internal.datamgr.language.LiteralImpl; import com.metamatrix.dqp.internal.datamgr.language.TestAggregateImpl; -import com.metamatrix.dqp.internal.datamgr.language.TestCaseExpressionImpl; import com.metamatrix.dqp.internal.datamgr.language.TestCompareCriteriaImp= l; import com.metamatrix.dqp.internal.datamgr.language.TestDeleteImpl; import com.metamatrix.dqp.internal.datamgr.language.TestElementImpl; @@ -66,9 +65,9 @@ import com.metamatrix.dqp.internal.datamgr.language.TestSearchedCaseExpres= sionImpl; import com.metamatrix.dqp.internal.datamgr.language.TestSelectImpl; import com.metamatrix.dqp.internal.datamgr.language.TestSelectSymbolImpl; +import com.metamatrix.dqp.internal.datamgr.language.TestSetQueryImpl; import com.metamatrix.dqp.internal.datamgr.language.TestSubqueryCompareCri= teriaImpl; import com.metamatrix.dqp.internal.datamgr.language.TestSubqueryInCriteria= Impl; -import com.metamatrix.dqp.internal.datamgr.language.TestSetQueryImpl; import com.metamatrix.dqp.internal.datamgr.language.TestUpdateImpl; import com.metamatrix.dqp.internal.datamgr.language.TstLanguageBridgeFacto= ry; import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; @@ -84,7 +83,7 @@ = public class TestSQLStringVisitor extends TestCase { = - public static final RuntimeMetadata metadata =3D TstLanguageBridgeFact= ory.metadataFactory.createRuntimeMetadata(); + public static final RuntimeMetadata metadata =3D TstLanguageBridgeFact= ory.metadataFactory.getRuntimeMetadata(); = = /** @@ -96,11 +95,11 @@ } = private String getString(ILanguageObject obj) { - return SQLStringVisitor.getSQLString(obj, metadata); + return SQLStringVisitor.getSQLString(obj); } = private String getString(ILanguageObject obj, RuntimeMetadata metadata= ) { - return SQLStringVisitor.getSQLString(obj, metadata); + return SQLStringVisitor.getSQLString(obj); } = /** create fake BQT metadata to test this case, name in source is impo= rtant */ @@ -139,54 +138,6 @@ } = /* - * Test for void visit(ICaseExpression) - */ - public void testVisitICaseExpression() throws Exception { - String expected =3D "CASE WHEN g1.e1=3D'a' THEN 0 WHEN g1.e1=3D'b'= THEN 1 WHEN g1.e1=3D'c' THEN 2 ELSE 9999 END"; //$NON-NLS-1$ - assertEquals(expected, getString(TestCaseExpressionImpl.example())= ); - } - - /* - * Test for void visit(ICaseExpression) - */ - public void testVisitICaseExpressionNulFirst() throws Exception { - String expected =3D "CASE WHEN g1.e1 IS NULL THEN 0 WHEN g1.e1=3D'= b' THEN 1 WHEN g1.e1=3D'c' THEN 2 ELSE 9999 END"; //$NON-NLS-1$ - assertEquals(expected, getString(TestCaseExpressionImpl.exampleNul= lFirst())); - } - - /* - * Test for void visit(ICaseExpression) - */ - public void testVisitICaseExpressionNullMiddle() throws Exception { - String expected =3D "CASE WHEN g1.e1 IS NULL THEN 1 WHEN g1.e1=3D'= a' THEN 0 WHEN g1.e1=3D'c' THEN 2 ELSE 9999 END"; //$NON-NLS-1$ - assertEquals(expected, getString(TestCaseExpressionImpl.exampleNul= lMiddle())); - } - = - /* - * Test for void visit(ICaseExpression) - */ - public void testVisitICaseExpressionNullLast() throws Exception { - String expected =3D "CASE WHEN g1.e1 IS NULL THEN 2 WHEN g1.e1=3D'= a' THEN 0 WHEN g1.e1=3D'b' THEN 1 ELSE 9999 END"; //$NON-NLS-1$ - assertEquals(expected, getString(TestCaseExpressionImpl.exampleNul= lLast())); - } - = - /* - * Test for void visit(ICaseExpression) - */ - public void testVisitICaseExpressionNullElse() throws Exception { - String expected =3D "CASE WHEN g1.e1=3D'a' THEN 0 WHEN g1.e1=3D'b'= THEN 1 WHEN g1.e1=3D'c' THEN 2 ELSE g1.e1 END"; //$NON-NLS-1$ - assertEquals(expected, getString(TestCaseExpressionImpl.exampleEle= mentElse() ) ); - } - = - /* - * Test for void visit(ICaseExpression) - */ - public void testVisitICaseExpressionInteger() throws Exception { - String expected =3D "CASE WHEN g1.e1=3D'a' THEN 0 WHEN g1.e1=3D'b'= THEN 1 WHEN g1.e1=3D'c' THEN 2 ELSE g1.e1 END"; //$NON-NLS-1$ - assertEquals(expected, getString(TestCaseExpressionImpl.exampleInt= eger() ) ); - } - = - /* * Test for void visit(ICompareCriteria) */ public void testVisitICompareCriteria() throws Exception { @@ -269,8 +220,8 @@ = IExpression [] params =3D null; params =3D new IExpression[2]; - IGroup g =3D new GroupImpl("SmallA", null, metadataFactory.createM= etadataID(facade.getStore().findObject("BQT1.SmallA", FakeMetadataObject.GR= OUP), MetadataID.TYPE_GROUP)); //$NON-NLS-1$ - IElement e =3D new ElementImpl(g, "DoubleNum", metadataFactory.cre= ateMetadataID(facade.getStore().findObject("DoubleNum", FakeMetadataObject.= ELEMENT), MetadataID.TYPE_ELEMENT), Double.class); //$NON-NLS-1$ //$NON-NLS= -2$ + IGroup g =3D new GroupImpl("SmallA", null, metadataFactory.createM= etadataID(facade.getStore().findObject("BQT1.SmallA", FakeMetadataObject.GR= OUP), Type.TYPE_GROUP)); //$NON-NLS-1$ + IElement e =3D new ElementImpl(g, "DoubleNum", metadataFactory.cre= ateMetadataID(facade.getStore().findObject("DoubleNum", FakeMetadataObject.= ELEMENT), Type.TYPE_ELEMENT), Double.class); //$NON-NLS-1$ //$NON-NLS-2$ params[0] =3D e; params[1] =3D new LiteralImpl("integer", String.class); //$NON-NLS= -1$ = @@ -294,19 +245,6 @@ assertEquals(expected, getString(test)); = } = - public void testVisitConvertFunctionSQLServerStyle() throws Exception { - String expected =3D "convert(integer, columnA)"; //$NON-NLS-1$ - = - IExpression [] params =3D null; - params =3D new IExpression[2]; - params[0] =3D new LiteralImpl("integer", String.class); //$NON-NLS= -1$ - params[1] =3D new ElementImpl(null, "columnA", null, String.class)= ; //$NON-NLS-1$ - IFunction test =3D new FunctionImpl("convert", params, Integer.cla= ss); //$NON-NLS-1$ - = - assertEquals(expected, getString(test)); = - = - } - /* * Test for void visit(IGroup) */ --===============6809785816857133231==-- From teiid-commits at lists.jboss.org Thu Feb 19 12:59:15 2009 Content-Type: multipart/mixed; boundary="===============7778773829680755282==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r477 - trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/xa. Date: Thu, 19 Feb 2009 12:59:15 -0500 Message-ID: --===============7778773829680755282== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-19 12:59:14 -0500 (Thu, 19 Feb 2009) New Revision: 477 Removed: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/db2/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/informix/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/oracle/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/sqlserver/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/sybase/ Log: TEIID-360 TEIID-359 TEIID-357 TEIID-356 TEIID-354 TEIID-353 TEIID-352 TEIID= -164 jdbc connector api cleanup. created canonical push-down function list= , changed the SQLTranslator to handle the tasks that were previously in spe= cific SQLConversionVisitors. --===============7778773829680755282==-- From teiid-commits at lists.jboss.org Fri Feb 20 16:08:28 2009 Content-Type: multipart/mixed; boundary="===============5892116029107723126==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r478 - trunk/connectors/connector-xml-common. Date: Fri, 20 Feb 2009 16:08:28 -0500 Message-ID: --===============5892116029107723126== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-20 16:08:28 -0500 (Fri, 20 Feb 2009) New Revision: 478 Modified: trunk/connectors/connector-xml-common/ Log: Adding the .classpath ignores Property changes on: trunk/connectors/connector-xml-common ___________________________________________________________________ Name: svn:ignore - target .project bin + target .project bin .classpath .settings --===============5892116029107723126==-- From teiid-commits at lists.jboss.org Fri Feb 20 19:28:45 2009 Content-Type: multipart/mixed; boundary="===============7365512102065225182==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r479 - in trunk: build/assembly and 40 other directories. Date: Fri, 20 Feb 2009 19:28:44 -0500 Message-ID: --===============7365512102065225182== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-20 19:28:43 -0500 (Fri, 20 Feb 2009) New Revision: 479 Added: trunk/build/assembly/embedded/embedded-client-jar.xml trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnecti= onListener.java trunk/embedded/src/main/java/com/metamatrix/jdbc/LogConfigurationProvide= r.java trunk/embedded/src/main/java/com/metamatrix/jdbc/LogListernerProvider.ja= va trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalServerCo= nnection.java trunk/embedded/src/main/resources/deploy.properties trunk/embedded/src/main/resources/jboss-cache-configuration.xml trunk/embedded/src/test/resources/jboss-cache-configuration.xml trunk/server/src/main/java/com/metamatrix/server/LogConfigurationProvide= r.java trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProvi= der.java Removed: trunk/cache-jbosscache/src/main/resources/jboss-cache-configuration.xml trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionTr= acker.java trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Def= aultLogConfigurationFactory.java trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Log= ConfigurationFactory.java trunk/common-internal/src/main/java/com/metamatrix/common/log/format/Del= imitedLogMessageFormat.java trunk/common-internal/src/main/java/com/metamatrix/common/log/format/Log= MessageFormat.java trunk/common-internal/src/test/java/com/metamatrix/common/log/format/Tes= tLogMessageFormat.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedMana= ger.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPListener.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/EmbeddedConfigU= til.java trunk/embedded/src/main/resources/mm.properties trunk/engine/src/main/java/com/metamatrix/dqp/application/ trunk/server/src/main/java/com/metamatrix/platform/config/ConfigurationC= hangeListener.java trunk/server/src/main/java/com/metamatrix/platform/vm/util/VMUtils.java Modified: trunk/build/assembly/embedded/embedded-dependencies.xml trunk/build/assembly/embedded/embedded-dist.xml trunk/build/assembly/embedded/embedded-jar.xml trunk/build/assembly/src.xml trunk/build/kit-embedded/examples/portfolio/run.bat trunk/build/kit-embedded/examples/portfolio/run.sh trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFa= ctory.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java trunk/client/src/main/java/com/metamatrix/admin/api/objects/Request.java trunk/client/src/main/java/com/metamatrix/admin/objects/MMRequest.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/MMURLConn= ection.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmfile/MM= FileURLConnection.java trunk/common-core/src/main/java/com/metamatrix/core/log/LogMessage.java trunk/common-core/src/main/java/com/metamatrix/internal/core/log/Platfor= mLog.java trunk/common-internal/pom.xml trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigu= ration.java trunk/common-internal/src/main/java/com/metamatrix/common/log/LogManager= .java trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Bas= icLogConfiguration.java trunk/common-internal/src/test/java/com/metamatrix/common/log/TestLogMan= ager.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Comma= ndShell.java trunk/console/src/main/java/com/metamatrix/console/main/AdminConsoleMain= .java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedProp= erties.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/EmbeddedConfigS= ource.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmin= .java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfig= AdminImpl.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonito= ringAdminImpl.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRuntim= eStateAdminImpl.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPSecuri= tyAdminImpl.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embedd= edConfigurationService.java trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnection.java trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFacto= ryImpl.java trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedGuiceModule.java trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalTranspor= tHandler.java trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/TestEmbeddedCon= figSource.java trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestEm= beddedConfigurationService.java trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java trunk/engine/src/main/java/com/metamatrix/dqp/service/ConfigurationServi= ce.java trunk/engine/src/test/java/com/metamatrix/dqp/config/TestDQPLauncher.java trunk/pom.xml trunk/server/src/main/java/com/metamatrix/common/log/DbLogListener.java trunk/server/src/main/java/com/metamatrix/common/log/DbLogWriter.java trunk/server/src/main/java/com/metamatrix/common/log/I18nLogManager.java trunk/server/src/main/java/com/metamatrix/common/log/reader/DBLogReader.= java trunk/server/src/main/java/com/metamatrix/platform/security/audit/destin= ation/ConsoleAuditDestination.java trunk/server/src/main/java/com/metamatrix/platform/vm/controller/VMContr= oller.java trunk/server/src/main/java/com/metamatrix/server/HostController.java trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceModu= le.java trunk/server/src/main/java/com/metamatrix/server/Main.java trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonitor= ingAdminImpl.java Log: TEIID-66, TEIID-361: Embedded can only have one instance running; Guice sta= rt-up; Connection listening re-factored; LogManager made configurable. Revi= ewed By SH. Added: trunk/build/assembly/embedded/embedded-client-jar.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/assembly/embedded/embedded-client-jar.xml = (rev 0) +++ trunk/build/assembly/embedded/embedded-client-jar.xml 2009-02-21 00:28:= 43 UTC (rev 479) @@ -0,0 +1,35 @@ + + + = + client + = + + jar + + = + false + teiid-embedded-client + = + + + true + = + + org.jboss.teiid:teiid-client + org.jboss.teiid:teiid-client-jdbc = + org.jboss.teiid:teiid-common-core = + + = + + false + true + + + :jar:* + + + = + + + + \ No newline at end of file Property changes on: trunk/build/assembly/embedded/embedded-client-jar.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/build/assembly/embedded/embedded-dependencies.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/assembly/embedded/embedded-dependencies.xml 2009-02-20 21:0= 8:28 UTC (rev 478) +++ trunk/build/assembly/embedded/embedded-dependencies.xml 2009-02-21 00:2= 8:43 UTC (rev 479) @@ -45,7 +45,6 @@ antlr* bsh* - jgroups* netty* stringtemplate* = Modified: trunk/build/assembly/embedded/embedded-dist.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/assembly/embedded/embedded-dist.xml 2009-02-20 21:08:28 UTC= (rev 478) +++ trunk/build/assembly/embedded/embedded-dist.xml 2009-02-21 00:28:43 UTC= (rev 479) @@ -17,10 +17,17 @@ teiid-${version}-embedded.jar + lib = + + = + + target/distribution + + teiid-${version}-client.jar + / = - = - = + = target/distribution/teiid-${version}-embedded-dependencie= s.dir Modified: trunk/build/assembly/embedded/embedded-jar.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/assembly/embedded/embedded-jar.xml 2009-02-20 21:08:28 UTC = (rev 478) +++ trunk/build/assembly/embedded/embedded-jar.xml 2009-02-21 00:28:43 UTC = (rev 479) @@ -16,9 +16,6 @@ = org.jboss.teiid:teiid-cache-jbosscache - org.jboss.teiid:teiid-client - org.jboss.teiid:teiid-client-jdbc = - org.jboss.teiid:teiid-common-core = org.jboss.teiid:teiid-common-internal = org.jboss.teiid:teiid-connector-api Modified: trunk/build/assembly/src.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/assembly/src.xml 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/build/assembly/src.xml 2009-02-21 00:28:43 UTC (rev 479) @@ -36,6 +36,8 @@ .classpath .project **/.settings/** + **/*.log + = = Modified: trunk/build/kit-embedded/examples/portfolio/run.bat =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/kit-embedded/examples/portfolio/run.bat 2009-02-20 21:08:28= UTC (rev 478) +++ trunk/build/kit-embedded/examples/portfolio/run.bat 2009-02-21 00:28:43= UTC (rev 479) @@ -2,7 +2,7 @@ set CLIENT_PATH=3Djava/*;PortfolioModel/ = rem Second one for the JARs in Teiid embedded -set TEIID_PATH=3D../../teiid-6.0.0-SNAPSHOT-embedded.jar;../../lib/*;../..= /extensions/* +set TEIID_PATH=3D../../teiid-6.0.0-SNAPSHOT-client.jar;../../lib/*;../../e= xtensions/* = java -cp %CLIENT_PATH%;%TEIID_PATH% JDBCClient "select * from CustomerAcco= unt" = Modified: trunk/build/kit-embedded/examples/portfolio/run.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/kit-embedded/examples/portfolio/run.sh 2009-02-20 21:08:28 = UTC (rev 478) +++ trunk/build/kit-embedded/examples/portfolio/run.sh 2009-02-21 00:28:43 = UTC (rev 479) @@ -4,6 +4,6 @@ CLIENT_PATH=3Djava/*:PortfolioModel/ = #Second one for the JARs in Teiid embedded -TEIID_PATH=3D../../teiid-6.0.0-SNAPSHOT-embedded.jar:../../lib/*:../../ext= ensions/* +TEIID_PATH=3D../../teiid-6.0.0-SNAPSHOT-client.jar:../../lib/*:../../exten= sions/* = java -cp ${CLIENT_PATH}:${TEIID_PATH} JDBCClient "select * from CustomerAc= count" Deleted: trunk/cache-jbosscache/src/main/resources/jboss-cache-configuratio= n.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cache-jbosscache/src/main/resources/jboss-cache-configuration.xml= 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/cache-jbosscache/src/main/resources/jboss-cache-configuration.xml= 2009-02-21 00:28:43 UTC (rev 479) @@ -1,72 +0,0 @@ - - - - org.jboss.cache.tr= ansaction.GenericTransactionManagerLookup - READ_COMMITTED - true - = - LOCAL - true - - - 20000 - = - - 20000 - = - - 15000 - = - - DEFAULT - - true - - - - - - false - - true - - - org.jboss.cache.loader.FileCacheLoader - location=3D./target/scratch/federate = - - - true - = - - true - - - false - - - - - - - 3 - - 100000 - - org.jboss.cache.eviction.LRUPoli= cy - - - 10000 - 0 - - - - = - - = \ No newline at end of file Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Reque= st.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Request.jav= a 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Request.jav= a 2009-02-21 00:28:43 UTC (rev 479) @@ -53,7 +53,7 @@ * = * @return long SessionID */ - public long getSessionID(); + public String getSessionID(); = /** * Get the SQL Command sent to the Server for a Request Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMRequest= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/objects/MMRequest.java = 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMRequest.java = 2009-02-21 00:28:43 UTC (rev 479) @@ -34,7 +34,7 @@ public class MMRequest extends MMAdminObject implements Request{ = String userName =3D ""; //$NON-NLS-1$; - long sessionID; + String sessionID; String requestID; Date created; Date processingDate; @@ -52,7 +52,7 @@ public MMRequest(String[] identifierParts) { super(identifierParts); = - this.sessionID =3D Long.parseLong(identifierParts[0]); + this.sessionID =3D identifierParts[0]; this.requestID =3D identifierParts[1]; if (identifierParts.length >=3D 3) { this.nodeID =3D identifierParts[2]; @@ -100,7 +100,7 @@ * = * @return long SessionID */ - public long getSessionID() { + public String getSessionID() { return sessionID; } = @@ -167,7 +167,7 @@ * @param sessionID The sessionID to set. * @since 4.3 */ - public void setSessionID(long sessionID) { + public void setSessionID(String sessionID) { this.sessionID =3D sessionID; } /** = Added: trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConn= ectionListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnect= ionListener.java (rev 0) +++ trunk/client/src/main/java/com/metamatrix/common/comm/api/ServerConnect= ionListener.java 2009-02-21 00:28:43 UTC (rev 479) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.common.comm.api; + +import com.metamatrix.common.comm.api.ServerConnection; + + +/** = + * An implementor of this interface, when registered with the ServerConnec= tion will + * receive notifications about the connection life cycle events. + */ +public interface ServerConnectionListener { + /** + * A connection has been added to DQP + * @param connection The client connection instance, never null + */ + void connectionAdded(ServerConnection connection); + = + /** + * A connection has been removed for DQP + * @param connection The client connection instance, never null + */ + void connectionRemoved(ServerConnection connection); + = +} Property changes on: trunk/client/src/main/java/com/metamatrix/common/comm/= api/ServerConnectionListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConne= ctionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionF= actory.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionF= actory.java 2009-02-21 00:28:43 UTC (rev 479) @@ -41,12 +41,6 @@ public Connection createConnection(Properties properties) throws SQLEx= ception; = = /** - * Register a Connection lifecycle listener to the this DQP instance = - * @param listener a listerner for connection related events. - */ - public void registerConnectionListener(ConnectionListener listener); - = - /** * Shutdown the connection factory, including the DQP and all its exis= ting connections = */ public void shutdown() throws SQLException; Deleted: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnec= tionTracker.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionT= racker.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionT= racker.java 2009-02-21 00:28:43 UTC (rev 479) @@ -1,72 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.jdbc; - -import java.net.URL; -import java.sql.Connection; -import java.util.HashSet; -import java.util.Set; - - -/** = - * This object keeps track of connections for a given dqp instance which is - * identified by the "dqpURL". The main responsibility of this listener is= to - * take down the DQP instance when the connection count to the DQP goes do= wn - * to zero. - */ -class EmbeddedConnectionTracker implements ConnectionListener { - - private URL dqpURL =3D null; - private EmbeddedDriver dqpDriver =3D null; - private Set connections =3D new HashSet(); - = - = - public EmbeddedConnectionTracker(URL dqpURL, EmbeddedDriver dqpDriver)= { - this.dqpURL =3D dqpURL; - this.dqpDriver =3D dqpDriver; - } - - public void connectionAdded(String id, Connection connection) { - synchronized (connections) { - connections.add(connection); = - } - } - = - public void connectionRemoved(String id, Connection connection) { - synchronized (connections) { - connections.remove(connection); - if(connections.size() =3D=3D 0) { - dqpDriver.shutdown(dqpURL); - } - } - } - = - public Set getConnections() { - Set tempSet =3D null; - synchronized (connections) { - tempSet =3D new HashSet(connections); - } - return tempSet; - } - = -} Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDrive= r.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java= 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/EmbeddedDriver.java= 2009-02-21 00:28:43 UTC (rev 479) @@ -25,7 +25,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.net.MalformedURLException; +import java.io.ObjectInputStream; import java.net.URL; import java.sql.Connection; import java.sql.DriverManager; @@ -34,15 +34,14 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Enumeration; -import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Properties; -import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; = import com.metamatrix.common.classloader.NonDelegatingClassLoader; +import com.metamatrix.common.protocol.MMURLConnection; import com.metamatrix.common.protocol.MetaMatrixURLStreamHandlerFactory; import com.metamatrix.common.protocol.URLHelper; import com.metamatrix.jdbc.util.MMJDBCURL; @@ -76,7 +75,7 @@ static final String DQP_IDENTITY =3D "dqp.identity"; //$NON-NLS-1$ static final String MM_IO_TMPDIR =3D "mm.io.tmpdir"; //$NON-NLS-1$ = - private static Hashtable transportMap =3D new Hashtable(); + private static EmbeddedTransport currentTransport =3D null; static Pattern urlPattern =3D Pattern.compile(URL_PATTERN); static Pattern basePattern =3D Pattern.compile(BASE_PATTERN); = @@ -128,29 +127,31 @@ = Connection conn =3D transport.createConnection(info); = - // only upon sucessful creation of the connection, keep the transp= ort + // only upon successful creation of the connection, keep the trans= port // available for future connections - transportMap.put(dqpURL, transport); + currentTransport =3D transport; = return conn; } = /** - * Get the DQP tranport or build the transport if one not available fr= om the = + * Get the DQP transport or build the transport if one not available f= rom the = * DQP URL supplied. DQP transport contains all the details about DQP.= = - * @param dqpURL - URL to the DQP.proeprties file + * @param dqpURL - URL to the DQP.properties file * @return EmbeddedTransport * @throws SQLException * @since 4.4 */ - private EmbeddedTransport getDQPTransport(URL dqpURL, Properties info)= throws SQLException { = - EmbeddedTransport transport =3D (EmbeddedTransport)transportMap.ge= t(dqpURL); - if (transport !=3D null) { + private static EmbeddedTransport getDQPTransport(URL dqpURL, Propertie= s info) throws SQLException { = + EmbeddedTransport transport =3D currentTransport; + if (transport !=3D null && currentTransport.getURL().equals(dqpURL= )) { String logMsg =3D BaseDataSource.getResourceMessage("EmbeddedD= river.use_existing_transport"); //$NON-NLS-1$ DriverManager.println(logMsg); = } = else { - transport =3D new EmbeddedTransport(dqpURL, info, this); = = + // shutdown any previous instance; we do encourage single instanc= e in a given VM + shutdown(); + transport =3D new EmbeddedTransport(dqpURL, info); = String logMsg =3D BaseDataSource.getResourceMessage("EmbeddedD= river.use_new_transport"); //$NON-NLS-1$ DriverManager.println(logMsg); } @@ -226,7 +227,7 @@ * @return default connection URL */ String getDefaultConnectionURL() { = - return "classpath:/mm.properties"; //$NON-NLS-1$ + return "classpath:/deploy.properties"; //$NON-NLS-1$ } = /** = @@ -317,15 +318,14 @@ * Shutdown the DQP instance which has been started using the given UR= L = * @param dqpURL */ - public synchronized void shutdown(URL dqpURL) { - EmbeddedTransport transport =3D (EmbeddedTransport) transportMap.g= et(dqpURL); - if (transport !=3D null) { + public static synchronized void shutdown() { + if (currentTransport !=3D null) { try { - transport.shutdown(); + currentTransport.shutdown(); + currentTransport =3D null; } catch (SQLException e) { DriverManager.println(e.getMessage()); } - transportMap.remove(dqpURL); } } = @@ -335,52 +335,47 @@ */ static class EmbeddedTransport { private EmbeddedConnectionFactory connectionFactory; - private EmbeddedConnectionTracker connectionTracker; private ClassLoader classLoader; = private String workspaceDirectory; + private URL url; = - public EmbeddedTransport(URL dqpURL, Properties info, EmbeddedDriv= er driver) throws SQLException { + public EmbeddedTransport(URL dqpURL, Properties info) throws SQLEx= ception { = + this.url =3D dqpURL; + = // Create a temporary workspace directory this.workspaceDirectory =3D createWorkspace(getDQPIdentity()); = - // create a connection tracker to eep track of number of conne= ctions for this - // dqp instance. - this.connectionTracker =3D new EmbeddedConnectionTracker(dqpUR= L, driver); - //Load the properties from dqp.properties file Properties props =3D loadDQPProperties(dqpURL); props.putAll(info); = this.classLoader =3D this.getClass().getClassLoader(); = - // If the dqp.classpath property exists, a non-delagating clas= sloader will be created - // for the DQP,otherwise the DQP classes will be loaded from t= he existing classloader = - // (unifiedclassloader scenario) - String classPath =3D props.getProperty("dqp.classpath"); //$NO= N-NLS-1$ - if (classPath !=3D null && classPath.length() > 0) { = - // fully qualify the class path into urls. - URL[] dqpClassPath =3D resolveClassPath(classPath, dqpURL)= ; = - this.classLoader =3D new NonDelegatingClassLoader(dqpClass= Path, Thread.currentThread().getContextClassLoader(), new MetaMatrixURLStre= amHandlerFactory()); - String logMsg =3D BaseDataSource.getResourceMessage("Embed= dedDriver.use_classpath"); //$NON-NLS-1$ - DriverManager.println(logMsg); - for (int i =3D 0; i < dqpClassPath.length; i++) { - DriverManager.println(dqpClassPath[i].toString()); - } - } + // a non-delegating class loader will be created from where al= l third party dependent jars can be loaded + ArrayList runtimeClasspath =3D new ArrayList(); = - // Now using this classloader create the connection factory to= the dqp. = + // find jars in the "lib" directory; patches is reverse alpaha= and not case sensitive so small letters then capitals + runtimeClasspath.addAll(libClassPath(dqpURL, "lib/patches/", M= MURLConnection.REVERSEALPHA)); //$NON-NLS-1$ + runtimeClasspath.addAll(libClassPath(dqpURL, "lib/", MMURLConn= ection.DATE)); //$NON-NLS-1$ + = + URL[] dqpClassPath =3D runtimeClasspath.toArray(new URL[runtim= eClasspath.size()]); + this.classLoader =3D new NonDelegatingClassLoader(dqpClassPath= , Thread.currentThread().getContextClassLoader(), new MetaMatrixURLStreamHa= ndlerFactory()); + String logMsg =3D BaseDataSource.getResourceMessage("EmbeddedD= river.use_classpath"); //$NON-NLS-1$ + DriverManager.println(logMsg); + for (int i =3D 0; i < dqpClassPath.length; i++) { + DriverManager.println(dqpClassPath[i].toString()); + } + = + = + // Now using this class loader create the connection factory t= o the dqp. = ClassLoader current =3D null; = try { - // this is turn off shutdown thread hook for logging - System.setProperty("shutdownHookInstalled", String.valueOf= (Boolean.TRUE)); //$NON-NLS-1$ = - = current =3D Thread.currentThread().getContextClassLoader()= ; = Thread.currentThread().setContextClassLoader(this.classLoa= der); = String className =3D "com.metamatrix.jdbc.EmbeddedConnecti= onFactoryImpl"; //$NON-NLS-1$ Class clazz =3D this.classLoader.loadClass(className); = = this.connectionFactory =3D (EmbeddedConnectionFactory)claz= z.newInstance(); - this.connectionFactory.registerConnectionListener(this.con= nectionTracker); } catch (Exception e) { DriverManager.println(e.getClass() +": "+e.getMessage()); = //$NON-NLS-1$ throw new EmbeddedSQLException(e); = @@ -389,43 +384,43 @@ } = } = + URL getURL() { + return this.url; + } + /** - * Given dqp.classpath string with relative, absolute paths conver= t them to - * URLs to be used by the non delagating classloader. = - * @param classPath - class path given in the properties file - * @param dqpContext - context URL of the dqp.properties file - * @return resolved fully qualified url list of class path. + * Note that this only works when embedded loaded with "mmfile" pr= otocol in the URL. + * @param dqpURL + * @return */ - URL[] resolveClassPath(String classPath, URL dqpContext) throws SQ= LException { = - = - //Load and check to make sure that a classpath exists in the p= roperties = - if(classPath =3D=3D null || classPath.trim().length() =3D=3D 0= ) { - String logMsg =3D BaseDataSource.getResourceMessage("Embed= dedTransport.no_classpath"); //$NON-NLS-1$ - DriverManager.println(logMsg); - throw new EmbeddedSQLException(logMsg); - } - = + private List libClassPath (URL dqpURL, String directory, Stri= ng sortStyle) { + ObjectInputStream in =3D null; + ArrayList urlList =3D new ArrayList(); try { - // Create URLs out of the classpath string - List urls =3D new ArrayList(); = - StringTokenizer st =3D new StringTokenizer(classPath,";");= //$NON-NLS-1$ - while(st.hasMoreTokens()) { - String path =3D st.nextToken(); - path =3D path.trim(); - if (path.length() > 0) { - // URLHelper is our special URL constructor based = on the MM specific - // protocols like "classpath:" and "mmfile:". = - urls.add(URLHelper.buildURL(dqpContext, path)); + urlList.add(URLHelper.buildURL(dqpURL, directory)); + dqpURL =3D URLHelper.buildURL(dqpURL, directory+"?action= =3Dlist&filter=3D.jar&sort=3D"+sortStyle); //$NON-NLS-1$ = + in =3D new ObjectInputStream(dqpURL.openStream()); + String[] urls =3D (String[])in.readObject(); + for (int i =3D 0; i < urls.length; i++) { + = + boolean add =3D true; + URL jarURL =3D URLHelper.buildURL(urls[i]); + if (add) { + urlList.add(jarURL); } + } = + } catch(IOException e) { + //ignore, treat as if lib does not exist + } catch(ClassNotFoundException e) { + //ignore, treat as if lib does not exist = + } finally { + if (in !=3D null) { + try{in.close();}catch(IOException e) {} } - return (URL[])urls.toArray(new URL[urls.size()]); - } catch (MalformedURLException e) { - DriverManager.println(e.getClass() +": "+e.getMessage()); = //$NON-NLS-1$ - DriverManager.println(e.getStackTrace().toString()); = = - throw new EmbeddedSQLException(e); - } - } - + } = + return urlList; + } = + = /** * Load DQP Properties from the URL supplied. = * @param dqpURL - URL to the "dqp.properties" object Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java 2= 009-02-20 21:08:28 UTC (rev 478) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java 2= 009-02-21 00:28:43 UTC (rev 479) @@ -119,7 +119,7 @@ * @param info contains properies needed to establish a MetaMatrix con= nection. * @throws SQLException if the driver cannot establish connection to m= etamatrix. */ - MMConnection(ServerConnection serverConn, Properties info, String url)= { = + public MMConnection(ServerConnection serverConn, Properties info, Stri= ng url) { = this.serverConn =3D serverConn; this.url =3D url; this.dqp =3D serverConn.getService(ClientSideDQP.class); Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/MM= URLConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/MMURLCon= nection.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/MMURLCon= nection.java 2009-02-21 00:28:43 UTC (rev 479) @@ -34,10 +34,16 @@ * @since 4.4 */ public abstract class MMURLConnection extends URLConnection { - protected static final String READ =3D "read"; //$NON-NLS-1$ - protected static final String WRITE =3D "write"; //$NON-NLS-1$ - protected static final String LIST =3D "list"; //$NON-NLS-1$ - protected static final String DELETE =3D "delete"; //$NON-NLS-1$ + protected static final String READ =3D "read"; //$NON-NLS-1$ + protected static final String WRITE =3D "write"; //$NON-NLS-1$ + protected static final String LIST =3D "list"; //$NON-NLS-1$ + protected static final String DELETE =3D "delete"; //$NON-NLS-1$ + + public static final String FILE_LIST_SORT =3D "sort"; //$NON-NLS-1$ + public static final String DATE =3D "date"; //$NON-NLS-1$ + public static final String ALPHA =3D "alpha"; //$NON-NLS-1$ + public static final String REVERSEALPHA =3D "reversealpha"; //$NON-NLS-1$ + = = protected String action =3D READ; protected Properties props =3D null; Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/mm= file/MMFileURLConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmfile/M= MFileURLConnection.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/mmfile/M= MFileURLConnection.java 2009-02-21 00:28:43 UTC (rev 479) @@ -40,6 +40,8 @@ import java.net.URL; import java.net.URLConnection; import java.security.Permission; +import java.util.Arrays; +import java.util.Comparator; import java.util.StringTokenizer; = import com.metamatrix.common.protocol.MMURLConnection; @@ -56,8 +58,7 @@ * @since 4.4 */ public class MMFileURLConnection extends MMURLConnection { - - public static String PROTOCOL =3D "mmfile"; //$NON-NLS-1$ + public static String PROTOCOL =3D "mmfile"; //$NON-NLS-1$ File file; File deleted; public static String DELETED =3D ".deleted"; //$NON-NLS-1$ @@ -167,12 +168,39 @@ return false; } = }; - = + File[] matchedFiles =3D file.listFiles(fileFilter); String[] urls =3D new String[matchedFiles.length]; + = + String sort =3D props.getProperty(FILE_LIST_SORT, DATE); + if (sort.equals(DATE)) { = + Arrays.sort(matchedFiles, new Comparator() { + @Override + public int compare(File o1, File o2) { = + return Long.valueOf(o2.lastModified()).compareTo(o1.lastModified());= // latest first. + } + }); + } else if (sort.equals(ALPHA)) { + Arrays.sort(matchedFiles, new Comparator() { + @Override + public int compare(File o1, File o2) { + return o1.getName().compareTo(o2.getName()); = + } + }); + = + } else if (sort.equals(REVERSEALPHA)) { = + Arrays.sort(matchedFiles, new Comparator() { + @Override + public int compare(File o1, File o2) { = + return o2.getName().compareTo(o1.getName()); + } + }); = + } + = for (int i =3D 0; i < matchedFiles.length; i++) { urls[i] =3D URLHelper.buildURL(url, matchedFiles[i].getNam= e()).toString(); } + = // Build input stream from the object ByteArrayOutputStream out =3D new ByteArrayOutputStream(); ObjectOutputStream oos =3D new ObjectOutputStream(out); @@ -237,7 +265,7 @@ } catch (IOException e) { } } - } else if (name.equalsIgnoreCase("date")) //$NON-NLS-1$ + } else if (name.equalsIgnoreCase(DATE)) = headerField =3D String.valueOf(file.lastModified()); else { // This always returns null currently Modified: trunk/common-core/src/main/java/com/metamatrix/core/log/LogMessag= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/log/LogMessage.java= 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-core/src/main/java/com/metamatrix/core/log/LogMessage.java= 2009-02-21 00:28:43 UTC (rev 479) @@ -22,91 +22,28 @@ = package com.metamatrix.core.log; = -import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; +import java.io.Serializable; = -import com.metamatrix.core.CorePlugin; = -public class LogMessage implements Externalizable { +public class LogMessage implements Serializable{ = - public static final String VM_NAME =3D "VMName"; //$NON-NLS-1$ - public static final String HOST_NAME =3D "HostName"; //$NON-NLS-1$ - = -// public static String VM_NAME =3D VMNaming.getVMName(); -// public static String HOST_NAME =3D VMNaming.getLogicalHostName(); -// -// private static final String DEFAULT_VM_NAME =3D ""; //$NON-NLS-1$ - - private static final String NULL_MSG_TEXT =3D "Null"; //$NON-NLS-1$ -// -// static { -// if ( VM_NAME =3D=3D null || VM_NAME.trim().length() =3D=3D 0 ) { -// VM_NAME =3D VMNaming.getVMIDString(); -// } -// if ( VM_NAME =3D=3D null || VM_NAME.trim().length() =3D=3D 0 ) { -// VM_NAME =3D DEFAULT_VM_NAME; -// } -// } - - private String msgID; - private String context; private int level; private Object[] msgParts; private Throwable exception; private long timestamp; private String threadName; - private String hostName; - private String vmName; private int errorCode; = public LogMessage() { } = - public LogMessage(String msgID, String context, int level) { - this.msgID =3D msgID; - this.context =3D context; - this.level =3D level; - this.msgParts =3D null; - this.timestamp =3D System.currentTimeMillis(); - this.threadName =3D Thread.currentThread().getName(); - this.hostName =3D HOST_NAME; - this.vmName =3D VM_NAME; - } - - public LogMessage(String msgID, String context, int level, Throwable e) { - this(msgID, context, level); - this.exception =3D e; - } - - - public LogMessage(String msgID, String context, int level, Object[] msgPa= rts ) { - this.msgID =3D msgID; - this.context =3D context; - this.level =3D level; - this.msgParts =3D convertMsgParts(msgParts); - this.timestamp =3D System.currentTimeMillis(); - this.threadName =3D Thread.currentThread().getName(); - this.hostName =3D HOST_NAME; - this.vmName =3D VM_NAME; - } - - public LogMessage(String msgID, String context, int level, Throwable e, O= bject[] msgParts ) { - this(msgID, context, level, msgParts); - this.exception =3D e; - } - public LogMessage(String context, int level, Object[] msgParts ) { - this.msgID=3D null; this.context =3D context; this.level =3D level; this.msgParts =3D convertMsgParts(msgParts); this.timestamp =3D System.currentTimeMillis(); this.threadName =3D Thread.currentThread().getName(); - this.hostName =3D HOST_NAME; - this.vmName =3D VM_NAME; } = public LogMessage(String context, int level, Throwable e, Object[] msgPar= ts) { @@ -139,14 +76,6 @@ return this.threadName; } = - public String getVMName() { - return this.vmName; - } - - public String getHostName() { - return this.hostName; - } - public long getTimestamp() { return this.timestamp; } @@ -155,74 +84,8 @@ return this.exception; } = - public String getText() { - String msg =3D null; = - if (msgID !=3D null) { - if (msgParts =3D=3D null) { - msg =3D CorePlugin.Util.getString(msgID); - } else { = - msg =3D CorePlugin.Util.getString(msgID, msgParts); - - } - - } else { - - StringBuffer text =3D null; - if(msgParts !=3D null) { - text =3D new StringBuffer(); - for(int i=3D0; i0) text.append(" "); //$NON-NLS-1$ - Object omsg =3D msgParts[i]; - if ( omsg !=3D null ) { - text.append(omsg.toString()); - } - } - } - - if (text =3D=3D null) { - msg =3D NULL_MSG_TEXT; - } else { - msg =3D text.toString(); - } - - - } - - if (msg =3D=3D null || msg.length() =3D=3D 0) { - msg =3D NULL_MSG_TEXT; - } - - - return msg; - } - - // implements Externalizable - public void writeExternal(ObjectOutput out) throws IOException { - out.writeObject(context); - out.writeInt(level); - out.writeObject(msgParts); - out.writeObject(exception); - out.writeLong(timestamp); - out.writeObject(threadName); - out.writeObject(vmName); - out.writeInt(this.errorCode); - } - - // implements Externalizable - public void readExternal(ObjectInput in) throws IOException, ClassNotFoun= dException { - this.context =3D (String) in.readObject(); - this.level =3D in.readInt(); - this.msgParts =3D (Object[]) in.readObject(); - this.exception =3D (Throwable) in.readObject(); - this.timestamp =3D in.readLong(); - this.threadName =3D (String) in.readObject(); - this.vmName =3D (String) in.readObject(); - this.errorCode =3D in.readInt(); - } - - //do a toString() to the object array before adding to the worker //to make sure the current state is recorded private Object[] convertMsgParts(Object[] oriMsgParts){ @@ -237,6 +100,25 @@ return oriMsgParts; } = + public String getText() { + StringBuffer text =3D null; + if(msgParts !=3D null) { + text =3D new StringBuffer(); + for(int i=3D0; i0) text.append(" "); //$NON-NLS-1$ + Object omsg =3D msgParts[i]; + if ( omsg !=3D null ) { + text.append(omsg.toString()); + } + } + } + + if (text =3D=3D null) { + return "NULL"; //$NON-NLS-1$ + } else { + return text.toString(); + } = + } = /** = * @return Returns the errorCode. Modified: trunk/common-core/src/main/java/com/metamatrix/internal/core/log/= PlatformLog.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/internal/core/log/Platfo= rmLog.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-core/src/main/java/com/metamatrix/internal/core/log/Platfo= rmLog.java 2009-02-21 00:28:43 UTC (rev 479) @@ -34,7 +34,6 @@ import com.metamatrix.core.log.LogListener; import com.metamatrix.core.log.LogMessage; import com.metamatrix.core.log.Logger; -import com.metamatrix.core.log.SystemLogWriter; = /** * The PlatformLog class is designed to be extended by any {@link Logger} = implementation that is to @@ -83,42 +82,10 @@ */ public class PlatformLog implements LogListener { = - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - // Static Members - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - private static final PlatformLog INSTANCE =3D new PlatformLog(); - private static ShutdownThread SHUTDOWNTHREAD =3D null; - private static final String SHUTDOWN_HOOK_INSTALLED_PROPERTY =3D "shut= downHookInstalled"; //$NON-NLS-1$ - = - static { - String hook =3D System.getProperty(SHUTDOWN_HOOK_INSTALLED_PROPERT= Y); - if ( hook =3D=3D null || hook.equalsIgnoreCase(String.valueOf(Bool= ean.FALSE))) { - /** - * By default, add a listener to write to System.out and Syste= m.err, - * and that is automatically shutdown upon VM termination. - */ - SHUTDOWNTHREAD =3D new ShutdownThread(INSTANCE); - INSTANCE.addListener( new SystemLogWriter() ); - try { - Runtime.getRuntime().addShutdownHook(SHUTDOWNTHREAD); - System.setProperty(SHUTDOWN_HOOK_INSTALLED_PROPERTY, Boole= an.TRUE.toString()); - } catch (IllegalStateException e) { - //ignore: this happens if we try to register the shutdown = hook after the system - //is already shutting down. there's nothing we can do abo= ut it. - } catch (Throwable t) { - t.printStackTrace(); - } - } - } - = - public static PlatformLog getInstance() { - return INSTANCE; - } - private static final String DEFAULT_LOG_WORKER_THREAD_NAME =3D "LogWor= ker"; //$NON-NLS-1$ = private static final long DEFAULT_TIMEOUT =3D 60000; // time to = wait for a message - private static final long SHUTDOWN_TIMEOUT =3D 20000; // m= ax time to wait for shutdown + private static final long SHUTDOWN_TIMEOUT =3D 20000; // max time= to wait for shutdown = /** * Flag specifying whether to write debugging statements to {@link #DE= BUG_STREAM}. @@ -182,24 +149,6 @@ } = /** - * Used by the DQP to ensure that the shutdown thread is removed from = the VM = - * in which the DQP is embedded. - * @since 4.2 - */ - public static void deregisterShutdownHook() { - try { - if (SHUTDOWNTHREAD !=3D null) { - Runtime.getRuntime().removeShutdownHook(SHUTDOWNTHREAD); - } - } catch (IllegalStateException e) { - //ignore: this happens if we try to register the shutdown hook= after the system - //is already shutting down. there's nothing we can do about i= t. - } catch (Throwable t) { - t.printStackTrace(); - } - } - = - /** * Shut down and process all content. This method is equivalent to ca= lling * {@link #shutdown(boolean)} with a parameter value of true. */ @@ -258,6 +207,8 @@ } this.logListeners.clear(); } + = + this.executor =3D null; } = public synchronized void start() { @@ -342,20 +293,4 @@ } = } - = -class ShutdownThread extends Thread { - private static final String SHUTDOWN_THREAD_NAME =3D "Shutdown"; //$NON-N= LS-1$ - private PlatformLog log; - - ShutdownThread(final PlatformLog platformLog) { - super(SHUTDOWN_THREAD_NAME); - this.log =3D platformLog; - } - - public void run() { - final boolean processRemainingContent =3D true; - this.log.shutdown(processRemainingContent); - } - -} = Modified: trunk/common-internal/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/pom.xml 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-internal/pom.xml 2009-02-21 00:28:43 UTC (rev 479) @@ -64,6 +64,11 @@ stringtemplate = + + com.google.code.guice + guice + = + = = \ No newline at end of file Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/Log= Configuration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfig= uration.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfig= uration.java 2009-02-21 00:28:43 UTC (rev 479) @@ -27,10 +27,6 @@ = public interface LogConfiguration extends Comparable, Cloneable { = - boolean isContextDiscarded( String context ); - - boolean isLevelDiscarded( int level ); - /** * Obtain the set of contexts for messages that are to be discarded. * If this method returns an empty set, then messages in all contexts @@ -55,45 +51,17 @@ int getMessageLevel(); = /** - * Compares this object to another. If the specified object is an inst= ance of - * the MetadataID class, then this method compares the name; otherwise= , it throws a - * ClassCastException (as instances are comparable only to instances o= f the same - * class). - * Note: this method is consistent with equals(),= meaning - * that (compare(x, y)=3D=3D0) =3D=3D (x.equals(y)). - *

- * @param obj the object that this instance is to be compared to. - * @return a negative integer, zero, or a positive integer as this obj= ect - * is less than, equal to, or greater than the specified object, = respectively. - * @throws IllegalArgumentException if the specified object reference = is null - * @throws ClassCastException if the specified object's type prevents = it - * from being compared to this instance. + * Direct the log configuration to record all known logging contexts. */ - int compareTo(Object obj); + void recordAllContexts(); = /** - * Returns true if the specified object is semantically equal to this = instance. - * Note: this method is consistent with compareTo(). - *

- * @param obj the object that this instance is to be compared to. - * @return whether the object is equal to this object. + * Clone the object. + * @return */ - boolean equals(Object obj); - - /** - * String representation of logging configuration. - * @return String representation - */ - String toString(); - Object clone(); - + = /** - * Direct the log configuration to record all known logging contexts. - */ - void recordAllContexts(); - - /** * Direct the log configuration to discard the given contexts and * not record them. * @param contexts the collection of contexts that should be discarded. @@ -112,4 +80,7 @@ * @param level the lowest level to record. */ void setMessageLevel(int level); + = + = + boolean isMessageToBeRecorded(String context, int msgLevel); } Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/Log= Manager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/LogManage= r.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/LogManage= r.java 2009-02-21 00:28:43 UTC (rev 479) @@ -27,18 +27,15 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; = +import com.google.inject.Inject; import com.metamatrix.common.CommonPlugin; -import com.metamatrix.common.config.CurrentConfiguration; -import com.metamatrix.common.config.api.exceptions.ConfigurationException; import com.metamatrix.common.log.config.BasicLogConfiguration; -import com.metamatrix.common.log.config.DefaultLogConfigurationFactory; -import com.metamatrix.common.log.config.LogConfigurationException; -import com.metamatrix.common.util.ErrorMessageKeys; import com.metamatrix.common.util.LogCommonConstants; import com.metamatrix.core.MetaMatrixRuntimeException; +import com.metamatrix.core.log.LogListener; import com.metamatrix.core.log.LogMessage; import com.metamatrix.core.log.MessageLevel; -import com.metamatrix.internal.core.log.PlatformLog; +import com.metamatrix.core.log.NullLogWriter; = = /** @@ -92,86 +89,13 @@ */ public final class LogManager { = - /** - * The name of the System property that contains the set of comma-sepa= rated - * context names for messages not to be recorded. A message co= ntext is simply - * some string that identifies something about the component that gene= rates - * the message. The value for the contexts is application specific. - *

- * This is an optional property that defaults to no contexts (i.e., me= ssages - * with any context are recorded). - */ - public static final String SYSTEM_LOG_CONTEXT_PROPERTY_NAME =3D Defaul= tLogConfigurationFactory.LOG_CONTEXT_PROPERTY_NAME; - - /** - * The name of the System property that contains 'true' if the log mes= sages - * are to be sent to System.out, or 'false' otherwise. This is an opt= ional - * property that defaults to 'true'. Note, however, that if the messa= ge - * level for the logger is specified to be something other than NONE b= ut - * no file destination is specified, the value for this propery is - * always assumed to be 'true'. - *

- * If the System.out is captured by the LogManager, the LogManager alw= ays - * treats this property value as 'false'. - */ - public static final String SYSTEM_LOG_CONSOLE_PROPERTY_NAME =3D "metam= atrix.log.console"; //$NON-NLS-1$ - - /** - * The name of the System property that should be 'true' if System.out= is to - * be captured by the LogManager, or false if System.out is not be be = captured. - * This is an optional property that defaults to 'false'. - */ - public static final String SYSTEM_LOG_CAPTURE_SYSTEM_OUT =3D "metam= atrix.log.captureSystemOut"; //$NON-NLS-1$ - - /** - * The name of the System property that should be 'true' if System.err= is to - * be captured by the LogManager, or false if System.err is not be be = captured. - * This is an optional property that defaults to 'false'. - */ - public static final String SYSTEM_LOG_CAPTURE_SYSTEM_ERR =3D "metam= atrix.log.captureSystemErr"; //$NON-NLS-1$ - - /** - * The name of the System property that should be set to the name of t= he file - * to which System.out is sent only if also captured by the LogManager. - * This is an optional property. If set to the same value as - * #SYSTEM_ERR_FILENAME (case insensitive comparison), then the same f= ile will be used for both. - */ - public static final String SYSTEM_OUT_FILENAME =3D "metam= atrix.log.systemOutFilename"; //$NON-NLS-1$ - - /** - * The name of the System property that should be set to the name of t= he file - * to which System.err is sent only if also captured by the LogManager. - * This is an optional property. If set to the same value as - * #SYSTEM_OUT_FILENAME (case insensitive comparison), then the same f= ile will be used for both. - */ - public static final String SYSTEM_ERR_FILENAME =3D "metam= atrix.log.systemErrFilename"; //$NON-NLS-1$ - - private static LogManager INSTANCE =3D new LogManager(PlatformLog.getI= nstance()); - - private LogConfiguration configuration; - private PlatformLog platformLog; + @Inject + static LogConfiguration configuration =3D new BasicLogConfiguration();= // either injected or manually set using the set methods = - protected LogManager(PlatformLog platformLog) { - this.platformLog =3D platformLog; - // Get the preferred LogConfiguration ... - try { - configuration =3D (LogConfiguration)CurrentConfiguration.getIn= stance().getConfiguration().getLogConfiguration().clone(); - } catch ( ConfigurationException e ) { + @Inject + static LogListener logListener =3D new NullLogWriter(); // either inje= cted or manually set using the set methods = - // Get the initial LogConfiguration from the System properties= ... - try { - configuration =3D BasicLogConfiguration.createLogConfigura= tion(System.getProperties()); - } catch ( LogConfigurationException le ) { - throw new MetaMatrixRuntimeException(le, ErrorMessageKeys.= LOG_ERR_0005, CommonPlugin.Util.getString( ErrorMessageKeys.LOG_ERR_0005) ); = - } - } - } - - static LogManager getInstance() { - return INSTANCE; - } - /** * Send a critical message to the log. This level of message is gener= ally * used to record an event or error that must be recorded (if any logg= ing @@ -187,7 +111,7 @@ * not logged if this parameter is null */ public static void logCritical(String context, String message) { - LogManager.getInstance().logMessage(MessageLevel.CRITICAL, context, m= essage); + logMessage(MessageLevel.CRITICAL, context, message); } = /** @@ -206,7 +130,7 @@ * @param message the log message (may be null) */ public static void logCritical(String context, Throwable e, String mes= sage) { - LogManager.getInstance().logMessage(MessageLevel.CRITICAL,context,= e,message); + logMessage(MessageLevel.CRITICAL,context,e,message); } = /** @@ -222,7 +146,7 @@ * not logged if this parameter is null */ public static void logError(String context, String message) { - LogManager.getInstance().logMessage(MessageLevel.ERROR, context,me= ssage); + logMessage(MessageLevel.ERROR, context,message); } = /** @@ -239,7 +163,7 @@ * @param message the log message (may be null) */ public static void logError(String context, Throwable e, String messag= e) { - LogManager.getInstance().logMessage(MessageLevel.ERROR,context,e,m= essage); + logMessage(MessageLevel.ERROR,context,e,message); } = /** @@ -255,7 +179,7 @@ * not logged if this parameter is null */ public static void logWarning(String context, String message) { - LogManager.getInstance().logMessage(MessageLevel.WARNING, context,= message); + logMessage(MessageLevel.WARNING, context,message); } = /** @@ -272,7 +196,7 @@ * @param message the log message (may be null) */ public static void logWarning(String context, Throwable e, String mess= age) { - LogManager.getInstance().logMessage(MessageLevel.WARNING,context,e= ,message); + logMessage(MessageLevel.WARNING,context,e,message); } = /** @@ -289,7 +213,7 @@ * not logged if this parameter is null */ public static void logInfo(String context, String message) { - LogManager.getInstance().logMessage(MessageLevel.INFO, context,mes= sage); + logMessage(MessageLevel.INFO, context,message); } = /** @@ -305,7 +229,7 @@ * not logged if this parameter is null */ public static void logDetail(String context, Object ... msgParts) { - LogManager.getInstance().logMessage(MessageLevel.DETAIL, context, = msgParts); + logMessage(MessageLevel.DETAIL, context, msgParts); } = /** @@ -322,7 +246,7 @@ * @param message the log message (may be null) */ public static void logDetail(String context, Throwable e, String messa= ge) { - LogManager.getInstance().logMessage(MessageLevel.DETAIL,context,e,= message); + logMessage(MessageLevel.DETAIL,context,e,message); } = /** @@ -339,7 +263,7 @@ * not logged if this parameter is null */ public static void logTrace(String context, Object ... msgParts) { - LogManager.getInstance().logMessage(MessageLevel.TRACE, context, m= sgParts); + logMessage(MessageLevel.TRACE, context, msgParts); } = /** @@ -357,7 +281,7 @@ * @param msgParts the individual parts of the log message (may be nul= l) */ public static void logTrace(String context, Throwable e, Object ... ms= gParts) { - LogManager.getInstance().logMessage(MessageLevel.TRACE,context,e,m= sgParts); + logMessage(MessageLevel.TRACE,context,e,msgParts); } = /** @@ -372,7 +296,7 @@ * not logged if this parameter is null */ public static void log(int msgLevel, String context, String message) { - LogManager.getInstance().logMessage(msgLevel, context, message); + logMessage(msgLevel, context, message); } = /** @@ -388,7 +312,7 @@ * not logged if this parameter is null */ public static void log(int msgLevel, String context, Throwable e, Stri= ng message) { - LogManager.getInstance().logMessage(msgLevel, context, e, message); + logMessage(msgLevel, context, e, message); } = /** @@ -398,24 +322,29 @@ * @return a modifiable copy of the current log configuration */ public static LogConfiguration getLogConfigurationCopy() { - return getInstance().getConfigurationCopy(); + if (configuration =3D=3D null) { + throw new MetaMatrixRuntimeException(CommonPlugin.Util.getString("Lo= gManager_not_configured")); //$NON-NLS-1$ + } + return (LogConfiguration)configuration.clone(); = } = public static void setLogConfiguration( LogConfiguration config ) { - getInstance().setConfiguration(config); - } - = - public LogConfiguration getConfigurationCopy() { - return (LogConfiguration)configuration.clone(); = - } - = - public void setConfiguration(LogConfiguration config) { if ( config !=3D null ) { logMessage(MessageLevel.INFO, LogCommonConstants.CTX_LOGGING, Com= monPlugin.Util.getString("MSG.003.014.0015", config)); //$NON-NLS-1$ configuration =3D (LogConfiguration) config.clone(); } - } - + } + = + public static void setLogListener(LogListener listener) { + logListener.shutdown(); + if (listener !=3D null) { + logListener =3D listener; + } + else { + logListener =3D new NullLogWriter(); + } + } + = /** * Utility method to identify whether a log message with the specified * context and level will be recorded in the LogManager's destinations. @@ -425,42 +354,23 @@ * or false if it would be discarded by the LogManager. */ public static boolean isMessageToBeRecorded(String context, int msgLev= el) { - return getInstance().isLoggingEnabled(context, msgLevel); + return configuration.isMessageToBeRecorded(context, msgLevel); } - = - public boolean isLoggingEnabled(String context, int msgLevel) { - if ( context =3D=3D null ) { - return false; - } - = - // If the messsage's level is greater than the logging level, - // then the message should NOT be recorded ... - if ( configuration.getMessageLevel() =3D=3D MessageLevel.NONE || m= sgLevel <=3D MessageLevel.NONE || - configuration.isLevelDiscarded( msgLevel ) || configuration.isCo= ntextDiscarded( context )) { - return false; - } = - return true; - } - - protected void logMessage(int level, String context, Object ... msgPar= ts) { + private static void logMessage(int level, String context, Object ... m= sgParts) { logMessage(level, context, null, msgParts); } = - protected void logMessage(int level, String context, Throwable e, Obje= ct ... msgParts) { - if (msgParts =3D=3D null || msgParts.length =3D=3D 0 || !isLoggingEnable= d(context, level)) { + private static void logMessage(int level, String context, Throwable e,= Object ... msgParts) { + if (msgParts =3D=3D null || msgParts.length =3D=3D 0 || !isMessageToBeRe= corded(context, level)) { return; } = - - LogMessage msg =3D new LogMessage( context, level, e, msgParts); - forwardMessage(msg); + = + LogMessage msg =3D new LogMessage( context, level, e, msgParts); + logListener.logMessage(msg); } = = - protected void forwardMessage(LogMessage msg) { - platformLog.logMessage(msg); - } - = public static Object createLoggingProxy(final String loggingContext, final Object instance, final Class[] interfaces, Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/con= fig/BasicLogConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Ba= sicLogConfiguration.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Ba= sicLogConfiguration.java 2009-02-21 00:28:43 UTC (rev 479) @@ -39,7 +39,7 @@ * LogConfiguration, plus static utility methods for converting a * LogConfiguration object to and from a Properties object representation. */ -public class BasicLogConfiguration implements LogConfiguration, Serializab= le { +public class BasicLogConfiguration implements LogConfiguration, Serializab= le, Cloneable { = //************************************************************ // static constants, members, methods @@ -216,13 +216,12 @@ this.unmodifiableContexts =3D Collections.unmodifiableSet(this.dis= cardedContexts); } = - public boolean isContextDiscarded( String context ) { - boolean discarded =3D ((context !=3D null) && = - this.discardedContexts.contains(context)); + boolean isContextDiscarded( String context ) { + boolean discarded =3D ((context !=3D null) && this.discardedContexts.con= tains(context)); return discarded; } = - public boolean isLevelDiscarded( int level ) { + boolean isLevelDiscarded( int level ) { return ( level > msgLevel ); } = @@ -406,4 +405,19 @@ public void setMessageLevel(int level) { this.msgLevel =3D level; } + + = + @Override + public boolean isMessageToBeRecorded(String context, int msgLevel) { + if ( context =3D=3D null ) { + return false; + } + = + // If the messsage's level is greater than the logging level, + // then the message should NOT be recorded ... + if ( getMessageLevel() =3D=3D MessageLevel.NONE || msgLevel <=3D M= essageLevel.NONE || isLevelDiscarded( msgLevel ) || isContextDiscarded( con= text )) { + return false; + } + return true; = + } } Deleted: trunk/common-internal/src/main/java/com/metamatrix/common/log/conf= ig/DefaultLogConfigurationFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/config/De= faultLogConfigurationFactory.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/config/De= faultLogConfigurationFactory.java 2009-02-21 00:28:43 UTC (rev 479) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.common.log.config; - - - -public class DefaultLogConfigurationFactory implements LogConfigurationFac= tory { - - /** - * The name of the System property that contains the set of comma-sepa= rated - * context names for messages not to be recorded. A message co= ntext is simply - * some string that identifies something about the component that gene= rates - * the message. The value for the contexts is application specific. - *

- * This is an optional property that defaults to no contexts (i.e., me= ssages - * with any context are recorded). - */ - public static final String LOG_CONTEXT_PROPERTY_NAME =3D "metamatrix.l= og.contexts"; //$NON-NLS-1$ - -} Deleted: trunk/common-internal/src/main/java/com/metamatrix/common/log/conf= ig/LogConfigurationFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Lo= gConfigurationFactory.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/config/Lo= gConfigurationFactory.java 2009-02-21 00:28:43 UTC (rev 479) @@ -1,29 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.common.log.config; - - - -public interface LogConfigurationFactory { - -} Deleted: trunk/common-internal/src/main/java/com/metamatrix/common/log/form= at/DelimitedLogMessageFormat.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/format/De= limitedLogMessageFormat.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/format/De= limitedLogMessageFormat.java 2009-02-21 00:28:43 UTC (rev 479) @@ -1,103 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.common.log.format; - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; - -import com.metamatrix.core.log.LogMessage; -import com.metamatrix.core.log.MessageLevel; -import com.metamatrix.core.util.MetaMatrixExceptionUtil; -import com.metamatrix.core.util.StringUtil; - -/** - * This class formats LogMessages using a format with delimiters that is e= asily parsed. - * The format is: - * 

- *     yyyy.MM.dd HH:mm:ss
- *

- * For example, 
"1952.01.12 13:30:32"
. - */ -public class DelimitedLogMessageFormat implements LogMessageFormat { - public static final String TIMESTAMP_FORMAT =3D "yyyy.MM.dd HH:mm:ss.S= SS"; //$NON-NLS-1$ - - - // Cache date formatter which is expensive to create - private static DateFormat DATE_FORMATTER =3D new SimpleDateFormat(TIMESTA= MP_FORMAT); - private static final String DEFAULT_FORMATTED_MESSAGE =3D ""; //$NON-N= LS-1$ -// private static final String DELIMITER_STRING =3D "|"; - private static final char DELIMITER_CHAR =3D '|'; - - /** - * Format the specified message and return the String representation. - * @param message the log message to be formated. - * @return the String representation of the log message. - */ - public String formatMessage( LogMessage message ) { - if ( message =3D=3D null ) { - return DEFAULT_FORMATTED_MESSAGE; - } - StringBuffer msg =3D new StringBuffer(); - msg.append( DATE_FORMATTER.format( new Date(message.getTimestamp()= ) ) ); - msg.append( DELIMITER_CHAR ); - msg.append( message.getHostName() ); - msg.append( DELIMITER_CHAR ); - msg.append( message.getVMName() ); - msg.append( DELIMITER_CHAR ); - msg.append( message.getThreadName() ); - msg.append( DELIMITER_CHAR ); - msg.append( message.getContext() ); - msg.append( DELIMITER_CHAR ); - msg.append( MessageLevel.getLabelForLevel(message.getLevel()) ); - msg.append( DELIMITER_CHAR ); - msg.append( message.getText() ); - - Throwable e =3D message.getException(); - if ( e !=3D null) { - StringWriter strWriter =3D new StringWriter(); - PrintWriter strPrinter =3D new PrintWriter(strWriter, true); - - // Get the stack trace into a string writer we can access - e.printStackTrace(strPrinter); - msg.append(StringUtil.getLineSeparator()); - msg.append(strWriter); - - java.util.Iterator children =3D MetaMatrixExceptionUtil.getChi= ldrenIterator(e); - while (children.hasNext()){ - e =3D (Throwable)children.next(); - strWriter =3D new StringWriter(); - strPrinter =3D new PrintWriter(strWriter, true); - e.printStackTrace(strPrinter); - msg.append(StringUtil.getLineSeparator()); - msg.append(strWriter); - } - - } - - return msg.toString(); - } - -} Deleted: trunk/common-internal/src/main/java/com/metamatrix/common/log/form= at/LogMessageFormat.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/log/format/Lo= gMessageFormat.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-internal/src/main/java/com/metamatrix/common/log/format/Lo= gMessageFormat.java 2009-02-21 00:28:43 UTC (rev 479) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.common.log.format; - -import com.metamatrix.core.log.LogMessage; - -public interface LogMessageFormat { - - /** - * Format the specified message and return the String representation. - * @param message the log message to be formated. - * @return the String representation of the log message. - */ - public String formatMessage( LogMessage message ); -} Modified: trunk/common-internal/src/test/java/com/metamatrix/common/log/Tes= tLogManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/test/java/com/metamatrix/common/log/TestLogMa= nager.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-internal/src/test/java/com/metamatrix/common/log/TestLogMa= nager.java 2009-02-21 00:28:43 UTC (rev 479) @@ -28,6 +28,7 @@ = import junit.framework.TestCase; = +import com.metamatrix.common.log.config.BasicLogConfiguration; import com.metamatrix.core.log.LogListener; import com.metamatrix.core.log.LogMessage; import com.metamatrix.core.log.MessageLevel; @@ -46,6 +47,13 @@ super(name); } = + @Override + protected void setUp() throws Exception { + LogManager.configuration =3D new BasicLogConfiguration(); + LogManager.logListener =3D new PlatformLog(); + = + } = + = // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D // T E S T C A S E S // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D @@ -55,26 +63,26 @@ */ public void testIsMessageToBeRecordedStringI() { String context =3D "SomeContext"; //$NON-NLS-1$ - LogManager manager =3D new LogManager(null); - assertTrue(manager.isLoggingEnabled(context, MessageLevel.CRITICAL) )= ; = - LogConfiguration cfg =3D LogManager.getInstance().getConfigurationCop= y(); + = + assertTrue(LogManager.isMessageToBeRecorded(context, MessageLevel.CRI= TICAL) ); = + = + LogConfiguration cfg =3D LogManager.getLogConfigurationCopy(); cfg.discardContext(context); - manager.setConfiguration(cfg); - assertFalse(manager.isLoggingEnabled(context, MessageLevel.CRITICA= L) ); + LogManager.setLogConfiguration(cfg); + assertFalse(LogManager.isMessageToBeRecorded(context, MessageLevel= .CRITICAL) ); } = /** * Test that all msgs logged are equal and output in same order. */ public void testLogMessage() throws Exception { - PlatformLog log =3D new PlatformLog(); - LogManager manager =3D new LogManager(log); - LogConfiguration cfg =3D manager.getConfigurationCopy(); + = + LogConfiguration cfg =3D LogManager.getLogConfigurationCopy(); cfg.setMessageLevel( MessageLevel.INFO ); - manager.setConfiguration(cfg); - = + LogManager.setLogConfiguration(cfg); + = ListLogger listener =3D new ListLogger(6); - log.addListener(listener); + LogManager.logListener =3D listener; = List sentMsgList =3D new ArrayList(); sentMsgList.add("A message 1"); //$NON-NLS-1$ @@ -86,12 +94,11 @@ = for (Iterator iter =3D sentMsgList.iterator(); iter.hasNext();) { String msg =3D (String) iter.next(); - manager.logMessage(MessageLevel.INFO, "SomeContext", msg); //$= NON-NLS-1$ + LogManager.logInfo("SomeContext", msg); //$NON-NLS-1$ } = List recevedMsgList =3D listener.getLoggedMessages(); assertEquals(sentMsgList, recevedMsgList); - log.shutdown(); } = /** @@ -139,4 +146,6 @@ = } = + + } Deleted: trunk/common-internal/src/test/java/com/metamatrix/common/log/form= at/TestLogMessageFormat.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/test/java/com/metamatrix/common/log/format/Te= stLogMessageFormat.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/common-internal/src/test/java/com/metamatrix/common/log/format/Te= stLogMessageFormat.java 2009-02-21 00:28:43 UTC (rev 479) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.common.log.format; - -import junit.framework.TestCase; - -import com.metamatrix.api.exception.ComponentNotFoundException; -import com.metamatrix.api.exception.MetaMatrixException; -import com.metamatrix.api.exception.MetaMatrixProcessingException; -import com.metamatrix.core.MetaMatrixRuntimeException; -import com.metamatrix.core.log.LogMessage; - -/** - * - */ -public class TestLogMessageFormat extends TestCase { - - // ################################## FRAMEWORK #########################= ####### - - public TestLogMessageFormat(String name) { - super(name); - } - - // ################################## TEST HELPERS ######################= ########## - - private static Throwable generateThrowable(){ - Exception e2 =3D new Exception("Test0"); //$NON-NLS-1$ - MetaMatrixException e =3D new ComponentNotFoundException(e2, "Test= 1"); //$NON-NLS-1$ - //e =3D new MetaMatrixException(e, "Test2"); - MetaMatrixRuntimeException ee =3D new MetaMatrixRuntimeException(e= , "Test3"); //$NON-NLS-1$ - e =3D new MetaMatrixProcessingException(ee, "Test4"); //$NON-NLS-1$ - return e; - } - - private static LogMessageFormat getLogMessageFormat(){ -// return new ReadableLogMessageFormat(); - return new DelimitedLogMessageFormat(); - } - - // ################################## ACTUAL TESTS ######################= ########## - = - /** - */ - public void testLogFormat(){ - String context =3D "FAKE_CONTEXT"; //$NON-NLS-1$ - int level =3D 2; - Throwable e =3D generateThrowable(); - Object[] msgParts =3D new Object[]{ "This is a fake log message fo= r testing."}; //$NON-NLS-1$ - LogMessage logMessage =3D new LogMessage(context, level, e, msgPar= ts); - LogMessageFormat format =3D getLogMessageFormat(); - - String firstLine =3D format.formatMessage(logMessage).split("\\n")= [0]; //$NON-NLS-1$ - assertTrue(firstLine.endsWith("|HostName|VMName|main|FAKE_CONTEXT|= ERROR|This is a fake log message for testing.")); //$NON-NLS-1$ - } - = -} Modified: trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshel= l/CommandShell.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Comm= andShell.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Comm= andShell.java 2009-02-21 00:28:43 UTC (rev 479) @@ -36,6 +36,7 @@ import java.util.Set; import java.util.Stack; = +import com.metamatrix.common.log.LogManager; import com.metamatrix.core.CorePlugin; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.log.FileLogWriter; @@ -146,25 +147,13 @@ = = private void redirectLogging() { - //get the java System property: redirect if "false", not if "true"= or null - String logConsoleString =3D System.getProperty(PROPERTY_LOG_CONSOL= E); = - String FALSE =3D Boolean.toString(false); - boolean redirect =3D FALSE.equalsIgnoreCase(logConsoleString); - = - if (redirect) { = - //remove the listener that writes to System.out and System.err - Collection listeners =3D PlatformLog.getInstance().getLogListe= ners(); - for (Iterator it =3D listeners.iterator(); it.hasNext();) { - LogListener ll =3D (LogListener) it.next(); - if (ll instanceof SystemLogWriter) { - PlatformLog.getInstance().removeListener(ll); - } - } - = - //add a listener that writes to a file - File file =3D new File(DEFAULT_LOG_FILE); - PlatformLog.getInstance().addListener(new FileLogWriter(file)); - } + //add a listener that writes to a file + File file =3D new File(DEFAULT_LOG_FILE); + FileLogWriter flw =3D new FileLogWriter(file); + + PlatformLog logger =3D new PlatformLog(); + logger.addListener(flw); + LogManager.setLogListener(logger); } = = Modified: trunk/console/src/main/java/com/metamatrix/console/main/AdminCons= oleMain.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/console/src/main/java/com/metamatrix/console/main/AdminConsoleMai= n.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/console/src/main/java/com/metamatrix/console/main/AdminConsoleMai= n.java 2009-02-21 00:28:43 UTC (rev 479) @@ -254,7 +254,9 @@ System.setErr(log); } FileLogWriter flw =3D new FileLogWriter(tmpFile); - PlatformLog.getInstance().addListener(flw); + PlatformLog logger =3D new PlatformLog(); + logger.addListener(flw); + LogManager.setLogListener(logger); } catch (Exception ex) { ex.printStackTrace(); } Deleted: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPEmbedd= edManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedMan= ager.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedMan= ager.java 2009-02-21 00:28:43 UTC (rev 479) @@ -1,148 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - * Date: Jun 24, 2003 - * Time: 1:13:49 PM - */ -package com.metamatrix.dqp.embedded; - -import java.net.URL; -import java.util.Date; -import java.util.Properties; - -import com.metamatrix.common.application.DQPConfigSource; -import com.metamatrix.common.application.exception.ApplicationInitializati= onException; -import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; -import com.metamatrix.dqp.internal.process.DQPCore; -import com.metamatrix.dqp.service.ConfigurationService; -import com.metamatrix.dqp.service.DQPServiceNames; - -/** - * Manages the life cycle of the embedded DQP. Like handling the creation = and deletion - * of the DQP. Knows about configuration elements and connection managemen= t to the - * Embedded DQP. All direct operations to the DQP must go though the manag= er object - * (other than what goes on Connection object requests), there should not = be any = - * referecnes to DQP instance directly manuplulating the API. If such case= arises = - * implement as methods on DQP interface. - */ -public class DQPEmbeddedManager { - - private DQPConfigSource configSource; - private DQPCore dqpInstance; - private long dqpStarttime =3D -1; = - DQPListener dqpListener =3D null; - = - /** - * Construct DQPEmbeddedManager. = - */ - public DQPEmbeddedManager(URL dqpURL, Properties connectionProperties,= DQPListener listener) throws ApplicationInitializationException { - this.configSource =3D new EmbeddedConfigSource(dqpURL, connectionP= roperties); - this.dqpListener =3D listener; - } - - /** - * Main access method to DQP. Will either find the DQP or - * start and initialize as necessary. - * @return The DQP to use. - * @throws ApplicationInitializationException when an error occurs - * during DQP initialization. - */ - public synchronized DQPCore createDQP() throws ApplicationInitializati= onException { = - if ( dqpInstance =3D=3D null ) { - dqpInstance =3D new DQPCore(); - dqpInstance.start(configSource); - dqpStarttime =3D System.currentTimeMillis(); - DQPEmbeddedPlugin.logInfo("DQPEmbeddedManager.start_dqp", new = Object[] {new Date(System.currentTimeMillis()).toString()}); //$NON-NLS-1$ - = - // Notify the listener that DQP started - if (dqpListener !=3D null) { - dqpListener.onStart(); - } - } - return dqpInstance; - } - - /** - * Get the DQP instance holded by this manager = - * @return DQP instance if has been created;null otherwise - */ - public DQPCore getDQP() { - return dqpInstance; - } - = - /** - * Shutdown the DQP and its connections. = - * @throws ApplicationLifecycleException - */ - public synchronized void shutdown() throws ApplicationLifecycleExcepti= on { - if (dqpInstance !=3D null) { - = - // stop the DQP - dqpInstance.stop(); - dqpInstance =3D null; - configSource =3D null; - dqpStarttime =3D -1; - = - // Notify the listener that DQP being stopped - if (dqpListener !=3D null) { - dqpListener.onShutdown(); - dqpListener =3D null; - } = - = - DQPEmbeddedPlugin.logInfo("DQPEmbeddedManager.shutdown_dqp", n= ew Object[] {new Date(System.currentTimeMillis()).toString()}); = //$NON-NLS-1$ - = - // shutdown the logger - EmbeddedConfigUtil.shutdownLogger(); = - } - } - = - /** - * Returns the long defining the time in milliseconds when it started.= = - * @return -1 if the DQP not started. - * @since 4.3 - */ - public long getDQPStartTime() { - return dqpStarttime; - } - = - /** - * Check if the DQP has been started. = - * @return - * @since 4.3 - */ - public boolean isDQPAlive() { - return dqpInstance !=3D null; - } - - /** - * Get the properties of the DQP. = - * @return null if the DQP not started. properties started with otherw= ise. - * @since 4.3 - */ - public Properties getDQPProperties() { - if (isDQPAlive()) { - return ((ConfigurationService)dqpInstance.getEnvironment().fin= dService(DQPServiceNames.CONFIGURATION_SERVICE)).getSystemProperties(); - } - return null; - } = -} Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPEmbed= dedProperties.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedPro= perties.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPEmbeddedPro= perties.java 2009-02-21 00:28:43 UTC (rev 479) @@ -28,10 +28,8 @@ = public static final String DQP_LOGFILE =3D "dqp.logFile"; //$NON-NLS-1$ public static final String DQP_LOGLEVEL =3D "dqp.logLevel"; //$NON-NLS= -1$ - public static final String DQP_CAPTURE_SYSTEM_PRINTSTREAMS =3D "dqp.ca= ptureSystemStreams"; //$NON-NLS-1$ public static final String DQP_SERVICE_METADATA =3D "dqp.service.metad= ata"; //$NON-NLS-1$ public static final String DQP_SERVICE_DATA =3D "dqp.service.data"; //= $NON-NLS-1$ = - public static final String DQP_CLASSPATH =3D "dqp.classpath"; //$NON-N= LS-1$ public static final String DQP_EXTENSIONS =3D "dqp.extensions"; //$NON= -NLS-1$ public static final String DQP_CONFIGFILE =3D "dqp.configFile"; //$NON= -NLS-1$ public static final String DQP_METADATA_SYSTEMURL =3D "dqp.metadata.sy= stemURL"; //$NON-NLS-1$ = Deleted: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPListen= er.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPListener.ja= va 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/DQPListener.ja= va 2009-02-21 00:28:43 UTC (rev 479) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.dqp.embedded; - - -/** - * When registered with the DQP manager, the registar wil notified about t= he - * life cycle events of the DQP. = - * @since 4.3 - */ -public interface DQPListener { - /** - * This event gets notified as soon as the DQP is Started = - */ - void onStart(); - = - /** - * Upon the shutdown of the dqp this method gets called = - */ - void onShutdown(); -} Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/Embedded= ConfigSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/EmbeddedConfig= Source.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/EmbeddedConfig= Source.java 2009-02-21 00:28:43 UTC (rev 479) @@ -24,19 +24,18 @@ = import java.io.IOException; import java.io.InputStream; -import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; import java.util.Map; import java.util.Properties; = import com.google.inject.Binder; -import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.application.ApplicationService; import com.metamatrix.common.application.DQPConfigSource; import com.metamatrix.common.application.exception.ApplicationInitializati= onException; import com.metamatrix.common.protocol.URLHelper; import com.metamatrix.common.util.PropertiesUtils; +import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.dqp.embedded.services.EmbeddedBufferService; import com.metamatrix.dqp.embedded.services.EmbeddedConfigurationService; import com.metamatrix.dqp.embedded.services.EmbeddedDataService; @@ -45,16 +44,19 @@ import com.metamatrix.dqp.embedded.services.EmbeddedTransactionService; import com.metamatrix.dqp.embedded.services.EmbeddedVDBService; import com.metamatrix.dqp.service.DQPServiceNames; +import com.metamatrix.jdbc.EmbeddedDataSource; +import com.metamatrix.jdbc.JDBCPlugin; = /** * This class is main hook point for the Embedded DQP configuration. This = classe's - * responsibility is to encapsulate the knowedge of creating of the variou= s application + * responsibility is to encapsulate the knowledge of creating of the vario= us application * services used the DQP. * = */ public class EmbeddedConfigSource implements DQPConfigSource { + private static final String SERVER_CONFIG_FILE_EXTENSION =3D ".properties= "; //$NON-NLS-1$ = - private Properties props; + private Properties props; private boolean useTxn; = /** = @@ -62,13 +64,24 @@ * @param configFile * @throws ApplicationInitializationException */ = - public EmbeddedConfigSource(URL dqpURL, Properties connectionPropertie= s) throws ApplicationInitializationException { + public EmbeddedConfigSource(Properties connectionProperties) { + = + URL dqpURL =3D (URL)connectionProperties.get(EmbeddedDataSource.DQP_B= OOTSTRAP_FILE); = + if(dqpURL =3D=3D null) { + throw new MetaMatrixRuntimeException(JDBCPlugin.Util.getString= ("LocalTransportHandler.No_configuration_file_set_in_property", DQPEmbedded= Properties.DQP_BOOTSTRAP_PROPERTIES_FILE)); //$NON-NLS-1$ + } + + String dqpFileName =3D dqpURL.toString().toLowerCase(); = + if (!dqpFileName.endsWith(SERVER_CONFIG_FILE_EXTENSION)) { + throw new MetaMatrixRuntimeException(JDBCPlugin.Util.getString= ("LocalTransportHandler.Invalid_config_file_extension", dqpFileName) ); //$= NON-NLS-1$ = + } = + = String dqpURLString =3D dqpURL.toString(); = try { dqpURL =3D URLHelper.buildURL(dqpURLString); InputStream in =3D dqpURL.openStream(); if (in =3D=3D null) { - throw new ApplicationInitializationException(DQPEmbeddedPlugi= n.Util.getString("EmbeddedConfigSource.Can_not_load_config_file_2", dqpURL)= ); //$NON-NLS-1$ + throw new MetaMatrixRuntimeException(DQPEmbeddedPlugin.Util.g= etString("EmbeddedConfigSource.Can_not_load_config_file_2", dqpURL)); //$NO= N-NLS-1$ } = // Load the "dqp.properties" file. @@ -95,12 +108,9 @@ // this path. props.put(DQPEmbeddedProperties.DQP_BOOTSTRAP_PROPERTIES_FILE,= dqpURL); = - // First configure logging.. - configureLogging(dqpURL); - = useTxn =3D PropertiesUtils.getBooleanProperty(props, EmbeddedT= ransactionService.TRANSACTIONS_ENABLED, true); } catch (IOException e) { - throw new ApplicationInitializationException(e); + throw new MetaMatrixRuntimeException(e); } = } = = @@ -124,44 +134,6 @@ return this.props; } = - /** - * Configure the logging for the DQP = - * @throws MetaMatrixComponentException - * @since 4.3 - */ - void configureLogging(URL dqpURL) throws ApplicationInitializationExce= ption{ - boolean captureSystemStreams =3D Boolean.valueOf(props.getProperty= (DQPEmbeddedProperties.DQP_CAPTURE_SYSTEM_PRINTSTREAMS, "false")).booleanVa= lue(); //$NON-NLS-1$ - String logLevel =3D props.getProperty(DQPEmbeddedProperties.DQP_LO= GLEVEL); - String logFile =3D props.getProperty(DQPEmbeddedProperties.DQP_LOG= FILE); - String classpath =3D props.getProperty(DQPEmbeddedProperties.DQP_C= LASSPATH); - boolean unifiedClassLoader =3D !(classpath !=3D null && classpath.= length()>0); - String instanceId =3D props.getProperty(DQPEmbeddedProperties.DQP_= IDENTITY); = - = - try { - // Configure Logging = - try { - if (logFile !=3D null && !logFile.equalsIgnoreCase(Embedde= dConfigUtil.STDOUT)) { - String modifiedLogFileName =3D logFile; = = - int dotIndex =3D logFile.lastIndexOf('.'); - if (dotIndex !=3D -1) { - modifiedLogFileName =3D logFile.substring(0,dotInd= ex)+"_"+instanceId+"."+logFile.substring(dotIndex+1); //$NON-NLS-1$ //$NON-= NLS-2$ - } - else { - modifiedLogFileName =3D logFile+"_"+instanceId; //= $NON-NLS-1$ - } - URL logURL =3D URLHelper.buildURL(dqpURL, modifiedLogF= ileName); - logFile =3D logURL.getPath(); - } - } catch (MalformedURLException e) { - // we may have absolute source, this is just for notificat= ion to somewhere. - e.printStackTrace(); = - } - EmbeddedConfigUtil.configureLogger(logFile, logLevel, captureS= ystemStreams, unifiedClassLoader); - } catch (MetaMatrixComponentException e) { - throw new ApplicationInitializationException(e); - } - } - @Override public void updateBindings(Binder binder) { = Deleted: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/EmbeddedC= onfigUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/EmbeddedConfig= Util.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/EmbeddedConfig= Util.java 2009-02-21 00:28:43 UTC (rev 479) @@ -1,186 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.dqp.embedded; - -import java.io.File; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.common.log.LogConfiguration; -import com.metamatrix.common.log.LogManager; -import com.metamatrix.common.log.config.BasicLogConfiguration; -import com.metamatrix.core.log.FileLimitSizeLogWriter; -import com.metamatrix.core.log.LogListener; -import com.metamatrix.core.log.NullLogWriter; -import com.metamatrix.core.log.SystemLogWriter; -import com.metamatrix.internal.core.log.PlatformLog; - -/** - * DQPConfigUtil - */ -public class EmbeddedConfigUtil { - static final String STDOUT =3D "STDOUT"; //$NON-NLS-1$ - private static Object lock =3D new Object(); - private static int count =3D 0; - = - static { - System.setProperty("shutdownHookInstalled", String.valueOf(Boolean= .TRUE)); //$NON-NLS-1$ = - } - - private EmbeddedConfigUtil() { - } - = - /** - * Set the log level to tehe specified level = - * @param logLevel the new log level - * @throws MetaMatrixComponentException if the logLevel String cannot = be parsed as an integer - * @since 4.3 - */ - public static void setLogLevel(String logLevel) throws MetaMatrixCompo= nentException { - // Set up log level (default to none) - int level =3D 0; - if(logLevel !=3D null && logLevel.trim().length() > 0) { - try { - level =3D Integer.parseInt(logLevel); = = - } catch(NumberFormatException e) { - throw new MetaMatrixComponentException(DQPEmbeddedPlugin.U= til.getString("DQPComponent.Unable_to_parse_level") + logLevel); //$NO= N-NLS-1$ - } = - } - LogConfiguration config =3D LogManager.getLogConfigurationCopy(); - config.setMessageLevel(level); - LogManager.setLogConfiguration(config); - LogManager.logInfo("DQP", "LogManager configured with level =3D " = + level); //$NON-NLS-1$ //$NON-NLS-2$ - } - = - /** - * Replaces the old set of discarded contexts with those provided. - * @param contexts the new set of contexts to be discarded. = - * @since 4.3 - */ - public static void setDiscardedContexts(Collection contexts) { - LogManager.setLogConfiguration(new BasicLogConfiguration(contexts,= LogManager.getLogConfigurationCopy().getMessageLevel())); - LogManager.logInfo("DQP", "LogManager discarded contexts " + conte= xts); //$NON-NLS-1$ //$NON-NLS-2$ - } - = - /** - * Installs a new log listener for the DQP, if a log listener of the s= ame type does not already exist. = - * @param newListener The LogListener to be installed - * @throws MetaMatrixComponentException - * @since 4.3 - */ - public static void installLogListener(LogListener newListener) throws = MetaMatrixComponentException { - if (newListener =3D=3D null) { - // Make no changes to the current listeners - return; - } - = - PlatformLog log =3D PlatformLog.getInstance(); - List listeners =3D new ArrayList(log.getLogListeners()); - if (listeners.size() =3D=3D 1 && listeners.get(0).getClass().equal= s(newListener.getClass())) { - // if the platform log writer is already established, dont do = anything else - return; - } = - = - // remove all existing listeners from the platform logger - we wil= l add one back later if needed - removeListeners(listeners); - = - // Set up log listener - log.addListener(newListener); - } - = - private static void removeListeners(List listeners) { - // Walk through the listeners and remove them - for(int i=3D0; i 0) { - if (logFile.equalsIgnoreCase(STDOUT)) { = - SystemLogWriter logWriter =3D new SystemLogWriter(); - installLogListener(logWriter); - } - else { - File file =3D new File(logFile); - FileLimitSizeLogWriter logWriter =3D new FileLimitSize= LogWriter(file, captureSystemStreams); - installLogListener(logWriter); - } = - } else { - // Pass a safe copy of listeners to be removed. - removeListeners(previousListeners); - NullLogWriter logNull =3D new NullLogWriter(); - installLogListener(logNull); = - } - = - // now set the log level - if(logLevel !=3D null) { - setLogLevel(logLevel); - }else { - setLogLevel("3"); //$NON-NLS-1$ - } = - } - // Increment counter to keep count of number of DQPs which are usi= ng this = - // logger object. In the case of unifiedClassLoader we would like = to have - // single logger. - synchronized(lock) { - count++; - } - } - - /** = - * = - * @since 4.3 - */ - public static void shutdownLogger() { - // decrement the counter and when it reaches zero then only shutdo= wn the logger - // becuase in the case of the unified class laoder we have only on= e logger and we - // would like to close at the end of last dqp shutdown. - synchronized(lock) { - count--; - } = - - if (count =3D=3D 0) { - PlatformLog.getInstance().shutdown(false); - PlatformLog.getInstance().start(); - //LogManager.stop(); - } - } = -} Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/Ba= seAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmi= n.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/BaseAdmi= n.java 2009-02-21 00:28:43 UTC (rev 479) @@ -62,12 +62,12 @@ import com.metamatrix.common.util.crypto.CryptoException; import com.metamatrix.common.util.crypto.CryptoUtil; import com.metamatrix.common.vdb.api.VDBArchive; -import com.metamatrix.dqp.embedded.DQPEmbeddedManager; import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.service.ConfigurationService; import com.metamatrix.dqp.service.DQPServiceNames; import com.metamatrix.dqp.service.DataService; import com.metamatrix.dqp.service.VDBService; +import com.metamatrix.jdbc.EmbeddedConnectionFactoryImpl; import com.metamatrix.platform.util.ProductInfoConstants; import com.metamatrix.server.serverapi.RequestInfo; = @@ -96,9 +96,9 @@ Cache.QUERY_SERVICE_RESULT_SET_CACHE }; = = - DQPEmbeddedManager manager =3D null; = + EmbeddedConnectionFactoryImpl manager =3D null; = = - BaseAdmin(DQPEmbeddedManager manager){ + BaseAdmin(EmbeddedConnectionFactoryImpl manager){ this.manager =3D manager; = } = @@ -135,20 +135,20 @@ * @return Returns the manager. * @since 4.3 */ - public DQPEmbeddedManager getManager() { + public EmbeddedConnectionFactoryImpl getManager() { return this.manager; } = VDBService getVDBService() { - return (VDBService)getManager().getDQP().getEnvironment().findServ= ice(DQPServiceNames.VDB_SERVICE); = + return (VDBService)getManager().findService(DQPServiceNames.VDB_SE= RVICE); = } = DataService getDataService() { - return (DataService)getManager().getDQP().getEnvironment().findSer= vice(DQPServiceNames.DATA_SERVICE); + return (DataService)getManager().findService(DQPServiceNames.DATA_= SERVICE); } = ConfigurationService getConfigurationService() { - return (ConfigurationService)getManager().getDQP().getEnvironment(= ).findService(DQPServiceNames.CONFIGURATION_SERVICE); + return (ConfigurationService)getManager().findService(DQPServiceNa= mes.CONFIGURATION_SERVICE); } = protected Object convertToAdminObjects(Object src) { @@ -511,9 +511,9 @@ */ public SystemObject getSystem() { MMSystem system =3D new MMSystem(); - system.setStartTime(new Date(manager.getDQPStartTime())); - system.setStarted(manager.isDQPAlive()); - system.setProperties(manager.getDQPProperties()); + system.setStartTime(new Date(manager.getStartTime())); + system.setStarted(manager.isAlive()); + system.setProperties(manager.getProperties()); return system; } = Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQ= PConfigAdminImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfi= gAdminImpl.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPConfi= gAdminImpl.java 2009-02-21 00:28:43 UTC (rev 479) @@ -59,7 +59,6 @@ import com.metamatrix.common.vdb.api.VDBArchive; import com.metamatrix.common.vdb.api.VDBDefn; import com.metamatrix.core.vdb.VDBStatus; -import com.metamatrix.dqp.embedded.DQPEmbeddedManager; import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.embedded.DQPEmbeddedProperties; import com.metamatrix.dqp.embedded.configuration.ConnectorConfigurationRea= der; @@ -67,6 +66,7 @@ import com.metamatrix.dqp.embedded.configuration.ServerConfigFileWriter; import com.metamatrix.dqp.embedded.configuration.VDBConfigurationReader; import com.metamatrix.dqp.service.ConfigurationService; +import com.metamatrix.jdbc.EmbeddedConnectionFactoryImpl; = = /** = @@ -75,7 +75,7 @@ */ public class DQPConfigAdminImpl extends BaseAdmin implements EmbeddedConfi= gAdmin { = - public DQPConfigAdminImpl(DQPEmbeddedManager manager) { + public DQPConfigAdminImpl(EmbeddedConnectionFactoryImpl manager) { super(manager); } = Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQ= PMonitoringAdminImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonit= oringAdminImpl.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPMonit= oringAdminImpl.java 2009-02-21 00:28:43 UTC (rev 479) @@ -44,8 +44,8 @@ import com.metamatrix.common.comm.api.ServerConnection; import com.metamatrix.common.config.api.ComponentType; import com.metamatrix.common.vdb.api.VDBArchive; -import com.metamatrix.dqp.embedded.DQPEmbeddedManager; import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; +import com.metamatrix.jdbc.EmbeddedConnectionFactoryImpl; import com.metamatrix.server.serverapi.RequestInfo; = = @@ -55,7 +55,7 @@ */ public class DQPMonitoringAdminImpl extends BaseAdmin implements EmbeddedM= onitoringAdmin { = - public DQPMonitoringAdminImpl(DQPEmbeddedManager manager) { + public DQPMonitoringAdminImpl(EmbeddedConnectionFactoryImpl manager) { super(manager); } = @@ -328,7 +328,7 @@ switch(type) { = case MMAdminObject.OBJECT_TYPE_SYSTEM_OBJECT: - Properties properties =3D manager.getDQPProperties(); + Properties properties =3D manager.getProperties(); return convertPropertyDefinitions(properties); = case MMAdminObject.OBJECT_TYPE_CONNECTOR_BINDING: Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQ= PRuntimeStateAdminImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRunti= meStateAdminImpl.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPRunti= meStateAdminImpl.java 2009-02-21 00:28:43 UTC (rev 479) @@ -22,6 +22,7 @@ = package com.metamatrix.dqp.embedded.admin; = +import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -40,10 +41,10 @@ import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; import com.metamatrix.common.comm.api.ServerConnection; -import com.metamatrix.dqp.embedded.DQPEmbeddedManager; +import com.metamatrix.common.log.LogManager; import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; -import com.metamatrix.dqp.embedded.EmbeddedConfigUtil; import com.metamatrix.dqp.message.RequestID; +import com.metamatrix.jdbc.EmbeddedConnectionFactoryImpl; = = /** = @@ -51,7 +52,7 @@ */ public class DQPRuntimeStateAdminImpl extends BaseAdmin implements Embedd= edRuntimeStateAdmin { = - public DQPRuntimeStateAdminImpl(DQPEmbeddedManager manager) { + public DQPRuntimeStateAdminImpl(EmbeddedConnectionFactoryImpl manager)= { super(manager); } = @@ -66,7 +67,7 @@ terminateSession(AdminObject.WILDCARD); = getManager().shutdown(); - } catch (ApplicationLifecycleException e) { + } catch (SQLException e) { throw new AdminComponentException(e); } } @@ -83,7 +84,7 @@ // Now shutdown the DQP, it will automatically start next time= a new connection is = // requested. getManager().shutdown(); = - } catch (ApplicationLifecycleException e) { + } catch (SQLException e) { throw new AdminComponentException(e); } = } @@ -211,21 +212,17 @@ public void terminateSession(String identifier) = throws AdminException { = - if (identifier =3D=3D null || (!identifier.equals(AdminObject.WILD= CARD) && !identifier.matches("\\d+"))) { //$NON-NLS-1$ - throw new AdminProcessingException(DQPEmbeddedPlugin.Util.getS= tring("Admin.Invalid_identifier")); //$NON-NLS-1$ = - } - = Set connections =3D getClientConnections(); ArrayList matchedConnections =3D new ArrayList(); - for (Iterator i =3D connections.iterator(); i.hasNext();) { - ServerConnection clientConnection =3D (ServerConnection)i.next(); + = + for (ServerConnection clientConnection:connections) { String id =3D clientConnection.getLogonResult().getSessionID()= .toString(); if (matches(identifier, id)) { matchedConnections.add(clientConnection); } } = - // Double iteration because to avoid concurrent modification of un= derlaying map. + // Double iteration because to avoid concurrent modification of un= derlying map. for (Iterator i =3D matchedConnections.iterator(); i.hasNext();) { ServerConnection clientConnection =3D (ServerConnection)i.next(); = @@ -323,11 +320,7 @@ public void setLogListener(EmbeddedLogger listener) = throws AdminException { if(listener !=3D null) { - try{ - EmbeddedConfigUtil.installLogListener(new DQPLogListener(l= istener)); - }catch(MetaMatrixComponentException e) { - throw new AdminProcessingException(e); - } + LogManager.setLogListener(new DQPLogListener(listener)); } else { throw new AdminProcessingException("Admin_invalid_log_listener= "); //$NON-NLS-1$ Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQ= PSecurityAdminImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPSecur= ityAdminImpl.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/admin/DQPSecur= ityAdminImpl.java 2009-02-21 00:28:43 UTC (rev 479) @@ -23,7 +23,7 @@ package com.metamatrix.dqp.embedded.admin; = import com.metamatrix.admin.api.embedded.EmbeddedSecurityAdmin; -import com.metamatrix.dqp.embedded.DQPEmbeddedManager; +import com.metamatrix.jdbc.EmbeddedConnectionFactoryImpl; = = /** = @@ -31,7 +31,7 @@ */ public class DQPSecurityAdminImpl extends BaseAdmin implements EmbeddedSe= curityAdmin { = - public DQPSecurityAdminImpl(DQPEmbeddedManager manager) { + public DQPSecurityAdminImpl(EmbeddedConnectionFactoryImpl manager) { super(manager); } } Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services= /EmbeddedConfigurationService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embed= dedConfigurationService.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embed= dedConfigurationService.java 2009-02-21 00:28:43 UTC (rev 479) @@ -43,6 +43,7 @@ import com.metamatrix.common.application.exception.ApplicationInitializati= onException; import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; import com.metamatrix.common.comm.api.ServerConnection; +import com.metamatrix.common.comm.api.ServerConnectionListener; import com.metamatrix.common.config.api.ComponentType; import com.metamatrix.common.config.api.ComponentTypeID; import com.metamatrix.common.config.api.ConfigurationModelContainer; @@ -60,7 +61,6 @@ import com.metamatrix.common.vdb.api.VDBDefn; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.vdb.VDBStatus; -import com.metamatrix.dqp.application.ClientConnectionListener; import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.embedded.DQPEmbeddedProperties; import com.metamatrix.dqp.embedded.configuration.ExtensionModuleReader; @@ -278,14 +278,6 @@ } = /** = - * @see com.metamatrix.dqp.service.ConfigurationService#getResetSystem= Streams() - * @since 4.3 - */ - public String captureSystemStreams() throws MetaMatrixComponentExcepti= on { - return userPreferences.getProperty(DQPEmbeddedProperties.DQP_CAPTU= RE_SYSTEM_PRINTSTREAMS); - } - - /** = * @see com.metamatrix.dqp.service.ConfigurationService#getVDBs() * @since 4.3 */ @@ -1267,8 +1259,8 @@ * @see com.metamatrix.dqp.service.ConfigurationService#getConnectionL= istener() * @since 4.3.2 */ - public ClientConnectionListener getConnectionListener() throws MetaMat= rixComponentException { - return new ClientConnectionListener() { + public ServerConnectionListener getConnectionListener() { + return new ServerConnectionListener() { /** * A Client Connection to DQP has been added = */ @@ -1498,16 +1490,6 @@ return userPreferences.getProperty(DQPEmbeddedProperties.DQP_IDENT= ITY); } = - /** = - * @see com.metamatrix.dqp.service.ConfigurationService#useUnifiedClas= sLoader() - */ - public boolean useUnifiedClassLoader() { - String val =3D userPreferences.getProperty(DQPEmbeddedProperties.D= QP_CLASSPATH); = - if (val =3D=3D null || val.length() =3D=3D 0) { - return true; - } - return false; - } = public String getProcessorBatchSize() { return userPreferences.getProperty(DQPEmbeddedProperties.BufferSer= vice.DQP_PROCESSOR_BATCH_SIZE, "2000"); //$NON-NLS-1$ Modified: trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnecti= on.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnection.jav= a 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnection.jav= a 2009-02-21 00:28:43 UTC (rev 479) @@ -35,7 +35,6 @@ import com.metamatrix.admin.api.exception.AdminException; import com.metamatrix.admin.api.exception.AdminProcessingException; import com.metamatrix.common.comm.api.ServerConnection; -import com.metamatrix.dqp.embedded.DQPEmbeddedManager; import com.metamatrix.dqp.embedded.admin.DQPConfigAdminImpl; import com.metamatrix.dqp.embedded.admin.DQPMonitoringAdminImpl; import com.metamatrix.dqp.embedded.admin.DQPRuntimeStateAdminImpl; @@ -55,26 +54,21 @@ // constant value giving product name private final static String SERVER_NAME =3D "MetaMatrix Query"; //$NON= -NLS-1$ = - DQPEmbeddedManager manager =3D null; + EmbeddedConnectionFactoryImpl manager =3D null; ConnectionListener listener =3D null; = - public static EmbeddedConnection newInstance(DQPEmbeddedManager manage= r, ServerConnection serverConn, Properties info, ConnectionListener listner= ) { - return new EmbeddedConnection(manager, serverConn, info, listner);= = - } - = /** * ctor = */ - public EmbeddedConnection(DQPEmbeddedManager manager, - ServerConnection serverConn, - Properties info, - ConnectionListener listner) { + public EmbeddedConnection(EmbeddedConnectionFactoryImpl manager, Serve= rConnection serverConn, Properties info, ConnectionListener listener) { super(serverConn, info, null); this.manager =3D manager; - this.listener =3D listner; + this.listener =3D listener; = // tell the listener that connection has been created - this.listener.connectionAdded(getConnectionId(), this); + if (listener !=3D null) { + this.listener.connectionAdded(getConnectionId(), this); + } } = /** @@ -98,7 +92,7 @@ Exception ex =3D null; = // We we perform any DQP functions check if the DQP is sti= ll alive - if (!manager.isDQPAlive()) { + if (!manager.isAlive()) { throw new AdminProcessingException(JDBCPlugin.Util.get= String("EmbeddedConnection.DQP_shutDown")); //$NON-NLS-1$ } = @@ -159,4 +153,12 @@ boolean isSameProcess(MMConnection conn) { return (conn instanceof EmbeddedConnection); } + + @Override + public void close() throws SQLException { + if (this.listener !=3D null) { + this.listener.connectionRemoved(getConnectionId(), this); + } + super.close(); + } } Modified: trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnecti= onFactoryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFact= oryImpl.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFact= oryImpl.java 2009-02-21 00:28:43 UTC (rev 479) @@ -23,9 +23,8 @@ package com.metamatrix.jdbc; = import java.sql.Connection; -import java.sql.DriverManager; import java.sql.SQLException; -import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -34,15 +33,22 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.metamatrix.api.exception.MetaMatrixComponentException; +import com.metamatrix.common.application.ApplicationService; +import com.metamatrix.common.application.DQPConfigSource; +import com.metamatrix.common.application.exception.ApplicationInitializati= onException; +import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; import com.metamatrix.common.comm.api.ServerConnection; -import com.metamatrix.common.comm.exception.CommunicationException; import com.metamatrix.common.comm.exception.ConnectionException; +import com.metamatrix.common.log.LogManager; import com.metamatrix.common.vdb.api.VDBArchive; +import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.dqp.ResourceFinder; -import com.metamatrix.dqp.application.ClientConnectionListener; -import com.metamatrix.dqp.embedded.DQPListener; +import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; +import com.metamatrix.dqp.internal.process.DQPCore; +import com.metamatrix.dqp.service.ConfigurationService; import com.metamatrix.dqp.service.DQPServiceNames; import com.metamatrix.dqp.service.VDBService; +import com.metamatrix.dqp.util.LogConstants; import com.metamatrix.jdbc.transport.LocalTransportHandler; = = @@ -55,46 +61,34 @@ private static final int ACTIVE =3D 3; private boolean initialized =3D false; private LocalTransportHandler handler =3D null; = - private boolean shutdownInProgress =3D false; - = - // List of Connection Listeners for the DQP - private ArrayList connectionListeners =3D new ArrayList(); = - = + private volatile boolean shutdownInProgress =3D false; + private DQPCore dqp; + private long starttime =3D -1L; + private Thread shutdownThread; + private EmbeddedConnectionListener listener =3D new EmbeddedConnection= Listener(); = = - /** - * Factory Constructor = - */ - static EmbeddedConnectionFactoryImpl newInstance() { - return new EmbeddedConnectionFactoryImpl(); = - } - = /** = * @see com.metamatrix.jdbc.EmbeddedConnectionFactory#createConnection= () */ public Connection createConnection(Properties props) throws SQLExcepti= on { - Injector injector =3D Guice.createInjector(new EmbeddedGuiceModule()); - ResourceFinder.setInjector(injector); = - = - // Initialize the transport - initialize(props); = - try { = - // create a server connection. If the VDB_VERSION used as "Use= Latest" the client - // connection is based on String "UseLatest" - this.handler.initManager(props); - // check for the valid connection properties + try { + // Initialize the transport + initialize(props); + = + // check for the valid connection properties checkConnectionProperties (props); = ServerConnection serverConn =3D this.handler.createConnection(= props); = - // Should occur every time in classloader using existing attri= butes - return EmbeddedConnection.newInstance(this.handler.getManager(= ), serverConn, props, listener); = + // Should occur every time in class loader using existing attr= ibutes + return new EmbeddedConnection(this, serverConn, props, listene= r); = } catch (ConnectionException e) { throw new EmbeddedSQLException(e); - } catch (CommunicationException e) { - throw new EmbeddedSQLException(e); = - } + } catch (ApplicationInitializationException e) { + throw new EmbeddedSQLException(e); + } } = /** @@ -106,40 +100,72 @@ * @throws SQLException * @since 4.3 */ - private void initialize(Properties props) throws SQLException { - if (!initialized || !this.handler.isAlive()) { + private synchronized void initialize(Properties props) throws Applicat= ionInitializationException { + if (!initialized) { = - // This monitors the life cycle events for the DQP - DQPListener dqpListener =3D new DQPListener() { - public void onStart() { - } - public void onShutdown() { - try { - shutdown(); - }catch (SQLException e) { - DriverManager.println(e.getMessage()); - } - } = - }; + Injector injector =3D Guice.createInjector(new EmbeddedGuiceModule(p= rops)); + ResourceFinder.setInjector(injector); = + DQPConfigSource configSource =3D injector.getInstance(DQPConfigSourc= e.class); + + // start the DQP + this.dqp =3D new DQPCore(); + this.dqp.start(configSource); + = + // make the configuration service listen for the connection life-cyc= le events + // used during VDB delete + ConfigurationService configService =3D (ConfigurationService)f= indService(DQPServiceNames.CONFIGURATION_SERVICE); + = + //in new class loader - all of these should be created lazily = and held locally + this.handler =3D new LocalTransportHandler(this.dqp); + this.handler.registerListener(configService.getConnectionListener= ()); + this.shutdownThread =3D new ShutdownWork(); + Runtime.getRuntime().addShutdownHook(this.shutdownThread); = - // This monitors the lifecyle events for the connections insid= e a DQP - // these are DQP side connections. - ClientConnectionListener connectionListener =3D new ClientConn= ectionListener() { - public void connectionAdded(ServerConnection connection) { - } - public void connectionRemoved(ServerConnection connection)= { - listener.connectionTerminated(connection.getLogonResult()= .getSessionID().toString()); - } - }; - = - //in new classloader - all of these should be created lazily a= nd held locally - this.handler =3D new LocalTransportHandler(dqpListener, connec= tionListener); = - this.initialized =3D true; = + this.initialized =3D true; = + this.starttime =3D System.currentTimeMillis(); + DQPEmbeddedPlugin.logInfo("DQPEmbeddedManager.start_dqp", new = Object[] {new Date(System.currentTimeMillis()).toString()}); //$NON-NLS-1$ } } + = + class ShutdownWork extends Thread { + ShutdownWork(){ + super("embedded-shudown-thread"); //$NON-NLS-1$ + } + = + @Override + public void run() { + try { + shutdown(false); + } catch (SQLException e) { + // ignore + } + } + } + = + public synchronized boolean isAlive() { + return (dqp !=3D null); + } + = + public long getStartTime() { + return this.starttime; + } + = + public Properties getProperties() { + if (isAlive()) { + return ((ConfigurationService)findService(DQPServiceNames.CONF= IGURATION_SERVICE)).getSystemProperties(); + } + return null; + } = - public void registerConnectionListener(ConnectionListener listener) { - connectionListeners.add(listener); + public synchronized DQPCore getDQP() { + if (!isAlive()) { + throw new MetaMatrixRuntimeException(JDBCPlugin.Util.getString= ("LocalTransportHandler.Transport_shutdown")); //$NON-NLS-1$ + } + return this.dqp; + } = + = + public ApplicationService findService(String type) { + return this.dqp.getEnvironment().findService(type); } = /** = @@ -149,11 +175,20 @@ * = * @see com.metamatrix.jdbc.EmbeddedConnectionFactory#shutdown() */ - public void shutdown() throws SQLException{ + public void shutdown() throws SQLException { + shutdown(true); + } + = + private void shutdown(boolean undoShutdownHook) throws SQLException { + = + if (undoShutdownHook) { + Runtime.getRuntime().removeShutdownHook(this.shutdownThread); + } + = // Make sure shutdown is not already in progress; as call to shutd= own will close // connections; and after the last connection closes, the listener= also calls shutdown // for normal route. - if (!shutdownInProgress) { + if (!this.shutdownInProgress && this.initialized) { = // this will by pass, and only let shutdown called once. shutdownInProgress =3D true; @@ -162,14 +197,25 @@ // connections are not properly closed; or somebody called shu= tdown. listener.closeConnections(); = - // then close the dqp handler it self, which root for the fact= ory. - this.handler.shutdown(); + try { + this.dqp.stop(); + } catch (ApplicationLifecycleException e) { + LogManager.logWarning(LogConstants.CTX_DQP, e, e.getMessage()); + } = + this.dqp =3D null; + = + this.handler =3D null; + = + this.initialized =3D false; + = // shutdown the cache. ResourceFinder.getCacheFactory().destroy(); - } + = + shutdownInProgress =3D false; + } = } - = + = /** * Are the connection properties supplied for connection match with th= ose of the * DQP = @@ -182,7 +228,7 @@ String vdbVersion =3D props.getProperty(BaseDataSource.VDB_VERSION= , EmbeddedDataSource.USE_LATEST_VDB_VERSION); = try { - VDBService service =3D (VDBService)handler.getManager().getDQP= ().getEnvironment().findService(DQPServiceNames.VDB_SERVICE); + VDBService service =3D (VDBService)findService(DQPServiceNames= .VDB_SERVICE); List vdbs =3D service.getAvailableVDBs(); = // We are looking for the latest version find that now = @@ -226,29 +272,6 @@ } = = /** - * Notify all the connection listeners that a connection is added = - * @param connection - */ - void notifyConnectionAdded(String id, Connection connection) { - for (Iterator i =3D connectionListeners.iterator(); i.hasNext();) { - ConnectionListener listner =3D (ConnectionListener)i.next(); - listner.connectionAdded(id, connection); - } - } - = - /** - * Notify all the connection listeners that a connection is added = - * @param connection - */ - void notifyConnectionRemoved(String id, Connection connection) { - for (Iterator i =3D connectionListeners.iterator(); i.hasNext();) { - ConnectionListener listner =3D (ConnectionListener)i.next(); - listner.connectionRemoved(id, connection); - } - } - - - /** * A internal connection listener for the connections; based on this = * it manages the DQP instance. These are client side (JDBC) connectio= ns */ @@ -260,17 +283,11 @@ public void connectionAdded(String id, Connection connection) { // Add the connection to locol count connections.put(id, connection); - = - // then also notify all the listeners - notifyConnectionAdded(id, connection); } = public void connectionRemoved(String id, Connection connection) { // remove from local count = connections.remove(id); - = - // also notify all the listeners - notifyConnectionRemoved(id, connection); = } = /** @@ -300,18 +317,6 @@ if (firstException !=3D null) { throw new EmbeddedSQLException(firstException); } - } = - = - /** - * A hook which notifies the client connections that a server conn= ection - * has been terminated = - * @param connection - */ - private void connectionTerminated(String id) { - // remove from local count = - Connection connection =3D (Connection)connections.remove(id); - - notifyConnectionRemoved(id, connection); - } = + } = } } Modified: trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedGuiceMod= ule.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedGuiceModule.ja= va 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/EmbeddedGuiceModule.ja= va 2009-02-21 00:28:43 UTC (rev 479) @@ -1,23 +1,64 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + package com.metamatrix.jdbc; = +import java.util.Properties; + import org.jboss.cache.Cache; = import com.google.inject.AbstractModule; import com.google.inject.Scopes; import com.metamatrix.cache.CacheFactory; import com.metamatrix.cache.jboss.JBossCacheFactory; +import com.metamatrix.common.application.DQPConfigSource; +import com.metamatrix.common.log.LogConfiguration; +import com.metamatrix.common.log.LogManager; +import com.metamatrix.core.log.LogListener; +import com.metamatrix.dqp.embedded.EmbeddedConfigSource; = public class EmbeddedGuiceModule extends AbstractModule { - + = + private Properties props; + = + public EmbeddedGuiceModule(Properties props) { + this.props =3D props; + } + = @Override protected void configure() { - = + = bind(Cache.class).toProvider(CacheProvider.class).in(Scopes.SINGLETON); bind(CacheFactory.class).to(JBossCacheFactory.class).in(Scopes.SINGLETON= ); + bind(DQPConfigSource.class).toInstance(new EmbeddedConfigSource(this.pro= ps)); = - // currently this is setup in embedded buffer service - needs to move in= here. - //bind(BufferManager.class).toProvider(BufferManagerProvider.class).in(S= copes.SINGLETON); = + bind(LogConfiguration.class).toProvider(LogConfigurationProvider.class).= in(Scopes.SINGLETON); = + bind(LogListener.class).toProvider(LogListernerProvider.class).in(Scopes= .SINGLETON); = + + = + // this needs to be removed. + binder().requestStaticInjection(LogManager.class); } = + = } = Added: trunk/embedded/src/main/java/com/metamatrix/jdbc/LogConfigurationPro= vider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/jdbc/LogConfigurationProvid= er.java (rev 0) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/LogConfigurationProvid= er.java 2009-02-21 00:28:43 UTC (rev 479) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ +package com.metamatrix.jdbc; + +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; +import com.metamatrix.common.application.DQPConfigSource; +import com.metamatrix.common.log.LogConfiguration; +import com.metamatrix.common.log.config.BasicLogConfiguration; +import com.metamatrix.core.MetaMatrixRuntimeException; +import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; +import com.metamatrix.dqp.embedded.DQPEmbeddedProperties; + +(a)Singleton +class LogConfigurationProvider implements Provider { + + @Inject + DQPConfigSource configSource; + = + @Override + public LogConfiguration get() { + String logLevel =3D configSource.getProperties().getProperty(DQPEm= beddedProperties.DQP_LOGLEVEL); + int level =3D 0; + if(logLevel !=3D null && logLevel.trim().length() > 0) { + try { + level =3D Integer.parseInt(logLevel); = = + } catch(NumberFormatException e) { + throw new MetaMatrixRuntimeException(DQPEmbeddedPlugin.Uti= l.getString("DQPComponent.Unable_to_parse_level") + logLevel); //$NON-= NLS-1$ + } = + } + return new BasicLogConfiguration(level); + } + +} Property changes on: trunk/embedded/src/main/java/com/metamatrix/jdbc/LogCo= nfigurationProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/embedded/src/main/java/com/metamatrix/jdbc/LogListernerProvide= r.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/jdbc/LogListernerProvider.j= ava (rev 0) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/LogListernerProvider.j= ava 2009-02-21 00:28:43 UTC (rev 479) @@ -0,0 +1,89 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.jdbc; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; + +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; +import com.metamatrix.common.application.DQPConfigSource; +import com.metamatrix.common.protocol.URLHelper; +import com.metamatrix.core.MetaMatrixRuntimeException; +import com.metamatrix.core.log.FileLimitSizeLogWriter; +import com.metamatrix.core.log.LogListener; +import com.metamatrix.core.log.NullLogWriter; +import com.metamatrix.core.log.SystemLogWriter; +import com.metamatrix.dqp.embedded.DQPEmbeddedProperties; +import com.metamatrix.internal.core.log.PlatformLog; + +(a)Singleton +class LogListernerProvider implements Provider { + private static final String STDOUT =3D "STDOUT"; //$NON-NLS-1$ + = + @Inject + DQPConfigSource configSource; + = + @Override + public LogListener get() { + URL dqpURL =3D (URL)configSource.getProperties().get(EmbeddedDataSour= ce.DQP_BOOTSTRAP_FILE); + String logFile =3D configSource.getProperties().getProperty(DQPEmb= eddedProperties.DQP_LOGFILE); + String instanceId =3D configSource.getProperties().getProperty(DQP= EmbeddedProperties.DQP_IDENTITY, "0"); //$NON-NLS-1$ = + = + // Configure Logging = + try { + String dqpURLString =3D dqpURL.toString(); = + dqpURL =3D URLHelper.buildURL(dqpURLString); + if (logFile !=3D null) { + if (logFile.equalsIgnoreCase(STDOUT)) { + PlatformLog log =3D new PlatformLog(); + log.addListener(new SystemLogWriter()); + return log; + } + else { + String modifiedLogFileName =3D logFile; = = + int dotIndex =3D logFile.lastIndexOf('.'); + if (dotIndex !=3D -1) { + modifiedLogFileName =3D logFile.substring(0,dotIndex)= +"_"+instanceId+"."+logFile.substring(dotIndex+1); //$NON-NLS-1$ //$NON-NLS= -2$ + } + else { + modifiedLogFileName =3D logFile+"_"+instanceId; //$NO= N-NLS-1$ + } + URL logURL =3D URLHelper.buildURL(dqpURL, modifiedLogFile= Name); + File file =3D new File(logURL.getPath()); + PlatformLog log =3D new PlatformLog(); + log.addListener(new FileLimitSizeLogWriter(file)); + return log; + } + } + else { + return new NullLogWriter(); + } + } catch (MalformedURLException e) { + throw new MetaMatrixRuntimeException(e); + } + } + +} Property changes on: trunk/embedded/src/main/java/com/metamatrix/jdbc/LogLi= sternerProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalServ= erConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalServerC= onnection.java (rev 0) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalServerC= onnection.java 2009-02-21 00:28:43 UTC (rev 479) @@ -0,0 +1,108 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.jdbc.transport; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Properties; + +import com.metamatrix.api.exception.MetaMatrixComponentException; +import com.metamatrix.client.ExceptionUtil; +import com.metamatrix.common.api.MMURL; +import com.metamatrix.common.comm.api.ServerConnection; +import com.metamatrix.common.comm.api.ServerConnectionListener; +import com.metamatrix.dqp.client.ClientSideDQP; +import com.metamatrix.dqp.internal.process.DQPWorkContext; +import com.metamatrix.jdbc.JDBCPlugin; +import com.metamatrix.platform.security.api.LogonResult; +import com.metamatrix.platform.security.api.MetaMatrixSessionID; + +public class LocalServerConnection implements ServerConnection { + = + private final LogonResult result; + private boolean shutdown; + private DQPWorkContext workContext; + private ClientSideDQP dqp; + private ServerConnectionListener listener; + + public LocalServerConnection(MetaMatrixSessionID sessionId, Properties co= nnectionProperties, ClientSideDQP dqp, ServerConnectionListener listener) { + result =3D new LogonResult(sessionId, connectionProperties.getProperty(M= MURL.CONNECTION.USER_NAME), connectionProperties, -1, "local"); //$NON-NLS-= 1$ + = + //Initialize the workContext + workContext =3D new DQPWorkContext(); + workContext.setSessionId(result.getSessionID()); + workContext.setVdbName(connectionProperties.getProperty(MMURL.JDBC.VDB_N= AME)); + workContext.setVdbVersion(connectionProperties.getProperty(MMURL.JDBC.VD= B_VERSION)); + DQPWorkContext.setWorkContext(workContext); + = + this.dqp =3D dqp; + this.listener =3D listener; + = + if (this.listener !=3D null) { + this.listener.connectionAdded(this); + } + } + + public T getService(Class iface) { + if (iface !=3D ClientSideDQP.class) { + throw new IllegalArgumentException("unknown service"); //$NON-NLS-1$ + } + return (T) Proxy.newProxyInstance(Thread.currentThread().getContextClass= Loader(), new Class[] {ClientSideDQP.class}, new InvocationHandler() { + + public Object invoke(Object arg0, Method arg1, Object[] arg2) + throws Throwable { + = + if (!isOpen()) { + throw ExceptionUtil.convertException(arg1, new MetaMatrixComponentExc= eption(JDBCPlugin.Util.getString("LocalTransportHandler.session_inactive"))= ); //$NON-NLS-1$ + } + = + DQPWorkContext.setWorkContext(workContext); + try { + return arg1.invoke(dqp, arg2); + } catch (InvocationTargetException e) { + throw e.getTargetException(); + } + } + }); + } + + public boolean isOpen() { + return !shutdown; + } + + public void shutdown() { + if (shutdown) { + return; + } + if (this.listener !=3D null) { + this.listener.connectionRemoved(this); + } + this.shutdown =3D true; + } + + public LogonResult getLogonResult() { + return result; + } +} Property changes on: trunk/embedded/src/main/java/com/metamatrix/jdbc/trans= port/LocalServerConnection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalT= ransportHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalTranspo= rtHandler.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/main/java/com/metamatrix/jdbc/transport/LocalTranspo= rtHandler.java 2009-02-21 00:28:43 UTC (rev 479) @@ -22,204 +22,54 @@ = package com.metamatrix.jdbc.transport; = -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.net.URL; +import java.util.ArrayList; import java.util.Properties; import java.util.concurrent.atomic.AtomicLong; = -import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.client.ExceptionUtil; -import com.metamatrix.common.api.MMURL; import com.metamatrix.common.application.exception.ApplicationInitializati= onException; -import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; import com.metamatrix.common.comm.api.ServerConnection; import com.metamatrix.common.comm.api.ServerConnectionFactory; -import com.metamatrix.common.comm.exception.CommunicationException; +import com.metamatrix.common.comm.api.ServerConnectionListener; import com.metamatrix.common.comm.exception.ConnectionException; -import com.metamatrix.core.MetaMatrixRuntimeException; -import com.metamatrix.dqp.application.ClientConnectionListener; import com.metamatrix.dqp.client.ClientSideDQP; -import com.metamatrix.dqp.embedded.DQPEmbeddedManager; -import com.metamatrix.dqp.embedded.DQPEmbeddedProperties; -import com.metamatrix.dqp.embedded.DQPListener; -import com.metamatrix.dqp.internal.process.DQPWorkContext; -import com.metamatrix.dqp.service.ConfigurationService; -import com.metamatrix.dqp.service.DQPServiceNames; -import com.metamatrix.jdbc.EmbeddedDataSource; -import com.metamatrix.jdbc.JDBCPlugin; -import com.metamatrix.platform.security.api.LogonResult; import com.metamatrix.platform.security.api.MetaMatrixSessionID; = public class LocalTransportHandler implements ServerConnectionFactory { - - private final class LocalServerConnection implements ServerConnection { - private final LogonResult result; - private boolean shutdown; - private DQPWorkContext workContext; - - private LocalServerConnection(Properties connectionProperties) { - result =3D new LogonResult(new MetaMatrixSessionID(SESSION_ID - .getAndIncrement()), connectionProperties - .getProperty(MMURL.CONNECTION.USER_NAME), connectionProperties, -1, "= local"); //$NON-NLS-1$ - = - //Initialize the workContext - workContext =3D new DQPWorkContext(); - workContext.setSessionId(result.getSessionID()); - workContext.setVdbName(connectionProperties.getProperty(MMURL.JDBC.VDB_= NAME)); - workContext.setVdbVersion(connectionProperties.getProperty(MMURL.JDBC.V= DB_VERSION)); - DQPWorkContext.setWorkContext(workContext); - if (configurationConnectionListener !=3D null) { - configurationConnectionListener.connectionAdded(this); - } - } - - public T getService(Class iface) { - if (iface !=3D ClientSideDQP.class) { - throw new IllegalArgumentException("unknown service"); //$NON-NLS-1$ - } - final ClientSideDQP dqp =3D getManager().getDQP(); - return (T) Proxy.newProxyInstance(Thread.currentThread().getContextClas= sLoader(), new Class[] {ClientSideDQP.class}, new InvocationHandler() { - - public Object invoke(Object arg0, Method arg1, Object[] arg2) - throws Throwable { - = - if (!isOpen()) { - throw ExceptionUtil.convertException(arg1, new MetaMatrixComponentEx= ception(JDBCPlugin.Util.getString("LocalTransportHandler.session_inactive")= )); //$NON-NLS-1$ - } - = - DQPWorkContext.setWorkContext(workContext); - try { - return arg1.invoke(dqp, arg2); - } catch (InvocationTargetException e) { - throw e.getTargetException(); - } - } - }); - } - - public boolean isOpen() { - return !shutdown && isAlive(); - } - - public void shutdown() { - if (shutdown) { - return; - } - if (configurationConnectionListener !=3D null) { - configurationConnectionListener.connectionRemoved(this); - } - if (connectionListener !=3D null) { - connectionListener.connectionRemoved(this); - } - this.shutdown =3D true; - } - - public LogonResult getLogonResult() { - return result; - } - } - - private static final String SERVER_CONFIG_FILE_EXTENSION =3D ".properties= "; //$NON-NLS-1$ = private AtomicLong SESSION_ID =3D new AtomicLong(1); - private ClientConnectionListener configurationConnectionListener; - private DQPEmbeddedManager dqpManager; - private DQPListener dqpListener =3D null; - private ClientConnectionListener connectionListener =3D null; + private ConnectionListenerList listenerList =3D new ConnectionListener= List(); + private ClientSideDQP dqp; = - // Keeps track of whether this transport has been shutdown. = - // After it is shutdown connections may still have a reference to it. - private boolean alive =3D true; - = - public LocalTransportHandler() { - this(null,null); - } = - = /** * Default constructor - used by reflection to create a new instance. = */ - public LocalTransportHandler(DQPListener dqpListener, ClientConnection= Listener connListener) { - this.dqpListener =3D dqpListener; - this.connectionListener =3D connListener; + public LocalTransportHandler(ClientSideDQP dqp) throws ApplicationInit= ializationException { + this.dqp =3D dqp; } = - public synchronized boolean isAlive() { - return alive && (dqpManager !=3D null && dqpManager.isDQPAlive()); - } - = - private void checkAlive() { - if (!isAlive()) { - throw new MetaMatrixRuntimeException(JDBCPlugin.Util.getString= ("LocalTransportHandler.Transport_shutdown")); //$NON-NLS-1$ - } - } - = - private synchronized void initManager(URL dqpURL, Properties connPrope= rties) throws ApplicationInitializationException { - if(dqpManager !=3D null) { - return; - } - = - if(dqpURL =3D=3D null) { - throw new ApplicationInitializationException(JDBCPlugin.Util.g= etString("LocalTransportHandler.No_configuration_file_set_in_property", DQP= EmbeddedProperties.DQP_BOOTSTRAP_PROPERTIES_FILE)); //$NON-NLS-1$ - } + public ServerConnection createConnection(final Properties connectionPrope= rties) throws ConnectionException { = + return new LocalServerConnection(new MetaMatrixSessionID(SESSION_I= D.getAndIncrement()), connectionProperties, dqp, listenerList); + } = - String dqpFileName =3D dqpURL.toString().toLowerCase(); = - if (!dqpFileName.endsWith(SERVER_CONFIG_FILE_EXTENSION)) { - throw new ApplicationInitializationException(JDBCPlugin.Util.g= etString("LocalTransportHandler.Invalid_config_file_extension", dqpFileName= ) ); //$NON-NLS-1$ = - } - = - dqpManager =3D new DQPEmbeddedManager(dqpURL, connProperties, this= .dqpListener); - dqpManager.createDQP(); - ConfigurationService configService =3D (ConfigurationService)dqpMa= nager.getDQP().getEnvironment().findService(DQPServiceNames.CONFIGURATION_S= ERVICE); - if (configService !=3D null) { - try { - configurationConnectionListener =3D configService.getConnecti= onListener(); - }catch(MetaMatrixComponentException e) { - configurationConnectionListener =3D null; - } - } - } + public synchronized void registerListener(ServerConnectionListener listen= er) { + this.listenerList.add(listener); + } + = + = + private final class ConnectionListenerList extends ArrayList implements ServerConnectionListener{ = - /** - * @see com.metamatrix.jdbc.transport.TransportHandler#shutdown() - */ - public synchronized void shutdown() { - alive =3D false; - if (dqpManager !=3D null) { - try { - dqpManager.shutdown(); - } catch (ApplicationLifecycleException e) { - // TODO ignore? - } - dqpManager =3D null; - } - } - = - public synchronized DQPEmbeddedManager getManager() { - checkAlive(); - return dqpManager; - } - = - synchronized void setManager(DQPEmbeddedManager manager) { - dqpManager =3D manager; - } + @Override + public void connectionAdded(ServerConnection connection) { + for (ServerConnectionListener l: this) { + l.connectionAdded(connection); + } + } = - public ServerConnection createConnection(final Properties connectionPrope= rties) throws CommunicationException, - ConnectionException { - initManager(connectionProperties); - = - return new LocalServerConnection(connectionProperties); + @Override + public void connectionRemoved(ServerConnection connection) { + for (ServerConnectionListener l: this) { + l.connectionRemoved(connection); + } = + } } - - public void initManager(final Properties connectionProperties) - throws ConnectionException { - try { - URL dqpURL =3D (URL)connectionProperties.get(EmbeddedDataSourc= e.DQP_BOOTSTRAP_FILE); - initManager(dqpURL, connectionProperties); - } catch(ApplicationInitializationException e) { - throw new ConnectionException(e); - } - } } Copied: trunk/embedded/src/main/resources/deploy.properties (from rev 466, = trunk/embedded/src/main/resources/mm.properties) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/resources/deploy.properties = (rev 0) +++ trunk/embedded/src/main/resources/deploy.properties 2009-02-21 00:28:43= UTC (rev 479) @@ -0,0 +1,6 @@ +#default properties file for Teiid Embedded +mm.io.tmpdir=3D${user.dir}/teiid-workspace/temp +dqp.extensions=3Dmmfile://${user.dir}/teiid-workspace/extensions +dqp.logFile=3Dmmfile://${user.dir}/teiid-workspace/teiid-embedded.log +dqp.logLevel=3D2 +metamatrix.xatxnmgr.txnstore_dir=3D${user.dir}/teiid-workspace \ No newline at end of file Property changes on: trunk/embedded/src/main/resources/deploy.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/embedded/src/main/resources/jboss-cache-configuration.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/resources/jboss-cache-configuration.xml = (rev 0) +++ trunk/embedded/src/main/resources/jboss-cache-configuration.xml 2009-02= -21 00:28:43 UTC (rev 479) @@ -0,0 +1,72 @@ + + + + org.jboss.cache.tr= ansaction.GenericTransactionManagerLookup + READ_COMMITTED + true + = + LOCAL + true + + + 20000 + = + + 20000 + = + + 15000 + = + + DEFAULT + + true + + + + + + false + + true + + + org.jboss.cache.loader.FileCacheLoader + location=3D./teiid/cache = = + + + true + = + + true + + + false + + + + + + + 3 + + 100000 + + org.jboss.cache.eviction.LRUPoli= cy + + + 10000 + 0 + + + + = + + = \ No newline at end of file Property changes on: trunk/embedded/src/main/resources/jboss-cache-configur= ation.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/embedded/src/main/resources/mm.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/resources/mm.properties 2009-02-20 21:08:28 UTC= (rev 478) +++ trunk/embedded/src/main/resources/mm.properties 2009-02-21 00:28:43 UTC= (rev 479) @@ -1,6 +0,0 @@ -#default properties file for Federate Embedded -mm.io.tmpdir=3D${user.dir}/federate-workspace/temp -dqp.extensions=3Dmmfile://${user.dir}/federate-workspace/extensions -dqp.logFile=3Dmmfile://${user.dir}/federate-workspace/federate-embedded.log -dqp.logLevel=3D2 -metamatrix.xatxnmgr.txnstore_dir=3D${user.dir}/federate-workspace \ No newline at end of file Modified: trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/TestEmbe= ddedConfigSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/TestEmbeddedCo= nfigSource.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/TestEmbeddedCo= nfigSource.java 2009-02-21 00:28:43 UTC (rev 479) @@ -24,6 +24,7 @@ = import java.net.MalformedURLException; import java.net.URL; +import java.util.Properties; = import junit.framework.TestCase; = @@ -33,6 +34,7 @@ import com.metamatrix.dqp.service.DQPServiceNames; import com.metamatrix.dqp.service.FakeAbstractService; import com.metamatrix.dqp.service.FakeVDBService; +import com.metamatrix.jdbc.EmbeddedDataSource; = public class TestEmbeddedConfigSource extends TestCase { = @@ -45,7 +47,10 @@ } = = public void testServiceLoading() throws Exception { - EmbeddedConfigSource source =3D new EmbeddedConfigSource(buildDQPU= rl(UnitTestUtil.getTestDataPath() + "/bqt/fakebqt.properties"), null);//$NO= N-NLS-1$ = + Properties p =3D new Properties(); + p.put(EmbeddedDataSource.DQP_BOOTSTRAP_FILE, buildDQPUrl(UnitTestUtil= .getTestDataPath() + "/bqt/fakebqt.properties")); //$NON-NLS-1$ + = + EmbeddedConfigSource source =3D new EmbeddedConfigSource(p); = = Application application =3D new Application(); application.start(source); assertTrue(application.getEnvironment().findService(DQPServiceName= s.VDB_SERVICE) instanceof FakeVDBService); Modified: trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services= /TestEmbeddedConfigurationService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestE= mbeddedConfigurationService.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/test/java/com/metamatrix/dqp/embedded/services/TestE= mbeddedConfigurationService.java 2009-02-21 00:28:43 UTC (rev 479) @@ -73,19 +73,19 @@ } = public void testUseExtensionPath() throws Exception { - service.userPreferences =3D EmbeddedTestUtil.getProperties(); //$N= ON-NLS-1$; + service.userPreferences =3D EmbeddedTestUtil.getProperties(); = assertTrue(service.useExtensionClasspath()); } = public void testUseExtensionPathFalse() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = p.remove("dqp.extensions"); //$NON-NLS-1$ = service.userPreferences =3D p; = assertFalse(service.useExtensionClasspath()); } = public void testGetAvailableVDBFiles() throws Exception { - service.userPreferences =3D EmbeddedTestUtil.getProperties(); //$N= ON-NLS-1$; + service.userPreferences =3D EmbeddedTestUtil.getProperties(); = HashMap vdbFiles =3D VDBConfigurationReader.loadVDBS(service.getVD= BLocations()); int count =3D vdbFiles.keySet().size(); assertEquals(2, count); = @@ -100,7 +100,7 @@ } = public void testGetConfigFileURL() throws Exception { - service.userPreferences =3D EmbeddedTestUtil.getProperties(); //$N= ON-NLS-1$; + service.userPreferences =3D EmbeddedTestUtil.getProperties(); = assertTrue(service.getConfigFile().toString().endsWith("dqp/config= /ServerConfig.xml")); //$NON-NLS-1$ } = @@ -108,7 +108,7 @@ BasicConnectorBinding binding =3D new BasicConnectorBinding(new Co= nfigurationID("foo"), new ConnectorBindingID(new ConfigurationID("foo"), "f= oo"), new ComponentTypeID("foo type")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-= NLS-3$ //$NON-NLS-4$ BasicConnectorBinding alternatebinding =3D new BasicConnectorBindi= ng(new ConfigurationID("foo"), new ConnectorBindingID(new ConfigurationID("= foo"), "foo"), new ComponentTypeID("foo type")); //$NON-NLS-1$ //$NON-NLS-2= $ //$NON-NLS-3$ //$NON-NLS-4$ = - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.loadedConnectorBindings.put("foo", alternatebinding); //$N= ON-NLS-1$ = @@ -117,7 +117,7 @@ } = = public void defer_testInitializeEncryption() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = p.setProperty(DQPEmbeddedProperties.DQP_KEYSTORE, "Cluster.key"); = //$NON-NLS-1$ service.userPreferences =3D p; service.initializeEncryption(); = @@ -125,20 +125,20 @@ } = public void testGetDefaultExtensionPath() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = p.remove(DQPEmbeddedProperties.DQP_EXTENSIONS); service.userPreferences =3D p; = assertTrue(service.getDefaultExtensionPath().toString().endsWith("= dqp/extensions/")); //$NON-NLS-1$ } = public void testGetDirectoryToStoreVDBS() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; = assertTrue(service.getVDBSaveLocation().toString().endsWith("dqp/c= onfig/")); //$NON-NLS-1$ } = public void testGetDirectoryToStoreVDBSByVDBName() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = p.setProperty(DQPEmbeddedProperties.VDB_DEFINITION, "./config/QT_O= ra9DS.vdb"); //$NON-NLS-1$ service.userPreferences =3D p; = service.initializeService(p); @@ -150,7 +150,7 @@ } = public void testGetFileToSaveNewFile() throws Exception{ - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; p.setProperty(DQPEmbeddedProperties.VDB_DEFINITION, "./config/QT_O= ra9DS.vdb"); //$NON-NLS-1$ service.initializeService(p); @@ -163,7 +163,7 @@ } = public void testGetFileAlreadyExisting() throws Exception{ - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = @@ -174,7 +174,7 @@ } = public void testGetFullyQualifiedPath() throws Exception{ - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; = assertTrue(service.getFullyQualifiedPath("http://lib/foo.txt").toS= tring().endsWith("http://lib/foo.txt")); //$NON-NLS-1$ //$NON-NLS-2$ assertTrue(service.getFullyQualifiedPath("file:/c:/lib/foo.txt").t= oString().endsWith("file:/c:/lib/foo.txt"));//$NON-NLS-1$ //$NON-NLS-2$ @@ -187,14 +187,14 @@ } = public void testGetNextVdbVersion() throws Exception{ = - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = assertEquals(2, service.getNextVdbVersion("QT_Ora9DS")); //$NON-NL= S-1$ } = = public void testDeleteInUseConnectorBinding() throws Exception{ = - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = try { @@ -206,7 +206,7 @@ } = public void testDeleteNonExistingConnectorBinding() throws Exception{ = = - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = try { @@ -218,7 +218,7 @@ } = = public void testDeleteConnectorBinding() throws Exception{ = - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); service.userPreferences =3D p; service.initializeService(p); = = @@ -234,7 +234,7 @@ = = public void testDeleteConnectorType() throws Exception{ = - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); service.userPreferences =3D p; service.initializeService(p); = = @@ -255,7 +255,7 @@ } = = public void testDeleteConnectorTypeInUse() throws Exception{ = - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = = @@ -270,7 +270,7 @@ } = = public void testDeleteVDB() throws Exception{ - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = = @@ -283,7 +283,7 @@ } = public void testGetLogFile() throws Exception{ - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = p.setProperty(DQPEmbeddedProperties.DQP_LOGFILE, "./log/dqp.log");= //$NON-NLS-1$ = p.setProperty(DQPEmbeddedProperties.DQP_LOGLEVEL, "1"); //$NON-NLS= -1$ = service.userPreferences =3D p; @@ -293,7 +293,7 @@ } = public void testGetSystemProperties() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = = @@ -304,17 +304,8 @@ assertEquals("20000", sp.getProperty("MaxFetchSize")); //$NON-NLS-= 1$ //$NON-NLS-2$ } = - public void testGetResetSystemPrintStreams() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; - p.setProperty(DQPEmbeddedProperties.DQP_CAPTURE_SYSTEM_PRINTSTREAM= S, "true"); //$NON-NLS-1$ = - service.userPreferences =3D p; - service.initializeService(p); = - - assertTrue(Boolean.valueOf(service.captureSystemStreams()).boolean= Value()); - } - = public void testGetSystemConfiguration() throws Exception{ - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; = assertNull(service.configurationModel); = @@ -323,28 +314,28 @@ } = public void testGetSystemVDB() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = assertNotNull(service.getSystemVdb()); } = public void testGetUDFFileName() throws Exception{ - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = p.setProperty(DQPEmbeddedProperties.USER_DEFINED_FUNCTIONS, "./lib= /foo.txt"); //$NON-NLS-1$ service.userPreferences =3D p; assertTrue(service.getUDFFile().toString().endsWith(UnitTestUtil.g= etTestScratchPath()+"/dqp/lib/foo.txt")); //$NON-NLS-1$ } = public void testGetVDBs() throws Exception{ - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); assertTrue(service.getVDBs().size() =3D=3D 2); = } = public void testSaveConnectorBinding() throws Exception{ - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = @@ -375,7 +366,7 @@ = = public void testSaveConnectorType() throws Exception{ - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = @@ -400,7 +391,7 @@ = = public void testSaveVDB() throws Exception{ - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = @@ -413,7 +404,7 @@ } = public void testGetProcessorBatchSize() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = @@ -421,7 +412,7 @@ } = public void testGetConnectorBatchSize() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = @@ -429,7 +420,7 @@ } = public void testLoadedConnectorBindings() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = @@ -451,7 +442,7 @@ } = = public void testAddConnectorBinding() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = @@ -463,7 +454,7 @@ } = public void testGetConnectorTypes() throws Exception { - Properties p =3D EmbeddedTestUtil.getProperties(); //$NON-NLS-1$; = = + Properties p =3D EmbeddedTestUtil.getProperties(); = service.userPreferences =3D p; service.initializeService(p); = Modified: trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriv= er.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.jav= a 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.jav= a 2009-02-21 00:28:43 UTC (rev 479) @@ -50,105 +50,105 @@ */ public void testAcceptsURL() throws SQLException { = // Windows Path - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)c:\\metamatrix= \\dqp\\dqp.properties")); - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)c:\\metamatrix= \\dqp\\dqp.properties;version=3D1")); - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)c:\\metamatrix= \\dqp\\dqp.properties;version=3D1;txnAutoWrap=3DON;partialResultsMode=3DYES= ")); + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)c:\\metamatrix= \\dqp\\dqp.properties")); //$NON-NLS-1$ + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)c:\\metamatrix= \\dqp\\dqp.properties;version=3D1")); //$NON-NLS-1$ + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)c:\\metamatrix= \\dqp\\dqp.properties;version=3D1;txnAutoWrap=3DON;partialResultsMode=3DYES= ")); //$NON-NLS-1$ = // Alternative windows path - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)c:/metamatrix/= dqp/dqp.properties")); - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)c:/metamatrix/= dqp/dqp.properties;version=3D1")); - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)c:/metamatrix/= dqp/dqp.properties;version=3D1;txnAutoWrap=3DON;partialResultsMode=3DYES")); + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)c:/metamatrix/= dqp/dqp.properties")); //$NON-NLS-1$ + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)c:/metamatrix/= dqp/dqp.properties;version=3D1")); //$NON-NLS-1$ + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)c:/metamatrix/= dqp/dqp.properties;version=3D1;txnAutoWrap=3DON;partialResultsMode=3DYES"))= ; //$NON-NLS-1$ = // Abosolute path (Unix or windows) - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT@/metamatrix/dqp/= dqp.properties")); - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT@/metamatrix/dqp/= dqp.properties;version=3D1")); - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT@/metamatrix/dqp/= dqp.properties;version=3D1;txnAutoWrap=3DON;partialResultsMode=3DYES")); + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT@/metamatrix/dqp/= dqp.properties")); //$NON-NLS-1$ + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT@/metamatrix/dqp/= dqp.properties;version=3D1")); //$NON-NLS-1$ + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT@/metamatrix/dqp/= dqp.properties;version=3D1;txnAutoWrap=3DON;partialResultsMode=3DYES")); //= $NON-NLS-1$ = // relative path - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)../../metamatr= ix/dqp/dqp.properties")); - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)../../metamatr= ix/dqp/dqp.properties;version=3D1")); - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)../../metamatr= ix/dqp/dqp.properties;version=3D1;txnAutoWrap=3DON;partialResultsMode=3DYES= ")); + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)../../metamatr= ix/dqp/dqp.properties")); //$NON-NLS-1$ + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)../../metamatr= ix/dqp/dqp.properties;version=3D1")); //$NON-NLS-1$ + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)../../metamatr= ix/dqp/dqp.properties;version=3D1;txnAutoWrap=3DON;partialResultsMode=3DYES= ")); //$NON-NLS-1$ = // File URL should be supported (not sure) - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)file:///c:/met= amatrix/dqp/dqp.properties")); - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)testdata/dqp/d= qp.properties;partialResultsMode=3Dtrue")); + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)file:///c:/met= amatrix/dqp/dqp.properties")); //$NON-NLS-1$ + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)testdata/dqp/d= qp.properties;partialResultsMode=3Dtrue")); //$NON-NLS-1$ = // ClassPath based URL - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)classpath:/dqp= .properties;partialResultsMode=3Dtrue")); + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT(a)classpath:/dqp= .properties;partialResultsMode=3Dtrue")); //$NON-NLS-1$ = // These are specific to the MMDriver and should not be suported - assertFalse(driver.acceptsURL("jdbc:metamatrix:BQT(a)mm://host:700= 1;version=3D1")); - assertFalse(driver.acceptsURL("jdbc:metamatrix:BQT(a)mms://host:70= 01;version=3D1")); + assertFalse(driver.acceptsURL("jdbc:metamatrix:BQT(a)mm://host:700= 1;version=3D1")); //$NON-NLS-1$ + assertFalse(driver.acceptsURL("jdbc:metamatrix:BQT(a)mms://host:70= 01;version=3D1")); //$NON-NLS-1$ //assertFalse(driver.acceptsURL("jdbc:metamatrix:BQT(a)http://host= :7001;version=3D1")); = - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT")); - assertFalse(driver.acceptsURL("jdbc:metamatrix:BQT!/path/foo.prope= rties")); - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT;")); - assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT;version=3D1;logF= ile=3Dfoo.txt")); + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT")); //$NON-NLS-1$ + assertFalse(driver.acceptsURL("jdbc:metamatrix:BQT!/path/foo.prope= rties")); //$NON-NLS-1$ + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT;")); //$NON-NLS-= 1$ + assertTrue(driver.acceptsURL("jdbc:metamatrix:BQT;version=3D1;logF= ile=3Dfoo.txt")); //$NON-NLS-1$ } = public void testParseURL() throws SQLException{ Properties p =3D new Properties(); - driver.parseURL("jdbc:metamatrix:BQT(a)c:\\metamatrix\\dqp\\dqp.pr= operties", p); - assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); - assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("mmfile:/c:/metamatrix/dqp/dqp.properties")); + driver.parseURL("jdbc:metamatrix:BQT(a)c:\\metamatrix\\dqp\\dqp.pr= operties", p); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); = //$NON-NLS-1$ + assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("mmfile:/c:/metamatrix/dqp/dqp.properties")); //$NON-NLS-1$ assertEquals(2, p.size()); = } = public void testParseURL2() throws SQLException { Properties p =3D new Properties(); = - driver.parseURL("jdbc:metamatrix:BQT@\\metamatrix\\dqp\\dqp.proper= ties;version=3D3", p); - assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); - assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("mmfile:/metamatrix/dqp/dqp.properties")); - assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("3")); - assertTrue(p.getProperty(BaseDataSource.VERSION).equals("3")); + driver.parseURL("jdbc:metamatrix:BQT@\\metamatrix\\dqp\\dqp.proper= ties;version=3D3", p); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); = //$NON-NLS-1$ + assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("mmfile:/metamatrix/dqp/dqp.properties")); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("3"));= //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VERSION).equals("3")); //$= NON-NLS-1$ assertEquals(4, p.size()); } = public void testParseURL3() throws SQLException{ Properties p =3D new Properties(); - driver.parseURL("jdbc:metamatrix:BQT@/metamatrix/dqp/dqp.propertie= s;version=3D4;txnAutoWrap=3DON;partialResultsMode=3DYES;logFile=3DD:\\metam= atrix\\work\\DQP\\log\\jdbcLogFile.log", p); - assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); - assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("mmfile:/metamatrix/dqp/dqp.properties")); - assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("4")); - assertTrue(p.getProperty(BaseDataSource.VERSION).equals("4")); - assertTrue(p.getProperty(ExecutionProperties.PROP_TXN_AUTO_WRAP).e= quals("ON")); - assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_= MODE).equals("YES")); - assertTrue(p.getProperty(BaseDataSource.LOG_FILE).equals("D:\\meta= matrix\\work\\DQP\\log\\jdbcLogFile.log")); + driver.parseURL("jdbc:metamatrix:BQT@/metamatrix/dqp/dqp.propertie= s;version=3D4;txnAutoWrap=3DON;partialResultsMode=3DYES;logFile=3DD:\\metam= atrix\\work\\DQP\\log\\jdbcLogFile.log", p); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); = //$NON-NLS-1$ + assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("mmfile:/metamatrix/dqp/dqp.properties")); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("4"));= //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VERSION).equals("4")); //$= NON-NLS-1$ + assertTrue(p.getProperty(ExecutionProperties.PROP_TXN_AUTO_WRAP).e= quals("ON")); //$NON-NLS-1$ + assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_= MODE).equals("YES")); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.LOG_FILE).equals("D:\\meta= matrix\\work\\DQP\\log\\jdbcLogFile.log")); //$NON-NLS-1$ assertEquals(7, p.size()); = } = public void testParseURL4() throws SQLException{ Properties p =3D new Properties(); - driver.parseURL("jdbc:metamatrix:BQT(a)testdata/dqp/dqp.properties= ;partialResultsMode=3Dtrue", p); - assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); - assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("mmfile:testdata/dqp/dqp.properties")); - assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_= MODE).equals("true")); + driver.parseURL("jdbc:metamatrix:BQT(a)testdata/dqp/dqp.properties= ;partialResultsMode=3Dtrue", p); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); = //$NON-NLS-1$ + assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("mmfile:testdata/dqp/dqp.properties")); //$NON-NLS-1$ + assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_= MODE).equals("true")); //$NON-NLS-1$ assertEquals(3, p.size()); = } = public void testParseURL5() throws SQLException{ Properties p =3D new Properties(); - driver.parseURL("jdbc:metamatrix:BQT", p); - assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); - assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("classpath:/mm.properties")); = + driver.parseURL("jdbc:metamatrix:BQT", p); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); = //$NON-NLS-1$ + assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("classpath:/deploy.properties")); //$NON-NLS-1$ } = public void testParseURL55() throws SQLException{ Properties p =3D new Properties(); - driver.parseURL("jdbc:metamatrix:BQT;", p); - assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); - assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("classpath:/mm.properties")); = + driver.parseURL("jdbc:metamatrix:BQT;", p); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); = //$NON-NLS-1$ + assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("classpath:/deploy.properties")); //$NON-NLS-1$ } = = public void testParseURL6() throws SQLException{ Properties p =3D new Properties(); - driver.parseURL("jdbc:metamatrix:BQT;partialResultsMode=3Dtrue;ver= sion=3D1", p); - assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); - assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("classpath:/mm.properties")); - assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_= MODE).equals("true")); - assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("1")); - assertTrue(p.getProperty("vdb.definition").equals("BQT.vdb")); + driver.parseURL("jdbc:metamatrix:BQT;partialResultsMode=3Dtrue;ver= sion=3D1", p); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); = //$NON-NLS-1$ + assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("classpath:/deploy.properties")); //$NON-NLS-1$ + assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_= MODE).equals("true")); //$NON-NLS-1$ + assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("1"));= //$NON-NLS-1$ + assertTrue(p.getProperty("vdb.definition").equals("BQT.vdb")); //$= NON-NLS-1$ //$NON-NLS-2$ assertEquals(6, p.size()); = = } Added: trunk/embedded/src/test/resources/jboss-cache-configuration.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/test/resources/jboss-cache-configuration.xml = (rev 0) +++ trunk/embedded/src/test/resources/jboss-cache-configuration.xml 2009-02= -21 00:28:43 UTC (rev 479) @@ -0,0 +1,72 @@ + + + + org.jboss.cache.tr= ansaction.GenericTransactionManagerLookup + READ_COMMITTED + true + = + LOCAL + true + + + 20000 + = + + 20000 + = + + 15000 + = + + DEFAULT + + true + + + + + + false + + true + + + org.jboss.cache.loader.FileCacheLoader + location=3D./target/scratch/federate = + + + true + = + + true + + + false + + + + + + + 3 + + 100000 + + org.jboss.cache.eviction.LRUPoli= cy + + + 10000 + 0 + + + + = + + = \ No newline at end of file Property changes on: trunk/embedded/src/test/resources/jboss-cache-configur= ation.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/Configurati= onService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/service/ConfigurationServ= ice.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/engine/src/main/java/com/metamatrix/dqp/service/ConfigurationServ= ice.java 2009-02-21 00:28:43 UTC (rev 479) @@ -31,13 +31,13 @@ import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.application.ApplicationService; import com.metamatrix.common.comm.api.ServerConnection; +import com.metamatrix.common.comm.api.ServerConnectionListener; import com.metamatrix.common.config.api.ComponentType; import com.metamatrix.common.config.api.ConfigurationModelContainer; import com.metamatrix.common.config.api.ConnectorBinding; import com.metamatrix.common.config.api.ConnectorBindingType; import com.metamatrix.common.config.api.ExtensionModule; import com.metamatrix.common.vdb.api.VDBArchive; -import com.metamatrix.dqp.application.ClientConnectionListener; = = = @@ -117,14 +117,6 @@ public String getLogLevel(); = /** - * Capture the System.out and System.err streams and direct them to the - * log file. = - * @return true if yes; false otherwise - * @throws MetaMatrixComponentException - */ - public String captureSystemStreams() throws MetaMatrixComponentExcepti= on; - - /** * Save the given vdb file into underlying persistent mechanism used by * this configuration service = * @param vdb - VDB to be saved @@ -312,8 +304,7 @@ * @throws MetaMatrixComponentException * @since 4.3.2 */ - public ClientConnectionListener getConnectionListener() = - throws MetaMatrixComponentException; + public ServerConnectionListener getConnectionListener(); = = = /** @@ -393,13 +384,8 @@ */ public String getInstanceIdenifier(); = = + /** - * Should DQP use the unified class loader? = - * @return true if yes; false otherwise - */ - public boolean useUnifiedClassLoader(); - = - /** * This returns the active client connections that have been made to t= he DQP = * @return list of connections which are currently available;never null */ Modified: trunk/engine/src/test/java/com/metamatrix/dqp/config/TestDQPLaunc= her.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/config/TestDQPLauncher.ja= va 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/engine/src/test/java/com/metamatrix/dqp/config/TestDQPLauncher.ja= va 2009-02-21 00:28:43 UTC (rev 479) @@ -66,7 +66,7 @@ DQPCore dqpCore =3D new DQPCore(); dqpCore.start(configSource); = - PlatformLog log =3D PlatformLog.getInstance(); + PlatformLog log =3D new PlatformLog(); List list =3D log.getLogListeners(); for(LogListener l: list) { log.removeListener(l); Modified: trunk/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/pom.xml 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/pom.xml 2009-02-21 00:28:43 UTC (rev 479) @@ -127,9 +127,10 @@ build/assembly/src.xml build/assembly/bin.xml - build/assembly/embedded/embedded-jar.xml + build/assembly/embedded/embedded-clien= t-jar.xml = build/assembly/embedded/embedded-dependencies.xml build/assembly/embedded/embedded-connector-dependencies.= xml + build/assembly/embedded/embedded-jar.x= ml build/assembly/embedded/embedded-dist.xml build/assembly/cdk/cdk-dependencies.xml build/assembly/cdk/cdk-dist.xml Modified: trunk/server/src/main/java/com/metamatrix/common/log/DbLogListene= r.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/log/DbLogListener.java= 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/server/src/main/java/com/metamatrix/common/log/DbLogListener.java= 2009-02-21 00:28:43 UTC (rev 479) @@ -42,7 +42,7 @@ /** * Listen for log messages and write them to a database. */ - public DbLogListener(Properties prop) throws DbWriterException { + public DbLogListener(Properties prop){ if (prop =3D=3D null) { final String msg =3D CommonPlugin.Util.getString("DbLogListener.The_Pro= perties_reference_may_not_be_null"); //$NON-NLS-1$ throw new IllegalArgumentException(msg); @@ -50,13 +50,9 @@ writer =3D new DbLogWriter(prop); writer.initialize(); enabled =3D PropertiesUtils.getBooleanProperty(prop, LOG_DB_ENABLE= D, true); - } = - protected void init(Properties props) throws DbWriterException { = - } - public void logMessage(LogMessage msg) { = if (enabled) { @@ -64,9 +60,6 @@ } } = - /* (non-Javadoc) - * @see com.metamatrix.core.log.LogListener#shutdown() - */ public void shutdown() { writer.shutdown(); } @@ -77,7 +70,7 @@ = } = - public void enableDBLogging(boolean enable) { + void enableDBLogging(boolean enable) { enabled =3D enable; } = Modified: trunk/server/src/main/java/com/metamatrix/common/log/DbLogWriter.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/log/DbLogWriter.java 2= 009-02-20 21:08:28 UTC (rev 478) +++ trunk/server/src/main/java/com/metamatrix/common/log/DbLogWriter.java 2= 009-02-21 00:28:43 UTC (rev 479) @@ -32,6 +32,7 @@ import com.metamatrix.common.CommonPlugin; import com.metamatrix.common.config.JDBCConnectionPoolHelper; import com.metamatrix.common.util.ErrorMessageKeys; +import com.metamatrix.common.util.VMNaming; import com.metamatrix.core.log.LogMessage; import com.metamatrix.core.util.DateUtil; import com.metamatrix.core.util.StringUtil; @@ -46,7 +47,7 @@ */ public class DbLogWriter { = - /** + /** * Static String to use as the user name when checking out connections= from the pool */ static final String LOGGING =3D "LOGGING";//$NON-NLS-1$ @@ -55,8 +56,7 @@ * The name of the System property that contains the name of the LogMessa= geFormat * class that is used to format messages sent to the file destination. * This is an optional property; if not specified and the file destination - * is used, then the {@link com.metamatrix.common.logging.format.Delimite= dLogMessageFormat DelimitedLogMessageFormat} - * is used. + * is used */ static final String PROPERTY_PREFIX =3D "metamatrix.log."; //$NON-NLS-= 1$ = = @@ -193,7 +193,7 @@ * itself. * @throws LogDestinationInitFailedException if there was an error during= initialization. */ - public void initialize() throws DbWriterException { + public void initialize() { sequenceNumber =3D 0; lastSequenceStart =3D 0; = @@ -309,10 +309,10 @@ stmt.setString(5, StringUtil.truncString(message.getText(), maxMsgLengt= h)); = // Message hostname column - stmt.setString(6, StringUtil.truncString(message.getHostName(), maxGene= ralLength)); + stmt.setString(6, StringUtil.truncString(VMNaming.getConfigName(), maxG= eneralLength)); = = // Message VM ID column - stmt.setString(7, StringUtil.truncString(message.getVMName(), maxGenera= lLength)); + stmt.setString(7, StringUtil.truncString(VMNaming.getVMName(), maxGener= alLength)); = // Message thread name column stmt.setString(8, StringUtil.truncString(message.getThreadName(), maxGe= neralLength)); Modified: trunk/server/src/main/java/com/metamatrix/common/log/I18nLogManag= er.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/log/I18nLogManager.jav= a 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/server/src/main/java/com/metamatrix/common/log/I18nLogManager.jav= a 2009-02-21 00:28:43 UTC (rev 479) @@ -22,7 +22,7 @@ = package com.metamatrix.common.log; = -import com.metamatrix.core.log.LogMessage; +import com.metamatrix.core.CorePlugin; import com.metamatrix.core.log.MessageLevel; = /** @@ -31,7 +31,8 @@ */ public final class I18nLogManager { private static I18nLogManager INSTANCE =3D new I18nLogManager(); - + private static final String NULL_MSG_TEXT =3D "Null"; //$NON-NLS-1$ + = private I18nLogManager() { } = @@ -114,46 +115,56 @@ } = private void logMessage(int level, String msgID, String context, Objec= t[] msgParts) { - // Check quickly the level of the message: - // If the messsage's level is greater than the logging level, - // then the message should NOT be recorded ... if (!LogManager.isMessageToBeRecorded(context, level)) { return; } = - - LogMessage msg =3D new LogMessage(msgID, context, level, msgParts); - LogManager.getInstance().forwardMessage(msg); -// System.out.println("Enqueuing message: " + msg.getText() ); + LogManager.log(level, context, geti18nMsg(msgID, msgParts)); } = + private String geti18nMsg(String msgID, Object[] msgParts) { + if (msgID !=3D null) { + if (msgParts =3D=3D null) { + return CorePlugin.Util.getString(msgID); + } else { + + return CorePlugin.Util.getString(msgID, msgParts); + + } + } + else { + StringBuffer text =3D null; + if(msgParts !=3D null) { + text =3D new StringBuffer(); + for(int i=3D0; i0) text.append(" "); //$NON-NLS-1$ + Object omsg =3D msgParts[i]; + if ( omsg !=3D null ) { + text.append(omsg.toString()); + } + } + } + + if (text =3D=3D null) { + return NULL_MSG_TEXT; + } else { + return text.toString(); + } = + } + } + private void logMessage(int level, String msgID, String context, Throw= able e) { - // Check quickly the level of the message: - // If the messsage's level is greater than the logging level, - // then the message should NOT be recorded ... if (!LogManager.isMessageToBeRecorded(context, level)) { return; } - - - LogMessage msg =3D new LogMessage(msgID, context, level, e); -// System.out.println("Enqueuing message: " + msg.getText() ); - LogManager.getInstance().forwardMessage(msg); + LogManager.log(level, context, e, geti18nMsg(msgID, null)); } = private void logMessage(int level, String msgID, String context, Throw= able e, Object[] msgParts) { - // Check quickly the level of the message: - // If the messsage's level is greater than the logging level, - // then the message should NOT be recorded ... if (!LogManager.isMessageToBeRecorded(context, level)) { return; } - - - LogMessage msg =3D new LogMessage(msgID, context, level, e, msgPar= ts); -// System.out.println("Enqueuing message: " + msg.getText() ); - LogManager.getInstance().forwardMessage(msg); + LogManager.log(level, context, e, geti18nMsg(msgID, msgParts)); } - } = Modified: trunk/server/src/main/java/com/metamatrix/common/log/reader/DBLog= Reader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/log/reader/DBLogReader= .java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/server/src/main/java/com/metamatrix/common/log/reader/DBLogReader= .java 2009-02-21 00:28:43 UTC (rev 479) @@ -38,15 +38,9 @@ import com.metamatrix.common.CommonPlugin; import com.metamatrix.common.config.CurrentConfiguration; import com.metamatrix.common.config.JDBCConnectionPoolHelper; -import com.metamatrix.common.config.ResourceNames; -import com.metamatrix.common.config.api.ResourceDescriptor; import com.metamatrix.common.connection.ManagedConnectionException; -import com.metamatrix.common.jdbc.JDBCUtil; -import com.metamatrix.common.properties.UnmodifiableProperties; import com.metamatrix.common.util.ErrorMessageKeys; import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.common.util.crypto.CryptoException; -import com.metamatrix.common.util.crypto.CryptoUtil; import com.metamatrix.core.util.DateUtil; = = @@ -58,7 +52,7 @@ * The name of the System property that contains the name of the LogMe= ssageFormat * class that is used to format messages sent to the file destination. * This is an optional property; if not specified and the file destina= tion - * is used, then the {@link com.metamatrix.common.logging.format.Delim= itedLogMessageFormat DelimitedLogMessageFormat} + * is used * is used. */ static final String PROPERTY_PREFIX =3D "metamatrix.log."; //$NON-N= LS-1$ Deleted: trunk/server/src/main/java/com/metamatrix/platform/config/Configur= ationChangeListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/platform/config/Configuration= ChangeListener.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/server/src/main/java/com/metamatrix/platform/config/Configuration= ChangeListener.java 2009-02-21 00:28:43 UTC (rev 479) @@ -1,88 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.platform.config; - -import java.util.EventObject; - -import com.metamatrix.common.config.CurrentConfiguration; -import com.metamatrix.common.config.api.Configuration; -import com.metamatrix.common.config.api.exceptions.ConfigurationException; -import com.metamatrix.common.log.DbLogListener; -import com.metamatrix.core.event.EventObjectListener; -import com.metamatrix.platform.config.event.ConfigurationChangeEvent; - -/** - * This class will listen for Changes to Configuration and = - */ -public class ConfigurationChangeListener implements EventObjectListener { - = - /** - * The name of the System property that contains the set of comma-separat= ed - * context names for messages not to be recorded. A message conte= xt is simply - * some string that identifies something about the component that generat= es - * the message. The value for the contexts is application specific. - *

- * This is an optional property that defaults to no contexts (i.e., messa= ges - * with any context are recorded). - */ - public static final String LOG_CONTEXT_PROPERTY_NAME =3D "metamatrix.log.= contexts"; //$NON-NLS-1$ - = - public static final String LOG_LEVEL_PROPERTY_NAME =3D "metamatrix.log"; = //$NON-NLS-1$ - = - public static final String LOG_DB_ENABLED =3D "metamatrix.log.jdbcData= base.enabled"; //$NON-NLS-1$ - = - Configuration currentConfig =3D null; - = - private DbLogListener logger =3D null; - = - public ConfigurationChangeListener() { - - } = - = - public ConfigurationChangeListener(DbLogListener dblogger) { - logger =3D dblogger; - } - - /* (non-Javadoc) - * @see com.metamatrix.core.event.EventObjectListener#processEvent(java.u= til.EventObject) - */ - public void processEvent(EventObject obj) { - if(obj instanceof ConfigurationChangeEvent){ - try { - currentConfig =3D CurrentConfiguration.getInstance().getConfiguration(= ); - = - if (logger !=3D null) { - logger.determineIfEnabled(currentConfig.getProperties(= )); - } = - = - } catch( ConfigurationException ce ) { - ce.printStackTrace(); - System.out.println(ce); - } - } - } - - public void shutdown() { - } - = -} Modified: trunk/server/src/main/java/com/metamatrix/platform/security/audit= /destination/ConsoleAuditDestination.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/platform/security/audit/desti= nation/ConsoleAuditDestination.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/server/src/main/java/com/metamatrix/platform/security/audit/desti= nation/ConsoleAuditDestination.java 2009-02-21 00:28:43 UTC (rev 479) @@ -39,9 +39,6 @@ /** * The name of the property that contains the name of the LogMessageFo= rmat * class that is used to format messages sent to the console. - * This is an optional property; if not specified then the - * {@link com.metamatrix.common.logging.format.DelimitedLogMessageForm= at DelimitedLogMessageFormat} - * is used. */ public static final String MESSAGE_FORMAT_PROPERTY_NAME =3D AuditDesti= nation.PROPERTY_PREFIX + "consoleFormat"; //$NON-NLS-1$ = Modified: trunk/server/src/main/java/com/metamatrix/platform/vm/controller/= VMController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/platform/vm/controller/VMCont= roller.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/server/src/main/java/com/metamatrix/platform/vm/controller/VMCont= roller.java 2009-02-21 00:28:43 UTC (rev 479) @@ -517,24 +517,18 @@ return; } = - // Create a thread that will actually kill the vm so that this met= hod can (the stub anyway) return. - Thread stopper =3D new Thread() { - + this.startServicePool.execute(new Runnable() { public void run() { // Wait before killing the VM. try { - sleep(force_shutdown_time * 1000); + Thread.sleep(force_shutdown_time * 1000); } catch (Exception e) {} - // And exit. System.exit(1); } - }; - - stopper.start(); + }); } = - private synchronized void stop(boolean now, boolean shutdown) { try { stopServices(now, shutdown); @@ -616,9 +610,11 @@ * Shut down all services without waiting for work to complete. * Essential services will also be shutdown. */ - public void shutdownNow() { + public synchronized void shutdownNow() { logMessage(PlatformPlugin.Util.getString(LogMessageKeys.VM_0041)); doStopVM(true, true); + this.shuttingDown =3D true; + notifyAll(); } = public void shutdownService(ServiceID serviceID) { @@ -687,7 +683,7 @@ public void ping() { } = - public boolean isShuttingDown() { + public synchronized boolean isShuttingDown() { return shuttingDown; } = Deleted: trunk/server/src/main/java/com/metamatrix/platform/vm/util/VMUtils= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/platform/vm/util/VMUtils.java= 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/server/src/main/java/com/metamatrix/platform/vm/util/VMUtils.java= 2009-02-21 00:28:43 UTC (rev 479) @@ -1,77 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.platform.vm.util; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.util.Properties; - -import com.metamatrix.common.config.CurrentConfiguration; -import com.metamatrix.common.config.api.exceptions.ConfigurationException; -import com.metamatrix.core.log.FileLimitSizeLogWriter; -import com.metamatrix.internal.core.log.PlatformLog; - -public class VMUtils { - - /** - * initializeVMLogFile is called by the different controllers (i.e., = SocketVMController, HostController, etc) - * to setup the log file using the LimitSize log file writer. - * @param fileName - * @throws Exception - * @since 4.2 - */ - public static void startLogFile(String path, String logFile) throws Con= figurationException, IOException{ - File tmpFile =3D new File(path, logFile); - tmpFile.getParentFile().mkdirs(); - = - // if log file exists then create a archive - if (tmpFile.exists()) { - int index =3D logFile.lastIndexOf("."); //$NON-NLS-1$ - String archiveName =3D FileLimitSizeLogWriter.buildArchiveFileN= ame(logFile.substring(0, index), logFile.substring(index)); - tmpFile.renameTo(new File(path, archiveName)); - } - = - FileOutputStream fos =3D new FileOutputStream(tmpFile); - PrintStream ps =3D new PrintStream(fos); - - System.setOut(ps); - System.setErr(ps); - - Properties logProps =3D new Properties(); - Properties configProps =3D CurrentConfiguration.getInstance().getPr= operties(); - if (configProps.containsKey(FileLimitSizeLogWriter.FILE_SIZE_LIMIT)= ) { - logProps.setProperty(FileLimitSizeLogWriter.FILE_SIZE_LIMIT,con= figProps.getProperty(FileLimitSizeLogWriter.FILE_SIZE_LIMIT)); - } - if (configProps.containsKey(FileLimitSizeLogWriter.FILE_SIZE_MONITO= R_TIME)) { - logProps.setProperty(FileLimitSizeLogWriter.FILE_SIZE_MONITOR_T= IME,configProps.getProperty(FileLimitSizeLogWriter.FILE_SIZE_MONITOR_TIME)); - } - - FileLimitSizeLogWriter flw =3D new FileLimitSizeLogWriter(tmpFile, = logProps, false); - - PlatformLog.getInstance().addListener(flw); - - } - = -} Modified: trunk/server/src/main/java/com/metamatrix/server/HostController.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/HostController.java 20= 09-02-20 21:08:28 UTC (rev 478) +++ trunk/server/src/main/java/com/metamatrix/server/HostController.java 20= 09-02-21 00:28:43 UTC (rev 479) @@ -49,9 +49,7 @@ import com.metamatrix.common.messaging.MessageBus; import com.metamatrix.common.util.LogCommonConstants; import com.metamatrix.common.util.VMNaming; -import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.util.FileUtils; -import com.metamatrix.core.util.StringUtil; import com.metamatrix.dqp.ResourceFinder; import com.metamatrix.platform.PlatformPlugin; import com.metamatrix.platform.registry.ClusteredRegistryState; @@ -60,7 +58,6 @@ import com.metamatrix.platform.registry.VMRegistryBinding; import com.metamatrix.platform.util.ErrorMessageKeys; import com.metamatrix.platform.util.LogMessageKeys; -import com.metamatrix.platform.vm.util.VMUtils; = @Singleton public class HostController implements HostManagement { @@ -95,7 +92,7 @@ // normal startup. StartupStateController.performSystemInitialization(true); = - startLogging(); + createTempDirectories(); = Runtime.getRuntime().addShutdownHook(new ShutdownThread()); = = @@ -149,13 +146,7 @@ return null; } = - private void startLogging() throws ConfigurationException, IOException= { - = - // setup the log file - String hostFileName =3D StringUtil.replaceAll(host.getFullName(), = ".", "_"); //$NON-NLS-1$ //$NON-NLS-2$ - = - VMUtils.startLogFile(host.getLogDirectory(), hostFileName + "_hc.l= og"); //$NON-NLS-1$ - = + private void createTempDirectories() throws ConfigurationException, IO= Exception { // If the java-i-tmp directory doesn't exist, it needs to be creat= ed // because extension jars class loading will fail because // java internals can' write to a non-existent directory. Modified: trunk/server/src/main/java/com/metamatrix/server/HostControllerGu= iceModule.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceMod= ule.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceMod= ule.java 2009-02-21 00:28:43 UTC (rev 479) @@ -33,8 +33,12 @@ import com.metamatrix.common.config.CurrentConfiguration; import com.metamatrix.common.config.api.Host; import com.metamatrix.common.config.api.exceptions.ConfigurationException; +import com.metamatrix.common.log.LogConfiguration; +import com.metamatrix.common.log.LogManager; import com.metamatrix.common.messaging.MessageBus; import com.metamatrix.common.messaging.VMMessageBus; +import com.metamatrix.core.log.LogListener; +import com.metamatrix.core.util.StringUtil; import com.metamatrix.platform.registry.ClusteredRegistryState; import com.metamatrix.platform.registry.HostMonitor; = @@ -70,6 +74,14 @@ bind(ClusteredRegistryState.class).in(Scopes.SINGLETON); bind(MessageBus.class).to(VMMessageBus.class).in(Scopes.SINGLETON); // V= M Message bus is in common-internal bind(HostMonitor.class).in(Scopes.SINGLETON); + = + bind(LogConfiguration.class).toProvider(LogConfigurationProvider.class).= in(Scopes.SINGLETON); = + = + String logFileName =3D StringUtil.replaceAll(host.getFullName(), "= .", "_")+"_hc.log"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + bind(LogListener.class).toProvider(new ServerLogListernerProvider(host.g= etLogDirectory(), logFileName, false)).in(Scopes.SINGLETON); = + + // this needs to be removed. + binder().requestStaticInjection(LogManager.class); = } = } Added: trunk/server/src/main/java/com/metamatrix/server/LogConfigurationPro= vider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/LogConfigurationProvid= er.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/server/LogConfigurationProvid= er.java 2009-02-21 00:28:43 UTC (rev 479) @@ -0,0 +1,116 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ +package com.metamatrix.server; + +import java.util.Arrays; +import java.util.Collection; +import java.util.EventObject; +import java.util.HashSet; +import java.util.Set; + +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; +import com.metamatrix.common.config.CurrentConfiguration; +import com.metamatrix.common.config.api.Configuration; +import com.metamatrix.common.config.api.exceptions.ConfigurationException; +import com.metamatrix.common.log.LogConfiguration; +import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.log.config.BasicLogConfiguration; +import com.metamatrix.common.log.config.LogConfigurationException; +import com.metamatrix.common.messaging.MessageBus; +import com.metamatrix.common.messaging.MessagingException; +import com.metamatrix.common.util.LogContextsUtil; +import com.metamatrix.core.MetaMatrixRuntimeException; +import com.metamatrix.core.event.EventObjectListener; +import com.metamatrix.core.util.StringUtil; +import com.metamatrix.platform.config.event.ConfigurationChangeEvent; + +(a)Singleton +class LogConfigurationProvider implements Provider { + + private static final String LOG_CONTEXT_PROPERTY_NAME =3D "metamatrix.log= .contexts"; //$NON-NLS-1$ = + private static final String LOG_LEVEL_PROPERTY_NAME =3D "metamatrix.log";= //$NON-NLS-1$ + = + @Inject + MessageBus messsgeBus; + + = + @Override + public LogConfiguration get() { + = + try { + final LogConfiguration orig =3D (LogConfiguration)CurrentConfi= guration.getInstance().getConfiguration().getLogConfiguration().clone(); + = + try { + this.messsgeBus.addListener(ConfigurationChangeEvent.class, new EventO= bjectListener() { + public void processEvent(EventObject obj) { + if(obj instanceof ConfigurationChangeEvent){ + try { + Configuration currentConfig =3D CurrentConfiguration.getInstance()= .getConfiguration(); + int level =3D Integer.parseInt(currentConfig.getProperty(LOG_LEVEL= _PROPERTY_NAME)); + String[] contexts =3D getContext(); + = + BasicLogConfiguration newConfig =3D new BasicLogConfiguration(Arra= ys.asList(contexts), level); + if (!newConfig.equals(LogManager.getLogConfigurationCopy())) { + LogManager.setLogConfiguration(newConfig); + } + } catch( ConfigurationException ce ) { + LogManager.logError(LogContextsUtil.CommonConstants.CTX_MESSAGE_BU= S, ce, ce.getMessage()); + } + } + } = + = + private String[] getContext() { + String[] result =3D null; + Collection discardedContexts =3D null; + String discardedContextsString =3D CurrentConfiguration.getInstance(= ).getProperties().getProperty(LOG_CONTEXT_PROPERTY_NAME); + if (discardedContextsString !=3D null){ + discardedContexts =3D StringUtil.split(discardedContextsString,",")= ; //$NON-NLS-1$ + } + + //get the Set of all contexts, remove the ones which are + //currently "discarded" + Set contextsSet =3D new HashSet(LogContextsUtil.ALL_CONTEXTS); + if (discardedContexts !=3D null){ + contextsSet.removeAll(discardedContexts); + } + result =3D new String[contextsSet.size()]; + result =3D (String[]) contextsSet.toArray(result); + return result; + } = + }); + } catch (MessagingException e) { + throw new MetaMatrixRuntimeException(e); + } + return orig; + + } catch ( ConfigurationException e ) { + try { + return BasicLogConfiguration.createLogConfiguration(System.ge= tProperties()); + } catch ( LogConfigurationException e1) { + throw new MetaMatrixRuntimeException(e1); + } + } = + = + } +} Property changes on: trunk/server/src/main/java/com/metamatrix/server/LogCo= nfigurationProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/server/src/main/java/com/metamatrix/server/Main.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/Main.java 2009-02-20 2= 1:08:28 UTC (rev 478) +++ trunk/server/src/main/java/com/metamatrix/server/Main.java 2009-02-21 0= 0:28:43 UTC (rev 479) @@ -23,7 +23,6 @@ package com.metamatrix.server; = import java.io.File; -import java.util.Properties; = import com.google.inject.Guice; import com.google.inject.Inject; @@ -32,23 +31,15 @@ import com.metamatrix.common.config.api.Host; import com.metamatrix.common.config.api.VMComponentDefn; import com.metamatrix.common.config.api.exceptions.ConfigurationException; -import com.metamatrix.common.log.DbLogListener; -import com.metamatrix.common.log.DbWriterException; -import com.metamatrix.common.log.LogManager; import com.metamatrix.common.messaging.MessageBus; -import com.metamatrix.common.util.LogCommonConstants; -import com.metamatrix.common.util.PropertiesUtils; +import com.metamatrix.common.messaging.MessagingException; import com.metamatrix.common.util.VMNaming; +import com.metamatrix.core.log.LogListener; import com.metamatrix.core.util.FileUtils; import com.metamatrix.core.util.StringUtil; import com.metamatrix.dqp.ResourceFinder; -import com.metamatrix.internal.core.log.PlatformLog; import com.metamatrix.platform.PlatformPlugin; -import com.metamatrix.platform.config.ConfigurationChangeListener; -import com.metamatrix.platform.config.event.ConfigurationChangeEvent; -import com.metamatrix.platform.util.LogMessageKeys; import com.metamatrix.platform.vm.api.controller.VMControllerInterface; -import com.metamatrix.platform.vm.util.VMUtils; = /** * This is main server starter class. @@ -61,6 +52,9 @@ @Inject VMControllerInterface vmController; = + @Inject + LogListener logListener; + = public static void main(String[] args) throws Exception{ = if (args.length < 2 || args.length > 4) { @@ -90,10 +84,7 @@ = // write info log writeInfoLog(host, vmName); - = - // Start the log file - VMUtils.startLogFile(host.getLogDirectory(), buildPrefix(host.getN= ame(), vmName) + ".log"); //$NON-NLS-1$ - = + = createTempDirectory(); = = // wire up guice modules @@ -116,23 +107,17 @@ private void launchServer() { = try { = - DbLogListener dbListener =3D startDbLogging(); - ConfigurationChangeListener configListener =3D new Configurati= onChangeListener(dbListener); - this.messageBus.addListener(ConfigurationChangeEvent.class, co= nfigListener); - = + Runtime.getRuntime().addShutdownHook(new ShutdownWork()); + = // start the VM this.vmController.startVM(); = - while(!this.vmController.isShuttingDown()) { - Thread.sleep(1000); - } + synchronized (this.vmController) { + while(!this.vmController.isShuttingDown()) { + this.vmController.wait(1000); + } + } = - configListener.shutdown(); - = - this.messageBus.shutdown(); - - // shutdown cache - ResourceFinder.getCacheFactory().destroy(); } catch (Exception e) { e.printStackTrace(); System.exit(1); @@ -159,25 +144,33 @@ String hostFileName =3D StringUtil.replaceAll(hostName, ".", "_"); //= $NON-NLS-1$ //$NON-NLS-2$ return hostFileName + "_" + vmName; //$NON-NLS-1$ } = - = - private static DbLogListener startDbLogging() throws Exception, DbWrit= erException { - Properties currentProps =3D CurrentConfiguration.getInstance().get= Properties(); - Properties resultsProps =3D PropertiesUtils.clone(currentProps, nu= ll, true, false); - = - // write a db log listener - DbLogListener dll =3D new DbLogListener(resultsProps); - = - // start the logger - PlatformLog.getInstance().addListener(dll); - LogManager.logInfo(LogCommonConstants.CTX_CONTROLLER, PlatformPlug= in.Util.getString(LogMessageKeys.VM_0052)); - = - return dll; - } - = = + private static void writeInfoLog(Host host, String vmName) { // trigger the logging of the current application info to a log fi= le for debugging = LogApplicationInfo logApplInfo =3D new LogApplicationInfo(host.get= FullName(), vmName, host.getLogDirectory(), buildPrefix(host.getFullName(),= vmName) + "_info.log"); //$NON-NLS-1$ logApplInfo.start(); = } + = + /** + * All work to be done during shutdown + */ + class ShutdownWork extends Thread { + + @Override + public void run() { + + try { + messageBus.shutdown(); + } catch (MessagingException e) { + e.printStackTrace(); + } + = + // shutdown cache + ResourceFinder.getCacheFactory().destroy(); + = + // shutdown logging + logListener.shutdown(); + } + } } Modified: trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModul= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java= 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java= 2009-02-21 00:28:43 UTC (rev 479) @@ -36,9 +36,13 @@ import com.metamatrix.common.config.api.exceptions.ConfigurationException; import com.metamatrix.common.id.dbid.DBIDGenerator; import com.metamatrix.common.id.dbid.DBIDGeneratorException; +import com.metamatrix.common.log.LogConfiguration; +import com.metamatrix.common.log.LogManager; import com.metamatrix.common.messaging.MessageBus; import com.metamatrix.common.messaging.VMMessageBus; import com.metamatrix.core.MetaMatrixRuntimeException; +import com.metamatrix.core.log.LogListener; +import com.metamatrix.core.util.StringUtil; import com.metamatrix.platform.registry.ClusteredRegistryState; import com.metamatrix.platform.registry.VMMonitor; import com.metamatrix.platform.service.proxy.ProxyManager; @@ -96,6 +100,18 @@ = // this needs to be removed. binder().requestStaticInjection(PlatformProxyHelper.class); + = + bind(LogConfiguration.class).toProvider(LogConfigurationProvider.class).= in(Scopes.SINGLETON); = + bind(LogListener.class).toProvider(ServerLogListernerProvider.class).in(= Scopes.SINGLETON); = + + // Start the log file + String logFileName =3D StringUtil.replaceAll(host.getFullName(), "= .", "_")+".log"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + bind(LogListener.class).toProvider(new ServerLogListernerProvider(host.g= etLogDirectory(), logFileName, true)).in(Scopes.SINGLETON); = + + = + // this needs to be removed. + binder().requestStaticInjection(LogManager.class); + = } = } Added: trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerP= rovider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProv= ider.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProv= ider.java 2009-02-21 00:28:43 UTC (rev 479) @@ -0,0 +1,149 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.server; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.PrintStream; +import java.util.EventObject; +import java.util.Properties; + +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; +import com.metamatrix.common.config.CurrentConfiguration; +import com.metamatrix.common.config.api.Configuration; +import com.metamatrix.common.config.api.exceptions.ConfigurationException; +import com.metamatrix.common.log.DbLogListener; +import com.metamatrix.common.log.LogManager; +import com.metamatrix.common.messaging.MessageBus; +import com.metamatrix.common.messaging.MessagingException; +import com.metamatrix.common.util.LogContextsUtil; +import com.metamatrix.common.util.PropertiesUtils; +import com.metamatrix.core.MetaMatrixRuntimeException; +import com.metamatrix.core.event.EventObjectListener; +import com.metamatrix.core.log.FileLimitSizeLogWriter; +import com.metamatrix.core.log.LogListener; +import com.metamatrix.internal.core.log.PlatformLog; +import com.metamatrix.platform.config.event.ConfigurationChangeEvent; + +(a)Singleton +class ServerLogListernerProvider implements Provider { + + String logFile; + String path; + boolean addDBLogger; + DbLogListener dbLogger; + = + @Inject + MessageBus messsgeBus; + = + public ServerLogListernerProvider(String path, String fileName, boolean a= ddDbLogger) { + this.path =3D path; + this.logFile =3D fileName; + this.addDBLogger =3D addDbLogger; + } + = + @Override + public LogListener get() { + = + final PlatformLog realLog =3D new PlatformLog(); + + try { + FileLimitSizeLogWriter flw =3D buildFileLogger(); = + realLog.addListener(flw); + = + } catch (FileNotFoundException e) { + throw new MetaMatrixRuntimeException(e); + } + = + if (this.addDBLogger) { + this.dbLogger =3D buildDBLogger(); + realLog.addListener(this.dbLogger); = + = + try { + = + this.messsgeBus.addListener(ConfigurationChangeEvent.class, new EventO= bjectListener() { + = + public void processEvent(EventObject obj) { + if(obj instanceof ConfigurationChangeEvent){ + if(obj instanceof ConfigurationChangeEvent){ + try { + Configuration currentConfig =3D CurrentConfiguration.getInstance(= ).getConfiguration(); + dbLogger.determineIfEnabled(currentConfig.getProperties()); + } catch( ConfigurationException ce ) { + LogManager.logError(LogContextsUtil.CommonConstants.CTX_MESSAGE_B= US, ce, ce.getMessage()); + } + } + } + } = + }); + = + } catch (MessagingException e) { + throw new MetaMatrixRuntimeException(e); + } = + } + return realLog; + } + + private DbLogListener buildDBLogger() { + Properties currentProps =3D CurrentConfiguration.getInstance().getProper= ties(); + Properties resultsProps =3D PropertiesUtils.clone(currentProps, null, tr= ue, false); + return new DbLogListener(resultsProps); + } + + private FileLimitSizeLogWriter buildFileLogger() + throws FileNotFoundException { + File tmpFile =3D new File(path, logFile); + tmpFile.getParentFile().mkdirs(); + + // if log file exists then create a archive + if (tmpFile.exists()) { + int index =3D logFile.lastIndexOf("."); //$NON-NLS-1$ + String archiveName =3D FileLimitSizeLogWriter.buildArchiveFileName(logF= ile.substring(0, index), logFile.substring(index)); + tmpFile.renameTo(new File(path, archiveName)); + } + + FileOutputStream fos =3D new FileOutputStream(tmpFile); + PrintStream ps =3D new PrintStream(fos); + + System.setOut(ps); + System.setErr(ps); + + Properties logProps =3D new Properties(); + Properties configProps =3D CurrentConfiguration.getInstance().getPropert= ies(); + if (configProps.containsKey(FileLimitSizeLogWriter.FILE_SIZE_LIMIT)) { + logProps.setProperty(FileLimitSizeLogWriter.FILE_SIZE_LIMIT,configProps= .getProperty(FileLimitSizeLogWriter.FILE_SIZE_LIMIT)); + } + if (configProps.containsKey(FileLimitSizeLogWriter.FILE_SIZE_MONITOR_TIM= E)) { + logProps.setProperty(FileLimitSizeLogWriter.FILE_SIZE_MONITOR_TIME,conf= igProps.getProperty(FileLimitSizeLogWriter.FILE_SIZE_MONITOR_TIME)); + } + + FileLimitSizeLogWriter flw =3D new FileLimitSizeLogWriter(tmpFile,logPro= ps, false); + return flw; + } + + = + = +} Property changes on: trunk/server/src/main/java/com/metamatrix/server/Serve= rLogListernerProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServer= MonitoringAdminImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonito= ringAdminImpl.java 2009-02-20 21:08:28 UTC (rev 478) +++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerMonito= ringAdminImpl.java 2009-02-21 00:28:43 UTC (rev 479) @@ -396,7 +396,7 @@ = MMRequest request =3D (MMRequest) results.iterator().next(); assertEquals(REQUEST_1_1, request.getIdentifier()); = - assertEquals(1, request.getSessionID()); + assertEquals("1", request.getSessionID()); //$NON-NLS-1$ assertEquals("1", request.getRequestID()); //$NON-NLS-1$ assertEquals("user1", request.getUserName()); //$NON-NLS-1$ = @@ -443,7 +443,7 @@ = MMSourceRequest request =3D (MMSourceRequest) results.iterator().n= ext(); assertEquals(REQUEST_1_1_1, request.getIdentifier()); = - assertEquals(1, request.getSessionID()); + assertEquals("1", request.getSessionID()); //$NON-NLS-1$ assertEquals(REQUEST_1_1, request.getRequestID()); = assertEquals("connectorBinding1", request.getConnectorBindingName(= )); //$NON-NLS-1$ assertEquals("user1", request.getUserName()); //$NON-NLS-1$ --===============7365512102065225182==-- From teiid-commits at lists.jboss.org Mon Feb 23 11:17:44 2009 Content-Type: multipart/mixed; boundary="===============4243715780004631457==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r480 - trunk/common-core/src/test/java/com/metamatrix/common/protocol. Date: Mon, 23 Feb 2009 11:17:44 -0500 Message-ID: --===============4243715780004631457== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-23 11:17:44 -0500 (Mon, 23 Feb 2009) New Revision: 480 Modified: trunk/common-core/src/test/java/com/metamatrix/common/protocol/TestMMFil= eURLHandler.java Log: TEIID-66 Modified: trunk/common-core/src/test/java/com/metamatrix/common/protocol/Te= stMMFileURLHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/protocol/TestMMFi= leURLHandler.java 2009-02-21 00:28:43 UTC (rev 479) +++ trunk/common-core/src/test/java/com/metamatrix/common/protocol/TestMMFi= leURLHandler.java 2009-02-23 16:17:44 UTC (rev 480) @@ -176,6 +176,46 @@ = foo.delete(); } + = + public void testSort() throws Exception { + String tmpDir =3D System.getProperty("java.io.tmpdir"); //$NON-NLS= -1$ + File f =3D new File(tmpDir+File.separator+"x"); //$NON-NLS-1$ + f.mkdirs(); + = + File a =3D new File(tmpDir+File.separator+"/x/a.txt"); //$NON-NLS-= 1$ + File z =3D new File(tmpDir+File.separator+"/x/z.txt"); //$NON-NLS-= 1$ + = + // Create File using the File + createFile(a); + createFile(z); + = + assertTrue(a.exists()); + assertTrue(z.exists()); + = + URL fooURL =3D URLHelper.buildURL(f.getAbsolutePath()+"/?action=3D= list&filter=3D.txt&sort=3Dalpha"); //$NON-NLS-1$ + assertTrue(fooURL.toString().startsWith("mmfile:")); //$NON-NLS-1$ + assertTrue(fooURL.toString().endsWith("?action=3Dlist&filter=3D.tx= t&sort=3Dalpha")); //$NON-NLS-1$ + = + ObjectInputStream in =3D new ObjectInputStream(fooURL.openStream()= ); + String[] list =3D (String[])in.readObject(); + in.close(); + = + String[] expected =3D {"a.txt", "z.txt"}; //$NON-NLS-1$ //$NON-NLS= -2$ + = + assertTrue(list[0].endsWith(expected[0])); + assertTrue(list[1].endsWith(expected[1])); + = + fooURL =3D URLHelper.buildURL(f.getAbsolutePath()+"/?action=3Dlist= &filter=3D.txt&sort=3Dreversealpha"); //$NON-NLS-1$ + in =3D new ObjectInputStream(fooURL.openStream()); + list =3D (String[])in.readObject(); + in.close(); + = + assertTrue(list[0].endsWith(expected[1])); + assertTrue(list[1].endsWith(expected[0])); + = + a.delete(); + z.delete(); + } = = public void testDelete() throws Exception { = --===============4243715780004631457==-- From teiid-commits at lists.jboss.org Mon Feb 23 12:43:20 2009 Content-Type: multipart/mixed; boundary="===============8929463875138425339==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r481 - in trunk: common-core/src/main/java/com/metamatrix/core/util and 51 other directories. Date: Mon, 23 Feb 2009 12:43:20 -0500 Message-ID: --===============8929463875138425339== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-23 12:43:19 -0500 (Mon, 23 Feb 2009) New Revision: 481 Added: trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicCo= nnector.java trunk/connector-api/src/main/java/com/metamatrix/connector/identity/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/AliasModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/BasicFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/BindValueVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/DropFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/EscapeSyntaxModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/FunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/SQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/SubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/TranslatedCommand.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/Translator.java Removed: trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicCo= nnector.java trunk/connector-api/src/main/java/com/metamatrix/connector/pool/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/ConnectionListener.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/ConnectionQueryStrategy.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/ConnectionStrategy.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/DefaultConnectionListener.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCSourceConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/BindValueVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/FunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/ResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/SQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/SQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/TranslatedCommand.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/ValueRetriever.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/impl/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mm/MMSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleResultsTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleUserIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/ssl/JDBCSequeLinkSingleIdentityConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/JDBCSingleIdentityDSConnectionFactory.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/JDBCXAConnector.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/TestConnectionQueryStrategy.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/userpool/MockExampleConnectionFactory.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialResultsTranslator.java trunk/server/src/main/java/com/metamatrix/server/connector/service/Conne= ctorServicePropertyNames.java Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUti= ls.java trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtil.java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/DEFRea= derWriter.java trunk/common-internal/src/main/resources/com/metamatrix/common/i18n.prop= erties trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connectio= n.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connector= Annotations.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Execution= Context.java trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicCo= nnection.java trunk/connector-api/src/main/java/com/metamatrix/connector/identity/Conn= ectorIdentity.java trunk/connector-api/src/main/java/com/metamatrix/connector/identity/Conn= ectorIdentityFactory.java trunk/connector-api/src/main/java/com/metamatrix/connector/identity/Pool= AwareConnection.java trunk/connector-api/src/main/java/com/metamatrix/connector/identity/Sing= leIdentity.java trunk/connector-api/src/main/java/com/metamatrix/connector/identity/Sing= leIdentityFactory.java trunk/connector-api/src/main/java/com/metamatrix/connector/identity/User= Identity.java trunk/connector-api/src/main/java/com/metamatrix/connector/identity/User= IdentityFactory.java trunk/connector-api/src/main/java/com/metamatrix/connector/internal/Conn= ectorPropertyNames.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCBaseExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCConnector.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCProcedureExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCPropertyNames.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCQueryExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCSourceConnection.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCUpdateExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/SimpleCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/access/AccessSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2ConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2SQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbySQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/informix/InformixSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/ConcatFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/DayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/ExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/LeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/LocateFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/Log10FunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/MonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/DatePartFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/SqlServerSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/ModFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/util/FunctionReplacementVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/JDBCSourceXAConnection.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/XAJDBCPropertyNames.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/TestJDBCSourceConnection.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/access/TestAccessSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/db2/TestDB2ConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/db2/TestDB2SqlTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/derby/TestDerbyConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/extension/impl/TestDropFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/extension/impl/TestEscapeSyntaxModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/mysql/TestMySQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestDayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestLeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestLocateFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestMonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestOracleConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestOracleTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestSubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/postgresql/TestPostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sqlserver/TestSqlServerConversionVisitor.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sybase/TestSybaseConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sybase/TestSybaseSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/userpool/TestPerUserPool.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/util/TestFunctionReplacementVisitor.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPConnection.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/Connector.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/connection/SalesforceConnection.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectConnection.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectConnector.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/SourceConnectionFactory.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/source/BaseSourceConnectionFactory.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embedd= edDataService.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorManager.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorWrapper.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Exec= utionContextImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector= /ConnectionPool.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector= /ConnectionWrapper.java trunk/engine/src/main/java/com/metamatrix/query/function/FunctionLibrary= .java trunk/engine/src/main/java/com/metamatrix/query/function/FunctionMethods= .java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Test= ConnectorManagerImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /FakeUserIdentityConnectionFactory.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /TestConnectionPool.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /TestConnectionWrapper.java trunk/server/src/main/java/com/metamatrix/server/connector/service/Conne= ctorService.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exten= sion/TestSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracl= e/TestOracleSQLConversionVisitor.java trunk/test-integration/src/test/resources/xml-vp/xmlvp.DEF Log: TEIID-164 TEIID-352 removing complexity from the JDBC connector. targettin= g a scenario where only the translator, connector, and the capabilities sho= uld need to be overriden. This is an intermediate check-in. Identity mana= gement for connectors will be merged with the base api. Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/Proper= tiesUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUt= ils.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUt= ils.java 2009-02-23 17:43:19 UTC (rev 481) @@ -29,6 +29,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -42,6 +43,7 @@ import com.metamatrix.core.CorePlugin; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.util.ArgCheck; +import com.metamatrix.core.util.StringUtil; = = /** @@ -938,4 +940,53 @@ = return bPass; } + + public static void setBeanProperties(Object bean, Properties props, St= ring prefix) { + // Move all prop names to lower case so we can use reflection to get + // method names and look them up in the connection props. + final Properties connProps =3D lowerCaseAllPropNames(props); + final Method[] methods =3D bean.getClass().getMethods(); + for (int i =3D 0; i < methods.length; i++) { + final Method method =3D methods[i]; + final String methodName =3D method.getName(); + // If setter ... + if ( methodName.startsWith("set") && method.getParameterTypes().l= ength =3D=3D 1 ) { //$NON-NLS-1$ + // Get the property name + final String propertyName =3D methodName.substring(3); // = remove the "set" + String shortName =3D propertyName.toLowerCase(); + String propertyValue =3D null; + if (prefix !=3D null) { + propertyValue =3D connProps.getProperty(prefix + "." + short= Name); + } else { + propertyValue =3D connProps.getProperty(shortName); + } + if (propertyValue =3D=3D null) { + continue; + } + final Class argType =3D method.getParameterTypes()[0]; + try { + final Object[] params =3D new Object[] {StringUtil.val= ueOf(propertyValue, argType)}; + method.invoke(bean, params); + } catch (Throwable e) { + throw new InvalidPropertyException(propertyName, property= Value, argType, e); + } + } + } + } + + private static Properties lowerCaseAllPropNames(final Properties connecti= onProps) { + final Properties lcProps =3D new Properties(); + final Iterator itr =3D connectionProps.keySet().iterator(); + while ( itr.hasNext() ) { + final String name =3D (String) itr.next(); + Object propValue =3D connectionProps.get(name); + if (propValue instanceof String) { + // we're only interested in prop values of type String + // here since we'll be looking for params to reflected methods + lcProps.setProperty(name.toLowerCase(), (String)propValue); + } // if + } + return lcProps; + } + } Modified: trunk/common-core/src/main/java/com/metamatrix/core/util/StringUt= il.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtil.jav= a 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/common-core/src/main/java/com/metamatrix/core/util/StringUtil.jav= a 2009-02-23 17:43:19 UTC (rev 481) @@ -983,7 +983,8 @@ * @param type * @return */ - public static T valueOf(String value, Class type){ + @SuppressWarnings("unchecked") + public static T valueOf(String value, Class type){ = if(type =3D=3D String.class) { return (T) value; @@ -992,7 +993,7 @@ return (T) Boolean.valueOf(value); } else if (type =3D=3D Integer.class || type =3D=3D Integer.TYPE) { - return (T) Integer.valueOf(value); + return (T) Integer.decode(value); } else if (type =3D=3D Float.class || type =3D=3D Float.TYPE) { return (T) Float.valueOf(value); @@ -1001,10 +1002,10 @@ return (T) Double.valueOf(value); } else if (type =3D=3D Long.class || type =3D=3D Long.TYPE) { - return (T) Long.valueOf(value); + return (T) Long.decode(value); } else if (type =3D=3D Short.class || type =3D=3D Short.TYPE) { - return (T) Short.valueOf(value); + return (T) Short.decode(value); } else if (type.isAssignableFrom(List.class)) { return (T)new ArrayList(Arrays.asList(value.split(","))); //= $NON-NLS-1$ Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api= /DEFReaderWriter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/DEFRe= aderWriter.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/DEFRe= aderWriter.java 2009-02-23 17:43:19 UTC (rev 481) @@ -37,6 +37,7 @@ import org.jdom.Element; import org.jdom.JDOMException; = +import com.metamatrix.common.CommonPlugin; import com.metamatrix.common.config.api.ComponentType; import com.metamatrix.common.config.api.ConnectorBinding; import com.metamatrix.common.config.util.InvalidConfigurationElementExcept= ion; @@ -79,7 +80,7 @@ loadConnectorBindings(vdbDefn, root); = } catch (JDOMException e) { - throw new IOException("VDBDefnXMLHelper.Unable_to_read_defn_fi= le");//$NON-NLS-1$ + throw new IOException(CommonPlugin.Util.getString("VDBDefnXMLH= elper.Unable_to_read_defn_file"));//$NON-NLS-1$ } = return vdbDefn; } Modified: trunk/common-internal/src/main/resources/com/metamatrix/common/i1= 8n.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/resources/com/metamatrix/common/i18n.pro= perties 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/common-internal/src/main/resources/com/metamatrix/common/i18n.pro= perties 2009-02-23 17:43:19 UTC (rev 481) @@ -3097,3 +3097,5 @@ = BasicApplication.Failed_while_installing_service_of_type__1=3DFailed while= installing service of type = +VDBDefnXMLHelper.Unable_to_read_defn_file=3DUnable to read DEF file. + Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Co= nnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecti= on.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecti= on.java 2009-02-23 17:43:19 UTC (rev 481) @@ -22,9 +22,9 @@ = package com.metamatrix.connector.api; = +import com.metamatrix.connector.identity.PoolAwareConnection; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.pool.PoolAwareConnection; = /** *

Represents a connection to this connector. A connection will be obt= ained Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Co= nnectorAnnotations.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rAnnotations.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rAnnotations.java 2009-02-23 17:43:19 UTC (rev 481) @@ -27,8 +27,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; = +import com.metamatrix.connector.identity.ConnectorIdentityFactory; import com.metamatrix.connector.internal.ConnectorPropertyNames; -import com.metamatrix.connector.pool.ConnectorIdentityFactory; = public class ConnectorAnnotations { = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Ex= ecutionContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Executio= nContext.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/Executio= nContext.java 2009-02-23 17:43:19 UTC (rev 481) @@ -24,9 +24,9 @@ = import java.io.Serializable; = -import com.metamatrix.connector.pool.ConnectorIdentity; -import com.metamatrix.connector.pool.ConnectorIdentityFactory; -import com.metamatrix.connector.pool.SingleIdentity; +import com.metamatrix.connector.identity.ConnectorIdentity; +import com.metamatrix.connector.identity.ConnectorIdentityFactory; +import com.metamatrix.connector.identity.SingleIdentity; = /** * The security context provides information about the user context in whi= ch Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/basic/= BasicConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnection.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnection.java 2009-02-23 17:43:19 UTC (rev 481) @@ -22,6 +22,7 @@ = package com.metamatrix.connector.basic; = +import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.Execution; @@ -29,12 +30,11 @@ import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.UpdateExecution; +import com.metamatrix.connector.identity.ConnectorIdentity; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.pool.ConnectorIdentity; -import com.metamatrix.connector.pool.PoolAwareConnection; = /** * Provides a default implementation of a {@link PoolAwareConnection} for = a Connector @@ -44,7 +44,7 @@ * {@link #createUpdateExecution(IProcedure, ExecutionContext, RuntimeMeta= data)} * as necessary. */ -public abstract class BasicConnection implements PoolAwareConnection { +public abstract class BasicConnection implements Connection { = @Override public Execution createExecution(ICommand command, @@ -70,26 +70,34 @@ public UpdateExecution createUpdateExecution(ICommand command, ExecutionC= ontext executionContext, RuntimeMetadata metadata) throws ConnectorExceptio= n { throw new ConnectorException("Unsupported Execution"); } - = + = @Override public boolean isAlive() { return true; } = @Override + public ConnectorCapabilities getCapabilities() { + return null; + } + = + /** + * Called by the pool to indicate that the connection was returned to = the pool. + * The actual close call will be made when the pool wants to purge thi= s connection. + */ = public void closeCalled() { = } = - @Override + /** + * Called by the pool when an existing connection is leased so that th= e underlying + * Connection may have it's identity switched to a different user. + * @param identity + * @throws ConnectorException + */ public void setConnectorIdentity(ConnectorIdentity context) throws ConnectorException { = } = - @Override - public ConnectorCapabilities getCapabilities() { - return null; - } - = } Deleted: trunk/connector-api/src/main/java/com/metamatrix/connector/basic/B= asicConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnector.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnector.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,29 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.basic; - -import com.metamatrix.connector.api.Connector; - -public abstract class BasicConnector implements Connector { - -} Added: trunk/connector-api/src/main/java/com/metamatrix/connector/basic/Bas= icConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnector.java (rev 0) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnector.java 2009-02-23 17:43:19 UTC (rev 481) @@ -0,0 +1,7 @@ +package com.metamatrix.connector.basic; + +import com.metamatrix.connector.api.Connector; + +public abstract class BasicConnector implements Connector { + +} Copied: trunk/connector-api/src/main/java/com/metamatrix/connector/identity= (from rev 475, trunk/connector-api/src/main/java/com/metamatrix/connector/= pool) Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/identi= ty/ConnectorIdentity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/Connect= orIdentity.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/identity/Con= nectorIdentity.java 2009-02-23 17:43:19 UTC (rev 481) @@ -22,7 +22,7 @@ = /* */ -package com.metamatrix.connector.pool; +package com.metamatrix.connector.identity; = = /** Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/identi= ty/ConnectorIdentityFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/Connect= orIdentityFactory.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/identity/Con= nectorIdentityFactory.java 2009-02-23 17:43:19 UTC (rev 481) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.pool; +package com.metamatrix.connector.identity; = import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/identi= ty/PoolAwareConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/PoolAwa= reConnection.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/identity/Poo= lAwareConnection.java 2009-02-23 17:43:19 UTC (rev 481) @@ -22,7 +22,7 @@ = /* */ -package com.metamatrix.connector.pool; +package com.metamatrix.connector.identity; = import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorException; Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/identi= ty/SingleIdentity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/SingleI= dentity.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/identity/Sin= gleIdentity.java 2009-02-23 17:43:19 UTC (rev 481) @@ -22,20 +22,15 @@ = /* */ -package com.metamatrix.connector.pool; +package com.metamatrix.connector.identity; = -import com.metamatrix.connector.api.ExecutionContext; = /** * This class represents a single ConnectorIdentity. All the connections a= re treated the same. */ public class SingleIdentity implements ConnectorIdentity { = - /** - * Construct with a context - * @param context The context - */ - public SingleIdentity(ExecutionContext context){ + public SingleIdentity(){ } = /** Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/identi= ty/SingleIdentityFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/SingleI= dentityFactory.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/identity/Sin= gleIdentityFactory.java 2009-02-23 17:43:19 UTC (rev 481) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.pool; +package com.metamatrix.connector.identity; = import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; @@ -30,7 +30,7 @@ @Override public ConnectorIdentity createIdentity(ExecutionContext context) throws ConnectorException { - return new SingleIdentity(context); + return new SingleIdentity(); } = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/identi= ty/UserIdentity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/UserIde= ntity.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/identity/Use= rIdentity.java 2009-02-23 17:43:19 UTC (rev 481) @@ -20,23 +20,26 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.pool; +package com.metamatrix.connector.identity; = -import com.metamatrix.connector.api.ExecutionContext; = /** - * This class represents a ConnectorIdentity based on user name. Connectio= ns are = - * pooled based on user name. + * This class represents a ConnectorIdentity keyed on a username with + * a mapped identity */ public class UserIdentity implements ConnectorIdentity { - private ExecutionContext context; + private String username; + private String mappedUser; + private String password; = /** * Construct with a security context * @param context The context */ - public UserIdentity(ExecutionContext context){ - this.context =3D context; + public UserIdentity(String username, String mappedUser, String passwor= d){ + this.username =3D username; + this.mappedUser =3D mappedUser; + this.password =3D password; } = = /** @@ -51,7 +54,7 @@ = if (obj instanceof UserIdentity) { UserIdentity that =3D (UserIdentity)obj; - return this.context.getUser().equals(that.context.getUser()); + return username.equals(that.username); } = return false; = @@ -61,10 +64,18 @@ * Get hash code, based on user name */ public int hashCode(){ - return context.getUser().hashCode(); + return username.hashCode(); } = = public String toString(){ - return "UserIdentity " + context.getUser(); //$NON-NLS-1$ + return "UserIdentity " + username; //$NON-NLS-1$ } = + = + public String getMappedUser() { + return mappedUser; + } + = + public String getPassword() { + return password; + } } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/identi= ty/UserIdentityFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/pool/UserIde= ntityFactory.java 2009-02-16 21:35:28 UTC (rev 475) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/identity/Use= rIdentityFactory.java 2009-02-23 17:43:19 UTC (rev 481) @@ -20,28 +20,57 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.pool; +package com.metamatrix.connector.identity; = import com.metamatrix.connector.DataPlugin; import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.connector.api.ExecutionContext; = /** - * Segregates connections by user. It is assumed that no single identity - * exists. - * = - * If multiple users use the same credentials, consider using a more speci= fic - * form of connector identity to prevent pool fragmentation. = + * Segregates connections by user determined by the CredentialMap. = */ public class UserIdentityFactory implements ConnectorIdentityFactory { = + private boolean useCredentialMap; + private boolean adminConnectionsAllowed =3D true; + private String connectorName; + = @Override public ConnectorIdentity createIdentity(ExecutionContext context) throws ConnectorException { if (context =3D=3D null) { + if (adminConnectionsAllowed) { + return new SingleIdentity(); + } throw new ConnectorException(DataPlugin.Util.getString("UserIdentityFac= tory.single_identity_not_supported")); //$NON-NLS-1$ } - return new UserIdentity(context); + Object payload =3D context.getTrustedPayload(); + if (!(payload instanceof CredentialMap)) { + if (useCredentialMap) { + throw new ConnectorException(DataPlugin.Util.getString("UserIdentityFa= ctory.single_identity_not_supported")); //$NON-NLS-1$ + } + return new SingleIdentity(); + } + CredentialMap credMap =3D (CredentialMap)payload; + String user =3D credMap.getUser(connectorName); + String password =3D credMap.getPassword(connectorName); + if (user =3D=3D null || password =3D=3D null) { + throw new ConnectorException("Payload missing credentials for " + conne= ctorName); //$NON-NLS-1$ + } + return new UserIdentity(context.getUser(), user, password); } = + public void setConnectorName(String connectorName) { + this.connectorName =3D connectorName; + } + = + public void setUseCredentialMap(boolean useCredentialMap) { + this.useCredentialMap =3D useCredentialMap; + } + = + public void setAdminConnectionsAllowed(boolean adminConnectionsAllowed) { + this.adminConnectionsAllowed =3D adminConnectionsAllowed; + } + = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/intern= al/ConnectorPropertyNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/internal/Con= nectorPropertyNames.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/internal/Con= nectorPropertyNames.java 2009-02-23 17:43:19 UTC (rev 481) @@ -81,42 +81,25 @@ public static final String CONNECTOR_ID =3D "ConnectorID"; //$NON-NLS-= 1$ = /** - * The environment property used as a flag to deregister the driver - */ - public static final String DEREGISTER_DRIVER =3D "deregisterDriver"; /= /$NON-NLS-1$ - = - /** - * The environment property used as a flag to deregister the driver by= ClassLoader - */ - public static final String DEREGISTER_BY_CLASSLOADER =3D "deregisterBy= ClassLoader"; //$NON-NLS-1$ - = - /** - * The environment property used as a flag to deregister the driver by= ClassName - */ - public static final String DEREGISTER_BY_CLASSNAME =3D "deregisterByCl= assName"; //$NON-NLS-1$ - = - /** - * The environment property used to identify a class loader to load co= nnector. - * The default class loader will be used if it is not defined. - * This is an optional property. - * @since 4.0 - */ - public static final String CONNECTOR_CLASS_LOADER =3D "ConnectorClassL= oader"; //$NON-NLS-1$ - - /** * The name of the VM where the connector is running on. * @since 4.0 */ public static final String CONNECTOR_VM_NAME =3D "ConnectorVMName"; //= $NON-NLS-1$ = - public static final String USE_RESULTSET_CACHE =3D "ResultSetCacheEnab= led"; //$NON-NLS-1$ - public static final String MAX_RESULTSET_CACHE_SIZE =3D "ResultSetCach= eMaxSize"; //$NON-NLS-1$ - public static final String MAX_RESULTSET_CACHE_AGE =3D "ResultSetCache= MaxAge"; //$NON-NLS-1$ - public static final String RESULTSET_CACHE_SCOPE =3D "ResultSetCacheSc= ope"; //$NON-NLS-1$ - /** * Indicates whether the connector represents a pooled resource. If i= t does, then * synchronous workers will be used. */ public static final String SYNCH_WORKERS =3D "SynchWorkers"; //$NON-NL= S-1$ + = + public static final String USING_CUSTOM_CLASSLOADER =3D "UsingCustomCl= assloader"; //$NON-NLS-1$ + = + public static final String CONNECTOR_CLASSPATH =3D "ConnectorClassPath= "; //$NON-NLS-1$ + = + public static final String IS_XA =3D "IsXA"; //$NON-NLS-1$ + = + public static final String USE_CREDENTIALS_MAPS =3D "UseCredentialMaps= "; //$NON-NLS-1$ + = + public static final String ADMIN_CONNECTIONS_ALLOWED =3D "AdminConnect= ionsAllowed"; //$NON-NLS-1$ + } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/ConnectionListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ConnectionListener.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ConnectionListener.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc; - -import java.sql.Connection; - -import com.metamatrix.connector.api.ConnectorEnvironment; - -/** - * Connection listner for the life cycle events for the connection = - */ -public interface ConnectionListener { - = - /** - * This call will be invoked right after the connection to the datasou= rce - * is open by the JDBCConnectionFactory. This will invoke= d every = - * connection in pool. - * @param connection - */ - void afterConnectionCreation(Connection connection, ConnectorEnvironme= nt env); - /** - * This call will be invoked just before the connection to the datasou= rce - * is relased to the connection pool or closed, which ever action take= n by - * the JDBCConnectionFactory = - * @param connection - */ = - void beforeConnectionClose(Connection connection, ConnectorEnvironment= env ); -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/ConnectionQueryStrategy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ConnectionQueryStrategy.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ConnectionQueryStrategy.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,66 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc; - -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; - -/** - * Connection strategy that tests a connection by running a test query. = - */ -public class ConnectionQueryStrategy implements ConnectionStrategy{ - private String connTestquery; - = - public ConnectionQueryStrategy(String query){ - this.connTestquery =3D query; - } = - = - /** - * @see com.metamatrix.connector.jdbc.ConnectionStrategy#isConnectionA= live() - */ - public boolean isConnectionAlive(Connection connection) { - Statement statement =3D null; - try { - if(connection.isClosed()){ - return false; - } = - statement =3D connection.createStatement(); - statement.executeQuery(connTestquery); - } catch(SQLException e) { - return false; - } finally { - if ( statement !=3D null ) { - try { - statement.close(); - statement=3Dnull; - } catch ( SQLException e ) { - } - } - } - return true; - } - = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/ConnectionStrategy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ConnectionStrategy.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ConnectionStrategy.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc; - -import java.sql.Connection; - -public interface ConnectionStrategy { - = - /** - * @return true if the connection is alive. false if the connection i= s closed or failed. = - */ - boolean isConnectionAlive(Connection connection); - = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/DefaultConnectionListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/DefaultConnectionListener.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/DefaultConnectionListener.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc; - -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.SQLException; - -import com.metamatrix.connector.api.ConnectorEnvironment; - -/** - * A default connection listener object, on a given connection factory. = - * @author Ramesh Reddy - */ -public class DefaultConnectionListener implements ConnectionListener { - // Since this going to used inside a pool, we would like to report on= ly once = - boolean alreadyReportedDetails =3D false; = - - /** - * defect request 13979 & 13978 - */ - public void afterConnectionCreation(Connection connection, ConnectorEn= vironment env) { - = - if (alreadyReportedDetails) { - return; = - } - = - alreadyReportedDetails =3D true; - // now dig some details about this driver/database for log. - try { - StringBuffer sb =3D new StringBuffer(); - DatabaseMetaData dbmd =3D connection.getMetaData(); - sb.append("Commit=3D").append(connection.getAutoCommit()); //$= NON-NLS-1$ - sb.append(";DatabaseProductName=3D").append(dbmd.getDatabasePr= oductName()); //$NON-NLS-1$ - sb.append(";DatabaseProductVersion=3D").append(dbmd.getDatabas= eProductVersion()); //$NON-NLS-1$ - sb.append(";DriverMajorVersion=3D").append(dbmd.getDriverMajor= Version()); //$NON-NLS-1$ - sb.append(";DriverMajorVersion=3D").append(dbmd.getDriverMinor= Version()); //$NON-NLS-1$ - sb.append(";DriverName=3D").append(dbmd.getDriverName()); //$N= ON-NLS-1$ - sb.append(";DriverVersion=3D").append(dbmd.getDriverVersion())= ; //$NON-NLS-1$ - sb.append(";IsolationLevel=3D").append(dbmd.getDefaultTransact= ionIsolation()); //$NON-NLS-1$ - = - env.getLogger().logInfo(sb.toString()); - } catch (SQLException e) { - String errorStr =3D JDBCPlugin.Util.getString("ConnectionListe= ner.failed_to_report_jdbc_connection_details"); //$NON-NLS-1$ = - env.getLogger().logInfo(errorStr); = - } - = - } - - /** - * defect request 13979 & 13978 - */ - public void beforeConnectionClose(Connection connection, ConnectorEnvi= ronment env) { - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCBaseExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCBaseExecution.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCBaseExecution.java 2009-02-23 17:43:19 UTC (rev 481) @@ -37,11 +37,10 @@ import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.jdbc.extension.ResultsTranslator; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.identity.ConnectorIdentity; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.pool.ConnectorIdentity; = /** */ @@ -53,8 +52,7 @@ = // Passed to constructor protected Connection connection; - protected SQLTranslator sqlTranslator; - protected ResultsTranslator resultsTranslator; + protected Translator sqlTranslator; protected ConnectorIdentity id; protected ConnectorLogger logger; protected ExecutionContext context; @@ -71,14 +69,12 @@ // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D = protected JDBCBaseExecution(Connection connection, - SQLTranslator sqlTranslator, - ResultsTranslator resultsTranslator, + Translator sqlTranslator, ConnectorLogger logger, Properties props, ExecutionContext context) { this.connection =3D connection; this.sqlTranslator =3D sqlTranslator; - this.resultsTranslator =3D resultsTranslator; this.logger =3D logger; this.context =3D context; = @@ -88,7 +84,7 @@ } = fetchSize =3D PropertiesUtils.getIntProperty(props, JDBCPropertyNa= mes.FETCH_SIZE, context.getBatchSize()); - int max =3D resultsTranslator.getMaxResultRows(); + int max =3D sqlTranslator.getMaxResultRows(); if (max > 0) { fetchSize =3D Math.min(fetchSize, max); } @@ -224,8 +220,8 @@ } = protected void setSizeContraints(Statement statement) throws SQLExcept= ion { - if (resultsTranslator.getMaxResultRows() > 0) { - statement.setMaxRows(resultsTranslator.getMaxResultRows()); + if (sqlTranslator.getMaxResultRows() > 0) { + statement.setMaxRows(sqlTranslator.getMaxResultRows()); } statement.setFetchSize(fetchSize); } @@ -270,7 +266,7 @@ return this.connection; } = - public SQLTranslator getSqlTranslator() { + public Translator getSqlTranslator() { return sqlTranslator; } = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCConnector.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCConnector.java 2009-02-23 17:43:19 UTC (rev 481) @@ -24,66 +24,119 @@ */ package com.metamatrix.connector.jdbc; = +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.sql.Driver; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Enumeration; +import java.util.Properties; + +import javax.sql.DataSource; +import javax.sql.XADataSource; + +import com.metamatrix.common.util.PropertiesUtils; +import com.metamatrix.connector.DataPlugin; import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; +import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.pool.ConnectorIdentity; -import com.metamatrix.connector.pool.ConnectorIdentityFactory; +import com.metamatrix.connector.identity.ConnectorIdentity; +import com.metamatrix.connector.identity.ConnectorIdentityFactory; +import com.metamatrix.connector.identity.SingleIdentity; +import com.metamatrix.connector.identity.UserIdentity; +import com.metamatrix.connector.internal.ConnectorPropertyNames; +import com.metamatrix.connector.jdbc.translator.Translator; +import com.metamatrix.connector.jdbc.xa.JDBCSourceXAConnection; +import com.metamatrix.connector.jdbc.xa.XAJDBCPropertyNames; +import com.metamatrix.connector.xa.api.TransactionContext; +import com.metamatrix.connector.xa.api.XAConnection; +import com.metamatrix.connector.xa.api.XAConnector; +import com.metamatrix.core.MetaMatrixCoreException; +import com.metamatrix.core.util.ReflectionHelper; = /** * JDBC implementation of Connector interface. */ @ConnectionPooling -public class JDBCConnector implements Connector, ConnectorIdentityFactory { - protected ConnectorEnvironment environment; +public class JDBCConnector implements XAConnector, ConnectorIdentityFactor= y { + = + public static final String INVALID_AUTHORIZATION_SPECIFICATION_NO_SUBC= LASS =3D "28000"; //$NON-NLS-1$ + + static final int NO_ISOLATION_LEVEL_SET =3D Integer.MIN_VALUE; + + enum TransactionIsolationLevel { + TRANSACTION_READ_UNCOMMITTED(java.sql.Connection.TRANSACTION_READ_= UNCOMMITTED), + TRANSACTION_READ_COMMITTED(java.sql.Connection.TRANSACTION_READ_CO= MMITTED), + TRANSACTION_REPEATABLE_READ(java.sql.Connection.TRANSACTION_REPEAT= ABLE_READ), + TRANSACTION_SERIALIZABLE(java.sql.Connection.TRANSACTION_SERIALIZA= BLE), + TRANSACTION_NONE(java.sql.Connection.TRANSACTION_NONE); + + private int connectionContant; + + private TransactionIsolationLevel(int connectionConstant) { + this.connectionContant =3D connectionConstant; + } + = + public int getConnectionConstant() { + return connectionContant; + } + } + = + protected ConnectorEnvironment environment; private ConnectorLogger logger; - private JDBCSourceConnectionFactory factory; private ConnectorCapabilities capabilities; + private Translator sqlTranslator; + private DataSource ds; + private XADataSource xaDs; + private int transIsoLevel =3D NO_ISOLATION_LEVEL_SET; = - static ConnectorCapabilities createCapabilities(ConnectorEnvironment envi= ronment, ClassLoader loader) + private boolean useCredentialMap; + private boolean adminConnectionsAllowed =3D true; + private String connectorName; + = + @Override + public ConnectorIdentity createIdentity(ExecutionContext context) throws ConnectorException { - //create Capabilities - String className =3D environment.getProperties().getProperty(JDBCP= ropertyNames.EXT_CAPABILITY_CLASS); = - if(className =3D=3D null){ - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnection.Property_{0}_is_required,_but_not_defined_1", JDBCPropertyNa= mes.EXT_CAPABILITY_CLASS)); //$NON-NLS-1$ - } - = - try { - Class capabilitiesClass =3D loader.loadClass(className); - ConnectorCapabilities result =3D (ConnectorCapabilities) capabilitiesCl= ass.newInstance(); - if(result instanceof JDBCCapabilities) { - String setCriteriaBatchSize =3D environment.getProperties().g= etProperty(JDBCPropertyNames.SET_CRITERIA_BATCH_SIZE); - if(setCriteriaBatchSize !=3D null) { - int maxInCriteriaSize =3D Integer.parseInt(setCriteriaBat= chSize); - if(maxInCriteriaSize > 0) { - ((JDBCCapabilities)result).setMaxInCriteriaSize(maxIn= CriteriaSize); - } - } = - } - return result; - } catch (Exception e) { - throw new ConnectorException(e); + if (context =3D=3D null) { + if (adminConnectionsAllowed) { + return new SingleIdentity(); + } + throw new ConnectorException(DataPlugin.Util.getString("UserIdentityFac= tory.single_identity_not_supported")); //$NON-NLS-1$ } + Object payload =3D context.getTrustedPayload(); + if (!(payload instanceof CredentialMap)) { + if (useCredentialMap) { + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCUserIdenti= tyConnectionFactory.Unable_to_get_credentials")); //$NON-NLS-1$ + } + return new SingleIdentity(); + } + CredentialMap credMap =3D (CredentialMap)payload; + String user =3D credMap.getUser(connectorName); + String password =3D credMap.getPassword(connectorName); + if (user =3D=3D null || password =3D=3D null) { + throw new ConnectorException("Payload missing credentials for " + conne= ctorName); //$NON-NLS-1$ + } + return new UserIdentity(context.getUser(), user, password); } - - public void stop() { = - cleanUp(); - = - logger.logInfo(JDBCPlugin.Util.getString("JDBCConnector.JDBCConnec= tor_stopped._3")); //$NON-NLS-1$ - } + = + public void setConnectorName(String connectorName) { + this.connectorName =3D connectorName; + } + = + public void setUseCredentialMap(boolean useCredentialMap) { + this.useCredentialMap =3D useCredentialMap; + } + = + public void setAdminConnectionsAllowed(boolean adminConnectionsAllowed) { + this.adminConnectionsAllowed =3D adminConnectionsAllowed; + } = - public void cleanUp() { - //Shutdown Factory - if(this.factory !=3D null) { - this.factory.shutdown(); - } - } - @Override public void start(ConnectorEnvironment environment) throws ConnectorException { @@ -93,42 +146,289 @@ logger.logInfo(JDBCPlugin.Util.getString("JDBCConnector.JDBCConnec= tor_initialized._1")); //$NON-NLS-1$ = capabilities =3D createCapabilities(environment, Thread.currentThr= ead().getContextClassLoader()); - String scfClassName =3D environment.getProperties().getProperty(JD= BCPropertyNames.EXT_CONNECTION_FACTORY_CLASS, "com.metamatrix.connector.jdb= c.JDBCSingleIdentityConnectionFactory"); //$NON-NLS-1$ = + Properties connectionProps =3D environment.getProperties(); + + // Get the JDBC properties ... + String dataSourceClassName =3D connectionProps.getProperty(JDBCPro= pertyNames.CONNECTION_SOURCE_CLASS); + = + // Verify required items + if (dataSourceClassName =3D=3D null || dataSourceClassName.trim().= length() =3D=3D 0) { + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Missing_JDBC_driver_class_name_1")); //$NON-NLS-1$ + } + dataSourceClassName =3D dataSourceClassName.trim(); + + String levelStr =3D connectionProps.getProperty(JDBCPropertyNames.= TRANSACTION_ISOLATION_LEVEL); + = + if(levelStr !=3D null && levelStr.trim().length() !=3D 0){ + transIsoLevel =3D TransactionIsolationLevel.valueOf(levelStr.toUp= perCase()).getConnectionConstant(); + } + = try { - //create source connection factory - Class scfClass =3D Thread.currentThread().getContextClassLoade= r().loadClass(scfClassName); - this.factory =3D (JDBCSourceConnectionFactory) scfClass.newIns= tance(); - factory.initialize(environment); - } catch (ClassNotFoundException e1) { - throw new ConnectorException(e1); - } catch (InstantiationException e2) { - throw new ConnectorException(e2); - } catch (IllegalAccessException e3) { - throw new ConnectorException(e3); - } catch (ConnectorException e5) { - this.cleanUp(); - throw e5; + String className =3D environment.getProperties().getProperty(J= DBCPropertyNames.EXT_TRANSLATOR_CLASS, Translator.class.getName()); = + this.sqlTranslator =3D (Translator)ReflectionHelper.create(cla= ssName, null, Thread.currentThread().getContextClassLoader()); + } catch (MetaMatrixCoreException e) { + throw new ConnectorException(e); } + sqlTranslator.initialize(environment); + = + if (this.adminConnectionsAllowed) { + testConnection(); + } = logger.logInfo(JDBCPlugin.Util.getString("JDBCConnector.JDBCConnec= tor_started._4")); //$NON-NLS-1$ } + = + private void testConnection() throws ConnectorException { + Connection connection =3D null; + try { + connection =3D getConnection(null); + } catch (ConnectorException e) { + SQLException ex =3D (SQLException)e.getCause(); + String sqlState =3D ex.getSQLState(); + if (sqlState !=3D null && INVALID_AUTHORIZATION_SPECIFICATION_= NO_SUBCLASS.equals(sqlState)) { + throw e; + } + this.logger.logError(e.getMessage(), e); + } finally { + if (connection !=3D null) { + connection.close(); + } + } + } + = + @Override + public void stop() { = + /* + * attempt to deregister drivers that may have been implicitly registered + * with the driver manager + */ + Enumeration drivers =3D DriverManager.getDrivers(); = - /* - * @see com.metamatrix.data.Connector#getConnection(com.metamatrix.dat= a.SecurityContext) - */ + String driverClassname =3D this.environment.getProperties().getPro= perty(JDBCPropertyNames.CONNECTION_SOURCE_CLASS); + boolean usingCustomClassLoader =3D PropertiesUtils.getBooleanPrope= rty(this.environment.getProperties(), ConnectorPropertyNames.USING_CUSTOM_C= LASSLOADER, false); + + while(drivers.hasMoreElements()){ + Driver tempdriver =3D (Driver)drivers.nextElement(); + if(tempdriver.getClass().getClassLoader() !=3D this.getClass()= .getClassLoader()) { + continue; + } + if(usingCustomClassLoader || tempdriver.getClass().getName().e= quals(driverClassname)) { + try { + DriverManager.deregisterDriver(tempdriver); + } catch (Throwable e) { + this.environment.getLogger().logError(e.getMessage()); + } + } + } + = + logger.logInfo(JDBCPlugin.Util.getString("JDBCConnector.JDBCConnec= tor_stopped._3")); //$NON-NLS-1$ + } + = + @Override public Connection getConnection(ExecutionContext context) throws Conne= ctorException { - return factory.getConnection(context); + DataSource dataSource =3D getDataSource(); + if (dataSource =3D=3D null) { + return getXAConnection(context, null); + } + java.sql.Connection conn =3D null; + try { = + if (context =3D=3D null || context.getConnectorIdentity() instanceof Si= ngleIdentity) { + conn =3D dataSource.getConnection(); + } else if (context.getConnectorIdentity() instanceof UserIdentity) { + UserIdentity id =3D (UserIdentity)context.getConnectorIdentity(); + conn =3D dataSource.getConnection(id.getMappedUser(), id.getPassword()= ); + } + setDefaultTransactionIsolationLevel(conn); + } catch (SQLException e) { + throw new ConnectorException(e); + } + return new JDBCSourceConnection(conn, this.environment, sqlTranslator); } + = + @Override + public XAConnection getXAConnection( + ExecutionContext context, + TransactionContext transactionContext) throws ConnectorException { + XADataSource xaDataSource =3D getXADataSource(); + if (xaDataSource =3D=3D null) { + throw new UnsupportedOperationException("Connector is not XA capable"); + } + javax.sql.XAConnection conn =3D null; + try { + if (context =3D=3D null || context.getConnectorIdentity() instanceof Si= ngleIdentity) { + conn =3D xaDataSource.getXAConnection(); + } else if (context.getConnectorIdentity() instanceof UserIdentity) { + UserIdentity id =3D (UserIdentity)context.getConnectorIdentity(); + conn =3D xaDataSource.getXAConnection(id.getMappedUser(), id.getPasswo= rd()); + } + java.sql.Connection c =3D conn.getConnection(); + setDefaultTransactionIsolationLevel(c); + return new JDBCSourceXAConnection(c, conn, this.environment, sqlTransla= tor); + } catch (SQLException e) { + throw new ConnectorException(e); + } + } = @Override public ConnectorCapabilities getCapabilities() { return capabilities; } = - @Override - public ConnectorIdentity createIdentity(ExecutionContext context) - throws ConnectorException { - return factory.createIdentity(context); + static ConnectorCapabilities createCapabilities(ConnectorEnvironment envi= ronment, ClassLoader loader) + throws ConnectorException { + //create Capabilities + String className =3D environment.getProperties().getProperty(JDBCPropert= yNames.EXT_CAPABILITY_CLASS, JDBCCapabilities.class.getName()); = + try { + ConnectorCapabilities result =3D (ConnectorCapabilities)ReflectionHe= lper.create(className, null, loader); + if(result instanceof JDBCCapabilities) { + String setCriteriaBatchSize =3D environment.getProperties().getP= roperty(JDBCPropertyNames.SET_CRITERIA_BATCH_SIZE); + if(setCriteriaBatchSize !=3D null) { + int maxInCriteriaSize =3D Integer.parseInt(setCriteriaBatchS= ize); + if(maxInCriteriaSize > 0) { + ((JDBCCapabilities)result).setMaxInCriteriaSize(maxInCri= teriaSize); + } + } = + } + return result; + } catch (Exception e) { + throw new ConnectorException(e); + } } + = + protected void createDataSources(String dataSourceClassName, final Pro= perties connectionProps) throws ConnectorException { + // create data source + Object temp =3D null; + try { + temp =3D ReflectionHelper.create(dataSourceClassName, null, Threa= d.currentThread().getContextClassLoader()); + } catch (MetaMatrixCoreException e) { + throw new ConnectorException(e,JDBCPlugin.Util.getString("JDBCSource= ConnectionFactory.Unable_to_load_the_JDBC_driver_class_6", dataSourceClassN= ame)); //$NON-NLS-1$ + } + + final String url =3D connectionProps.getProperty(JDBCPropertyNames= .URL); + if (url =3D=3D null || url.trim().length() =3D=3D 0) { + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Missing_JDBC_database_name_3")); //$NON-NLS-1$ + } + = + if (temp instanceof Driver) { + final Driver driver =3D (Driver)temp; + // check URL if there is one + validateURL(driver, url); + this.ds =3D (DataSource)Proxy.newProxyInstance(Thread.currentThread(= ).getContextClassLoader(), new Class[] {DataSource.class}, new InvocationHa= ndler() { + @Override + public Object invoke(Object proxy, Method method, + Object[] args) throws Throwable { + if (method.getName().equals("getConnection")) { + Properties p =3D new Properties(); + if (args.length =3D=3D 2) { + p.put("user", args[0]); + p.put("password", args[1]); + } else { + p.put("user", connectionProps.getProperty(JDBCPropertyNames.USER= NAME)); + p.put("password", connectionProps.getProperty(JDBCPropertyNames.= PASSWORD)); + } + return driver.connect(url, p); + } = + throw new UnsupportedOperationException("Driver DataSource proxy o= nly provides Connections"); + } + }); + } else { + parseURL(url, connectionProps); + if (temp instanceof DataSource) { + this.ds =3D (DataSource)temp; + PropertiesUtils.setBeanProperties(this.ds, connectionProps, n= ull); + } else if (temp instanceof XADataSource) { + this.xaDs =3D (XADataSource)temp; + PropertiesUtils.setBeanProperties(this.xaDs, connectionProps,= null); + } else { + throw new ConnectorException("Specified class is not a XADataSource= , DataSource, or Driver " + dataSourceClassName); + } + } = + if (this.ds instanceof XADataSource) { + this.xaDs =3D (XADataSource)this.ds; + } + } + = + public DataSource getDataSource() { + return ds; + } + = + public XADataSource getXADataSource() { + return xaDs; + } + = + private void validateURL(Driver driver, String url) throws ConnectorEx= ception { + boolean acceptsURL =3D false; + try { + acceptsURL =3D driver.acceptsURL(url); + } catch ( SQLException e ) { + throw new ConnectorException(e); + } + if(!acceptsURL ){ + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Driver__7", driver.getClass().getName(), url)); //$NO= N-NLS-1$ + } + } + = + /** + * Parse URL for DataSource connection properties and add to connectio= nProps. + * @param url + * @param connectionProps + * @throws ConnectorException = + */ + static void parseURL(final String url, final Properties connectionProp= s) throws ConnectorException { + // Will be: [jdbc:mmx:dbType://aHost:aPort], [DatabaseName=3DaData= Base], [CollectionID=3DaCollectionID], ... + final String[] urlParts =3D url.split(";"); //$NON-NLS-1$ + + // Will be: [jdbc:mmx:dbType:], [aHost:aPort] + final String[] protoHost =3D urlParts[0].split("//"); //$NON-NLS-1$ + + // Will be: [aHost], [aPort] + final String[] hostPort =3D protoHost[1].split(":"); //$NON-NLS-1$ + connectionProps.setProperty(XAJDBCPropertyNames.SERVER_NAME, (Stri= ng)hostPort[0]); + connectionProps.setProperty(XAJDBCPropertyNames.PORT_NUMBER, (Stri= ng)hostPort[1]); + + // For "databaseName", "SID", and all optional props + // (=3D;=3D;...) + for ( int i =3D 1; i < urlParts.length; i++ ) { + final String nameVal =3D (String) urlParts[i]; + // Will be: [propName], [propVal] + final String[] aProp =3D nameVal.split("=3D"); //$NON-NLS-1$ + if ( aProp.length > 1) { + // Set optional prop names lower case so that we can find + // set method names for them when we introspect the DataSo= urce + connectionProps.setProperty(aProp[0].toLowerCase(), aProp[= 1]); + } + } + = + String serverName =3D connectionProps.getProperty(XAJDBCPropertyNa= mes.SERVER_NAME); + String serverPort =3D connectionProps.getProperty(XAJDBCPropertyNa= mes.PORT_NUMBER); + if ( serverName =3D=3D null || serverName.trim().length() =3D=3D 0 ) { + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.MissingProp", //$NON-NLS-1$ + XAJDBCPropertyNames.SERVER_NAME)); + } + if ( serverPort =3D=3D null || serverPort.trim().length() =3D=3D 0= ) { + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.MissingProp", //$NON-NLS-1$ + XAJDBCPropertyNames.PORT_NUMBER)); + } + = + // Unique resource name for this connector + final StringBuffer dataSourceResourceName =3D new StringBuffer(con= nectionProps.getProperty(XAJDBCPropertyNames.DATASOURCE_NAME, "XADS")); //$= NON-NLS-1$ + dataSourceResourceName.append('_'); = + dataSourceResourceName.append(serverName); + dataSourceResourceName.append('_'); = + dataSourceResourceName.append(connectionProps.getProperty(Connecto= rPropertyNames.CONNECTOR_ID)); + connectionProps.setProperty( XAJDBCPropertyNames.DATASOURCE_NAME, = dataSourceResourceName.toString()); + } + = + public int getDefaultTransactionIsolationLevel() { + return this.transIsoLevel; + } + = + protected void setDefaultTransactionIsolationLevel(java.sql.Connection sq= lConn) + throws SQLException { + if(getDefaultTransactionIsolationLevel() !=3D NO_ISOLATION_LEVEL_SET && = getDefaultTransactionIsolationLevel() !=3D java.sql.Connection.TRANSACTION_= NONE){ + sqlConn.setTransactionIsolation(getDefaultTransactionIsolationLevel(= )); + } + } + = } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCProcedureExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCProcedureExecution.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCProcedureExecution.java 2009-02-23 17:43:19 UTC (rev 481) @@ -38,10 +38,8 @@ import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.jdbc.extension.ResultsTranslator; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; -import com.metamatrix.connector.jdbc.extension.ValueRetriever; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.jdbc.util.JDBCExecutionHelper; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IParameter; @@ -61,20 +59,18 @@ /** * @param connection * @param sqlTranslator - * @param resultsTranslator - * @param id * @param logger * @param props + * @param id */ public JDBCProcedureExecution(ICommand command, Connection connection, - SQLTranslator sqlTranslator, - ResultsTranslator resultsTranslator, + Translator sqlTranslator, ConnectorLogger logger, - Properties props, RuntimeMetadata metadata, - ExecutionContext context, + Properties props, + RuntimeMetadata metadata, ExecutionContext context, ConnectorEnvironment env) { - super(command, connection, sqlTranslator, resultsTranslator, logge= r, props, context, env); + super(command, connection, sqlTranslator, logger, props, context, = env); this.metadata =3D metadata; } = @@ -92,7 +88,7 @@ //create parameter index map parameterIndexMap =3D createParameterIndexMap(procedure.getPar= ameters(), sql); CallableStatement cstmt =3D getCallableStatement(sql); - results =3D resultsTranslator.executeStoredProcedure(cstmt, tr= anslatedComm); + results =3D sqlTranslator.executeStoredProcedure(cstmt, transl= atedComm); if (results !=3D null) { initResultSetInfo(); } @@ -191,12 +187,11 @@ throw new ConnectorException(JDBCPlugin.Util.getString("JDBCPr= ocedureExecution.Unexpected_exception_1")); //$NON-NLS-1$ } try { - ValueRetriever valueRetriver =3D this.resultsTranslator.getValueR= etriever(); - Object value =3D valueRetriver.retrieveValue((CallableStatement)t= his.statement, index.intValue(), parameter.getType(), calendar, env.getType= Facility()); + Object value =3D sqlTranslator.retrieveValue((CallableStatement)t= his.statement, index.intValue(), parameter.getType()); if(value =3D=3D null){ return null; } - Object result =3D JDBCExecutionHelper.convertValue(value, para= meter.getType(), this.resultsTranslator.getValueTranslators(), this.results= Translator.getTypeFacility(), trimString, context); + Object result =3D JDBCExecutionHelper.convertValue(value, para= meter.getType(), this.sqlTranslator.getValueTranslators(), this.sqlTranslat= or.getTypeFacility(), trimString, context); return result; } catch (SQLException e) { throw new ConnectorException(e); Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCPropertyNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCPropertyNames.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCPropertyNames.java 2009-02-23 17:43:19 UTC (rev 481) @@ -23,21 +23,13 @@ package com.metamatrix.connector.jdbc; = public class JDBCPropertyNames { - public static final String DRIVER_CLASS =3D "Driver"; //$NON-NLS-1$ + public static final String CONNECTION_SOURCE_CLASS =3D "Driver"; //$NO= N-NLS-1$ public static final String URL =3D "URL"; //$NON-NLS-1$ public static final String USERNAME =3D "User"; //$NON-NLS-1$ public static final String PASSWORD =3D "Password"; //$NON-NLS-1$ - public static final String MAX_SQL_LENGTH =3D "MaxSQLLength"; //$NON-N= LS-1$ = /** * This is the property name of the ConnectorService property that defi= nes - * what character, if any, will be used to wrap date type of criteria v= alues - * in SQL statements submitted to the data source. - */ - public static final String DATE_WRAP_CHAR =3D "DateWrapChar"; //$NON-N= LS-1$ - - /** - * This is the property name of the ConnectorService property that defi= nes * whether or not String type values in Criteria statements in SQL quer= ies to * the data source should have spaces trimmed from them. */ @@ -61,20 +53,6 @@ public static final String TRANSACTION_ISOLATION_LEVEL =3D "Transactio= nIsolationLevel"; //$NON-NLS-1$ = /** - * This property can be used to specify a limit on the size of Blobs,= in bytes, that = - * will be retrieved from a source. - * @since 3.0 = - */ - public static final String MAX_BLOB_BYTES =3D "MaxBlobBytes"; //$N= ON-NLS-1$ - - /** - * This property can be used to specify a limit on the size of Clobs,= in characters, that = - * will be retrieved from a source. - * @since 3.0 = - */ - public static final String MAX_CLOB_CHARS=3D "MaxClobChars"; //$NON-N= LS-1$ - - /** * This is the property name of the ConnectorService property that def= ines * the time zone of the source database. This property should only be= used in = * cases where the source database is in a different time zone than th= e = @@ -92,23 +70,11 @@ = /** * This property is used to specify the implementation of - * com.metamatrix.connector.jdbc.extension.SQLTranslator + * com.metamatrix.connector.jdbc.extension.Translator */ - public static final String EXT_SQL_TRANSLATOR_CLASS=3D "ExtensionSQLTr= anslationClass"; //$NON-NLS-1$ + public static final String EXT_TRANSLATOR_CLASS=3D "ExtensionTranslati= onClass"; //$NON-NLS-1$ = /** - * This property is used to specify the implementation of - * com.metamatrix.connector.jdbc.extension.ResultsTranslator. = - */ - public static final String EXT_RESULTS_TRANSLATOR_CLASS=3D "ExtensionR= esultsTranslationClass"; //$NON-NLS-1$ - - /** - * This property is used to specify the implementation of - * com.metamatrix.data.pool.SourceConnectionFactory - */ - public static final String EXT_CONNECTION_FACTORY_CLASS=3D "ExtensionC= onnectionFactoryClass"; //$NON-NLS-1$ - = - /** * This property can be used to specify the fetch size used from the c= onnector to * its underlying source. */ @@ -126,5 +92,10 @@ * This property is used to turn on/off the use of the default comment= s like * connection id and requestid in the source SQL query. */ - public static final String USE_COMMENTS_SOURCE_QUERY=3D "UseCommentsIn= SourceQuery"; //$NON-NLS-1$ + public static final String USE_COMMENTS_SOURCE_QUERY=3D "UseCommentsIn= SourceQuery"; //$NON-NLS-1$ = + = + public static final String CONNECTION_TEST_QUERY =3D "ConnectionTestQu= ery"; //$NON-NLS-1$ + = + public static final String IS_VALID_TIMEOUT =3D "IsValidTimeout"; //$N= ON-NLS-1$ + } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCQueryExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCQueryExecution.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCQueryExecution.java 2009-02-23 17:43:19 UTC (rev 481) @@ -32,10 +32,8 @@ import java.sql.SQLException; import java.sql.Types; import java.util.ArrayList; -import java.util.Calendar; import java.util.List; import java.util.Properties; -import java.util.TimeZone; = import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; @@ -45,9 +43,8 @@ import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.api.ValueTranslator; -import com.metamatrix.connector.jdbc.extension.ResultsTranslator; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.jdbc.util.JDBCExecutionHelper; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IQueryCommand; @@ -63,7 +60,6 @@ = protected ResultSet results; protected Class[] columnDataTypes; - protected Calendar calendar; protected ConnectorEnvironment env; protected ICommand command; private boolean[] transformKnown; @@ -76,22 +72,13 @@ // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D = public JDBCQueryExecution(ICommand command, Connection connection, - SQLTranslator sqlTranslator, - ResultsTranslator resultsTranslator, + Translator sqlTranslator, ConnectorLogger logger, Properties props, ExecutionContext context, ConnectorEnvironment env) { - super(connection, sqlTranslator, resultsTranslator, logger, props,= context); + super(connection, sqlTranslator, logger, props, context); this.command =3D command; - TimeZone dbmsTimeZone =3D resultsTranslator.getDatabaseTimezone(); - - if (dbmsTimeZone !=3D null) { - calendar =3D Calendar.getInstance(dbmsTimeZone); - } else { - calendar =3D Calendar.getInstance(); - } - = this.env =3D env; } = @@ -111,7 +98,7 @@ results =3D getStatement().executeQuery(sql); } else { PreparedStatement pstatement =3D getPreparedStatement(sql); - resultsTranslator.bindPreparedStatementValues(this.connect= ion, pstatement, translatedComm); + sqlTranslator.bindPreparedStatementValues(this.connection,= pstatement, translatedComm); results =3D pstatement.executeQuery(); } = addStatementWarnings(); @@ -154,13 +141,13 @@ = for (int i =3D 0; i < columnDataTypes.length; i++) { // Convert from 0-based to 1-based - Object value =3D resultsTranslator.getValueRetriever()= .retrieveValue(results, i+1, columnDataTypes[i], calendar, env.getTypeFacil= ity()); + Object value =3D sqlTranslator.retrieveValue(results, = i+1, columnDataTypes[i]); if(value !=3D null) { // Determine transformation if unknown if(! transformKnown[i]) { Class valueType =3D value.getClass(); if(!columnDataTypes[i].isAssignableFrom(valueT= ype)) { - transforms[i] =3D JDBCExecutionHelper.dete= rmineTransformation(valueType, columnDataTypes[i], resultsTranslator.getVal= ueTranslators(), resultsTranslator.getTypeFacility()); + transforms[i] =3D JDBCExecutionHelper.dete= rmineTransformation(valueType, columnDataTypes[i], sqlTranslator.getValueTr= anslators(), sqlTranslator.getTypeFacility()); } transformKnown[i] =3D true; } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/JDBCSingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSingleIdentityConnectionFactory.java 2009-02-23 16:17:44 UTC (rev = 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSingleIdentityConnectionFactory.java 2009-02-23 17:43:19 UTC (rev = 481) @@ -1,116 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc; - -import java.sql.Driver; -import java.sql.SQLException; -import java.util.Properties; - -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.pool.SingleIdentityFactory; - -/** - * Factory to create JDBCSourceConnection for SingleIdentity. - */ -public class JDBCSingleIdentityConnectionFactory extends JDBCSourceConnect= ionFactory { - public static final String INVALID_AUTHORIZATION_SPECIFICATION_NO_SUBC= LASS =3D "28000"; //$NON-NLS-1$ - private Driver driver; - private String url; - private int transIsoLevel; - private Properties userProps; - protected ConnectionListener connectionListener =3D new DefaultConnect= ionListener(); - private ConnectorLogger logger; - - public JDBCSingleIdentityConnectionFactory() { - super(new SingleIdentityFactory()); - } - = - public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { - super.initialize(env); - verifyConnectionProperties(env.getProperties()); - logger =3D env.getLogger(); - // attempt to get a connection to verify that properties are valid - testConnection(); - } - = - protected void verifyConnectionProperties(Properties connectionProps) = throws ConnectorException{ - // Find driver = - String driverClassName =3D connectionProps.getProperty(JDBCPropert= yNames.DRIVER_CLASS); - driver =3D createDriver(driverClassName); - - // check URL - url =3D connectionProps.getProperty(JDBCPropertyNames.URL); - validateURL(driver, url); - - // Build connection properties from user name and password - String username =3D connectionProps.getProperty(JDBCPropertyNames.= USERNAME); - String password =3D connectionProps.getProperty(JDBCPropertyNames.= PASSWORD); - userProps =3D new Properties(); - if (username !=3D null && username.trim().length() > 0) { - userProps.setProperty("user", username.trim()); //$NON-NLS-1$ - } - - if ( password !=3D null && password.trim().length() > 0 ) { - userProps.setProperty("password", password.trim()); //$NON-NLS= -1$ - } - = - transIsoLevel =3D interpretTransactionIsolationLevel( connectionPr= ops.getProperty(JDBCPropertyNames.TRANSACTION_ISOLATION_LEVEL)); = - } - = - private void testConnection() throws ConnectorException { - try { - Connection connection =3D getConnection(null); - connection.close(); - } catch (ConnectorException e) { - SQLException ex =3D (SQLException)e.getCause(); - String sqlState =3D ex.getSQLState(); - if (sqlState !=3D null && INVALID_AUTHORIZATION_SPECIFICATION_= NO_SUBCLASS.equals(sqlState)) { - throw e; - } - this.logger.logError(e.getMessage(), e); - } = - } - = - public Connection getConnection(ExecutionContext ctx) throws Connector= Exception { - return createJDBCConnection(driver, url, transIsoLevel, userProps); - } - - protected int getTransactionIsolation(){ - return this.transIsoLevel; - } - = - /** - * Connection Listener only used in the SingleIdentityConnections for = now. - * @see com.metamatrix.connector.jdbc.JDBCSourceConnectionFactory#getC= onnectionListener() - */ - protected ConnectionListener getConnectionListener() { - return connectionListener; - } - = -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCSourceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSourceConnection.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSourceConnection.java 2009-02-23 17:43:19 UTC (rev 481) @@ -24,7 +24,9 @@ */ package com.metamatrix.connector.jdbc; = +import java.sql.Connection; import java.sql.SQLException; +import java.sql.Statement; = import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; @@ -34,91 +36,91 @@ import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.UpdateExecution; import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.jdbc.extension.ResultsTranslator; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.pool.PoolAwareConnection; = /** * = */ -public class JDBCSourceConnection extends BasicConnection implements PoolA= wareConnection { +public class JDBCSourceConnection extends BasicConnection { protected java.sql.Connection physicalConnection; protected ConnectorEnvironment environment; private ConnectorLogger logger; - private ConnectionStrategy connectionStrategy; - private ConnectionListener connectionListener; - private SQLTranslator sqlTranslator; - private ResultsTranslator resultsTranslator; + private Translator sqlTranslator; = - /** - * @param connection - */ - public JDBCSourceConnection(java.sql.Connection connection, ConnectorE= nvironment environment, ConnectionStrategy connectionStrategy, ResultsTrans= lator resultsTranslator, SQLTranslator sqlTranslator) throws ConnectorExcep= tion{ - this(connection, environment, connectionStrategy, null, resultsTra= nslator, sqlTranslator); - } - = - public JDBCSourceConnection(java.sql.Connection connection, ConnectorE= nvironment environment, ConnectionStrategy connectionStrategy, ConnectionLi= stener connectionListener, ResultsTranslator resultsTranslator, SQLTranslat= or sqlTranslator) throws ConnectorException { - physicalConnection =3D connection; + public JDBCSourceConnection(java.sql.Connection connection, ConnectorE= nvironment environment, Translator sqlTranslator) throws ConnectorException= { + this.physicalConnection =3D connection; this.environment =3D environment; this.logger =3D environment.getLogger(); - this.connectionStrategy =3D connectionStrategy; - this.connectionListener =3D connectionListener; - = - - // notify the listner that coneection created - if (this.connectionListener !=3D null) { = - this.connectionListener.afterConnectionCreation(this.physicalC= onnection, this.environment); - } + this.sqlTranslator =3D sqlTranslator; + this.sqlTranslator.afterConnectionCreation(connection); } = @Override public ResultSetExecution createResultSetExecution(IQueryCommand comma= nd, ExecutionContext executionContext, RuntimeMetadata metadata) throws ConnectorException { - return new JDBCQueryExecution(command, this.physicalConnection, sqlTr= anslator, resultsTranslator, logger, this.environment.getProperties(), exec= utionContext, this.environment); + return new JDBCQueryExecution(command, this.physicalConnection, sqlTr= anslator, logger, this.environment.getProperties(), executionContext, this.= environment); } = @Override public ProcedureExecution createProcedureExecution(IProcedure command, ExecutionContext executionContext, RuntimeMetadata metadata) throws ConnectorException { - return new JDBCProcedureExecution(command, this.physicalConnection, s= qlTranslator, resultsTranslator, logger, this.environment.getProperties(), = metadata, executionContext, this.environment); + return new JDBCProcedureExecution(command, this.physicalConnection, s= qlTranslator, logger, this.environment.getProperties(), metadata, execution= Context, this.environment); } = @Override public UpdateExecution createUpdateExecution(ICommand command, ExecutionContext executionContext, RuntimeMetadata metadata) throws ConnectorException { - return new JDBCUpdateExecution(command, this.physicalConnection, sqlT= ranslator, resultsTranslator, logger, this.environment.getProperties(), exe= cutionContext); = + return new JDBCUpdateExecution(command, this.physicalConnection, sqlT= ranslator, logger, this.environment.getProperties(), executionContext); = } = @Override public void close() { - try { - // notify the listener that connection being destroyed - if (connectionListener !=3D null) { = - connectionListener.beforeConnectionClose(physicalConnectio= n, environment); - } + closeSourceConnection(); + } + + protected void closeSourceConnection() { + try { this.physicalConnection.close(); } catch(SQLException e) { logger.logDetail("Exception during close: " + e.getMessage()); } - } + } = @Override public boolean isAlive() { - if (connectionStrategy =3D=3D null) { - try { - return !this.physicalConnection.isClosed(); - } catch (SQLException e) { + Connection connection =3D this.physicalConnection; + Statement statement =3D null; + try { + int timeout =3D this.sqlTranslator.getIsValidTimeout(); + if (timeout >=3D 0) { + return connection.isValid(timeout); + } + if(connection.isClosed()){ return false; + } = + String connectionTestQuery =3D sqlTranslator.getConnectionTest= Query(); + if (connectionTestQuery !=3D null) { + statement =3D connection.createStatement(); + statement.executeQuery(connectionTestQuery); } + } catch(SQLException e) { + return false; + } finally { + if ( statement !=3D null ) { + try { + statement.close(); + } catch ( SQLException e ) { + } + } } - return connectionStrategy.isConnectionAlive(this.physicalConnectio= n); + return true; } = @Override Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/JDBCSourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSourceConnectionFactory.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCSourceConnectionFactory.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,230 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc; - -import java.sql.Connection; -import java.sql.Driver; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.util.Enumeration; -import java.util.Properties; - -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.internal.ConnectorPropertyNames; -import com.metamatrix.connector.jdbc.extension.ResultsTranslator; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.pool.ConnectorIdentity; -import com.metamatrix.connector.pool.ConnectorIdentityFactory; - -/** - * Represents a base class for a JDBC source connection factory. Subclass= es - * are expected to obtain the properties for their connection in different - * ways (either from connector properties, from security context, or from - * some lookup to an external source). = - */ -public abstract class JDBCSourceConnectionFactory implements ConnectorIden= tityFactory { - = - protected static final int NO_ISOLATION_LEVEL_SET =3D Integer.MIN_VALU= E; - = - private ConnectorEnvironment environment; - = - private String deregisterType; - = - private ConnectorIdentityFactory connectorIdentityFactory; - private SQLTranslator sqlTranslator; - private ResultsTranslator resultsTranslator; - = - /** - * - */ - public JDBCSourceConnectionFactory(ConnectorIdentityFactory connectorI= dentityFactory) { - this.connectorIdentityFactory =3D connectorIdentityFactory; - } - - public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { - this.environment =3D env; - Properties props =3D env.getProperties(); - this.deregisterType =3D props.getProperty(ConnectorPropertyNames.D= EREGISTER_DRIVER, ConnectorPropertyNames.DEREGISTER_BY_CLASSLOADER); - ClassLoader loader =3D Thread.currentThread().getContextClassLoade= r(); - - Properties connectorProps =3D environment.getProperties(); - //create SQLTranslator - String className =3D connectorProps.getProperty(JDBCPropertyNames.= EXT_SQL_TRANSLATOR_CLASS); = - if(className =3D=3D null){ - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnection.Property_{0}_is_required,_but_not_defined_1", JDBCPropertyNa= mes.EXT_SQL_TRANSLATOR_CLASS)); //$NON-NLS-1$ - } - try { - Class sqlTransClass =3D Thread.currentThread().getContextClassLoader().= loadClass(className); - sqlTranslator =3D (SQLTranslator) sqlTransClass.newInstance(); - sqlTranslator.initialize(environment); - = - //create ResultsTranslator - className =3D connectorProps.getProperty(JDBCPropertyNames.EXT_RE= SULTS_TRANSLATOR_CLASS); = - if(className =3D=3D null){ - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCS= ourceConnection.Property_{0}_is_required,_but_not_defined_1", JDBCPropertyN= ames.EXT_RESULTS_TRANSLATOR_CLASS)); //$NON-NLS-1$ - } - Class resultsTransClass =3D loader.loadClass(className); - resultsTranslator =3D (ResultsTranslator) resultsTransClass.newIn= stance(); - resultsTranslator.initialize(environment); - } catch (ClassNotFoundException e) { - throw new ConnectorException(e); - } catch (InstantiationException e) { - throw new ConnectorException(e); - } catch (IllegalAccessException e) { - throw new ConnectorException(e); - } - } - = - protected ConnectorEnvironment getConnectorEnvironment() { - return this.environment; - } - = - protected Driver createDriver(String driverClassName) throws Connector= Exception { - // Verify required items - if (driverClassName =3D=3D null || driverClassName.trim().length()= =3D=3D 0) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Missing_JDBC_driver_class_name_1")); //$NON-NLS-1$ - } - try { - Class clazz =3D Thread.currentThread().getContextClassLoader().lo= adClass(driverClassName); - return (Driver) clazz.newInstance(); - } catch(Exception e) { - throw new ConnectorException(e, JDBCPlugin.Util.getString("JDB= CSourceConnectionFactory.Unable_to_load_the_JDBC_driver_class_6", driverCla= ssName)); //$NON-NLS-1$ - } - } - = - protected void validateURL(Driver driver, String url) throws Connector= Exception { - if (url =3D=3D null || url.trim().length() =3D=3D 0) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Missing_JDBC_database_name_3")); //$NON-NLS-1$ - } - - boolean acceptsURL =3D false; - try { - acceptsURL =3D driver.acceptsURL(url); - } catch ( SQLException e ) { - throw new ConnectorException(e); - } - if(!acceptsURL ){ - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Driver__7", driver.getClass().getName(), url)); //$NO= N-NLS-1$ - } - } - = - /** - * This creates a JDBC connection. - * @throws ConnectorException if there is an error establishing the c= onnection. - */ - protected com.metamatrix.connector.api.Connection createJDBCConnection= (Driver driver, String url, int transactionIsolationLevel, Properties userP= rops) throws ConnectorException { - Connection connection =3D null; - - // Connect - try { - connection =3D driver.connect(url, userProps); - if(transactionIsolationLevel !=3D NO_ISOLATION_LEVEL_SET){ - connection.setTransactionIsolation(transactionIsolationLev= el); - } - } catch ( SQLException e ) { - throw new ConnectorException(e); - } - - return new JDBCSourceConnection(connection, this.environment, crea= teConnectionStrategy(), getConnectionListener(), resultsTranslator, sqlTran= slator); - } - - /** - * Subclass can override this method to provide an actual ConnectionLi= stener - */ - protected ConnectionListener getConnectionListener() { - return null; - } - = - /** - * Subclass can override this method to provide an actual ConnectionSt= rategy - */ - protected ConnectionStrategy createConnectionStrategy() { - return null; = - } - - protected int interpretTransactionIsolationLevel( String levelStr ) th= rows ConnectorException { - int isoLevel =3D NO_ISOLATION_LEVEL_SET; - if(levelStr =3D=3D null || levelStr.trim().length() =3D=3D 0){ - return isoLevel; - } - = - levelStr =3D levelStr.toUpperCase(); - - if (levelStr.equals("TRANSACTION_READ_UNCOMMITTED")) { //$NON-NLS-= 1$ - isoLevel =3D Connection.TRANSACTION_READ_UNCOMMITTED; - } else if (levelStr.equals("TRANSACTION_READ_COMMITTED")) {//$NON-= NLS-1$ - isoLevel =3D Connection.TRANSACTION_READ_COMMITTED; - } else if (levelStr.equals("TRANSACTION_REPEATABLE_READ")) {//$NON= -NLS-1$ - isoLevel =3D Connection.TRANSACTION_REPEATABLE_READ; - } else if (levelStr.equals("TRANSACTION_SERIALIZABLE")) {//$NON-NL= S-1$ - isoLevel =3D Connection.TRANSACTION_SERIALIZABLE; - } else if (levelStr.equals("TRANSACTION_NONE")) {//$NON-NLS-1$ - isoLevel =3D Connection.TRANSACTION_NONE; - } else { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.til", levelStr)); //$NON-NLS-1$ - } - return isoLevel; - } - = - public void shutdown() { - Enumeration drivers =3D DriverManager.getDrivers(); - //this is not correct the correct name for datasources, but we wil= l still do the deregister - String driverClassname =3D this.environment.getProperties().getPro= perty(JDBCPropertyNames.DRIVER_CLASS); - // De-Register Driver - while(drivers.hasMoreElements()){ - Driver tempdriver =3D (Driver)drivers.nextElement(); - if(tempdriver.getClass().getClassLoader() !=3D this.getClass()= .getClassLoader()) { - continue; - } - if(ConnectorPropertyNames.DEREGISTER_BY_CLASSLOADER.equals(thi= s.deregisterType) = - || tempdriver.getClass().getName().equals(driverClassname)) { - try { - DriverManager.deregisterDriver(tempdriver); - } catch (Throwable e) { - this.environment.getLogger().logError(e.getMessage()); - } - } - } - } - = - public abstract com.metamatrix.connector.api.Connection getConnection(= ExecutionContext context) throws ConnectorException; - = - @Override - public ConnectorIdentity createIdentity(ExecutionContext context) - throws ConnectorException { - return this.connectorIdentityFactory.createIdentity(context); - } - = - public ResultsTranslator getResultsTranslator() { - return resultsTranslator; - } - = - public SQLTranslator getSqlTranslator() { - return sqlTranslator; - } - = -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCUpdateExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCUpdateExecution.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCUpdateExecution.java 2009-02-23 17:43:19 UTC (rev 481) @@ -34,9 +34,8 @@ import com.metamatrix.connector.api.DataNotAvailableException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.jdbc.extension.ResultsTranslator; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.IBatchedUpdates; import com.metamatrix.connector.language.IBulkInsert; import com.metamatrix.connector.language.ICommand; @@ -52,18 +51,16 @@ /** * @param connection * @param sqlTranslator - * @param resultsTranslator - * @param id * @param logger * @param props + * @param id */ public JDBCUpdateExecution(ICommand command, Connection connection, - SQLTranslator sqlTranslator, - ResultsTranslator resultsTranslator, + Translator sqlTranslator, ConnectorLogger logger, Properties props, ExecutionContext context) { - super(connection, sqlTranslator, resultsTranslator, logger, props,= context); + super(connection, sqlTranslator, logger, props, context); this.command =3D command; } = @@ -119,7 +116,7 @@ } pstmt =3D getPreparedStatement(command.getSql()); } - resultsTranslator.bindPreparedStatementValues(this.con= nection, pstmt, command); + sqlTranslator.bindPreparedStatementValues(this.connect= ion, pstmt, command); pstmt.addBatch(); } else { if (previousCommand !=3D null && previousCommand.isPre= pared()) { @@ -174,7 +171,7 @@ connection.setAutoCommit(false); } PreparedStatement stmt =3D getPreparedStatement(sql); - updateCount =3D resultsTranslator.executeStatementForBulkInser= t(this.connection, stmt, translatedComm); + updateCount =3D sqlTranslator.executeStatementForBulkInsert(th= is.connection, stmt, translatedComm); addStatementWarnings(); succeeded =3D true; } catch (SQLException e) { @@ -217,7 +214,7 @@ updateCount =3D getStatement().executeUpdate(sql); } else { PreparedStatement pstatement =3D getPreparedStatement(sql); - resultsTranslator.bindPreparedStatementValues(this.connect= ion, pstatement, translatedComm); + sqlTranslator.bindPreparedStatementValues(this.connection,= pstatement, translatedComm); updateCount =3D pstatement.executeUpdate(); } = addStatementWarnings(); Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/JDBCUserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCUserIdentityConnectionFactory.java 2009-02-23 16:17:44 UTC (rev 48= 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCUserIdentityConnectionFactory.java 2009-02-23 17:43:19 UTC (rev 48= 1) @@ -1,116 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc; - -import java.sql.Driver; -import java.util.Properties; - -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.CredentialMap; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.pool.UserIdentityFactory; - -/** - */ -public class JDBCUserIdentityConnectionFactory extends JDBCSourceConnectio= nFactory { - - private Driver driver; - private String url; - private int transIsoLevel; - private String system; - - public JDBCUserIdentityConnectionFactory() { - super(new UserIdentityFactory()); - } - = - public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { - super.initialize(env); - system =3D getConnectorEnvironment().getConnectorName(); - verifyConnectionProperties(env.getProperties()); - } - - protected void verifyConnectionProperties(Properties connectionProps) = throws ConnectorException{ - // Find driver = - String driverClassName =3D connectionProps.getProperty(JDBCPropert= yNames.DRIVER_CLASS); - driver =3D createDriver(driverClassName); - = - // check URL if there is one - url =3D connectionProps.getProperty(JDBCPropertyNames.URL); - if(url !=3D null && url.trim().length() > 0) { - validateURL(driver, url); - } - = - // Get transaction isolation level - transIsoLevel =3D interpretTransactionIsolationLevel( connectionPr= ops.getProperty(JDBCPropertyNames.TRANSACTION_ISOLATION_LEVEL)); = - } - = - protected String getUrl() { - return this.url; - } - = - protected int getTransactionIsolationLevel() { - return this.transIsoLevel; - } - - public Connection getConnection(ExecutionContext context) throws Conne= ctorException { - String[] userProperties =3D getUserProperties(context); - = - Properties props =3D new Properties(); - props.put("user", userProperties[0]); //$NON-NLS-1$ - props.put("password", userProperties[1]); //$NON-NLS-1$ - return createJDBCConnection(this.driver, getUrl(), getTransactionI= solationLevel(), props); - } - = - protected String[] getUserProperties(ExecutionContext context) throws = ConnectorException { - = - // By default, assume the session token is a CredentialMap and pul= l out the user/password props - Object trustedPayload =3D context.getTrustedPayload(); = - = - if(trustedPayload instanceof CredentialMap) { - CredentialMap credentials =3D (CredentialMap)trustedPayload; - String user =3D credentials.getUser(system); - validatePropertyExists(user, CredentialMap.USER_KEYWORD); - = - String password =3D credentials.getPassword(system); - validatePropertyExists(password, CredentialMap.PASSWORD_KEYWORD);= = - = - return new String[] { user, password }; - } - - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCUserId= entityConnectionFactory.Unable_to_get_credentials")); //$NON-NLS-1$ - } = - - /** = - * @param property - * @throws ConnectorException - * @since 4.3 - */ - private void validatePropertyExists(String property, String propertyNa= me) throws ConnectorException { - if(property =3D=3D null) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCUs= erIdentityConnectionFactory.Connection_property_missing", propertyName, sys= tem)); //$NON-NLS-1$ - } - } - = -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/SimpleCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/SimpleCapabilities.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/SimpleCapabilities.java 2009-02-23 17:43:19 UTC (rev 481) @@ -344,13 +344,6 @@ return null; } = - /* - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsXATransa= ctions() - */ - public boolean supportsXATransactions() { - return false; - } - public boolean supportsInlineViews() { return false; } = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/access/AccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/access/AccessSQLTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/access/AccessSQLTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -24,10 +24,10 @@ */ package com.metamatrix.connector.jdbc.access; = -import com.metamatrix.connector.jdbc.extension.SQLTranslator; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ILimit; = -public class AccessSQLTranslator extends SQLTranslator { +public class AccessSQLTranslator extends Translator { = @Override public boolean hasTimeType() { Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/db2/DB2ConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2ConvertModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2ConvertModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -26,9 +26,9 @@ import java.util.List; = import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.*; import com.metamatrix.connector.language.ICompareCriteria.Operator; = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/db2/DB2SQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -31,8 +31,8 @@ import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.SourceSystemFunctions; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; +import com.metamatrix.connector.jdbc.translator.AliasModifier; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IJoin; import com.metamatrix.connector.language.ILimit; @@ -43,7 +43,7 @@ = /** */ -public class DB2SQLTranslator extends SQLTranslator { +public class DB2SQLTranslator extends Translator { = @Override public void initialize(ConnectorEnvironment env) throws ConnectorExceptio= n { @@ -80,7 +80,7 @@ } = @Override - public String getConnectionTestQuery() { + public String getDefaultConnectionTestQuery() { return "Select 'x' from sysibm.systables where 1 =3D 2"; //$NON-NLS-1$ } = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/derby/DerbyConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyConvertModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyConvertModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -26,9 +26,9 @@ import java.util.List; = import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.*; import com.metamatrix.connector.language.ICompareCriteria.Operator; = @@ -45,7 +45,7 @@ } = /** = - * @see com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModi= fier#translate(com.metamatrix.connector.language.IFunction) + * @see com.metamatrix.connector.jdbc.translator.BasicFunctionModifier= #translate(com.metamatrix.connector.language.IFunction) * @since 5.0 */ public List translate(IFunction function) { Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/derby/DerbySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbySQLTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbySQLTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -25,15 +25,15 @@ import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; -import com.metamatrix.connector.jdbc.extension.impl.EscapeSyntaxModifier; +import com.metamatrix.connector.jdbc.translator.AliasModifier; +import com.metamatrix.connector.jdbc.translator.EscapeSyntaxModifier; +import com.metamatrix.connector.jdbc.translator.Translator; = = /** = * @since 4.3 */ -public class DerbySQLTranslator extends SQLTranslator { +public class DerbySQLTranslator extends Translator { = @Override public void initialize(ConnectorEnvironment env) throws ConnectorExceptio= n { @@ -54,7 +54,7 @@ } = @Override - public String getConnectionTestQuery() { + public String getDefaultConnectionTestQuery() { return "Select 0 from sys.systables where 1 =3D 2"; //$NON-NLS-1$ } = Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/extension/BindValueVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/BindValueVisitor.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/BindValueVisitor.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,136 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.extension; - -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.IExistsCriteria; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.IInlineView; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.IScalarSubquery; -import com.metamatrix.connector.language.ISearchedCaseExpression; -import com.metamatrix.connector.language.ISetClause; -import com.metamatrix.connector.language.ISubqueryCompareCriteria; -import com.metamatrix.connector.visitor.framework.HierarchyVisitor; - -/** - * This visitor will mark literals in well known locations as bindValues. - * These values will be put in the generated SQL as ? = - * and have the corresponding value set on the PreparedStatement = - */ -final class BindValueVisitor extends HierarchyVisitor { - - private boolean replaceWithBinding =3D false; - - public void visit(IInlineView obj) { - replaceWithBinding =3D false; - visitNode(obj.getQuery()); - } - - public void visit(IScalarSubquery obj) { - replaceWithBinding =3D false; - super.visit(obj); - } - - public void visit(IExistsCriteria obj) { - replaceWithBinding =3D false; - super.visit(obj); - } - - public void visit(ISubqueryCompareCriteria obj) { - replaceWithBinding =3D false; - super.visit(obj); - } - - /** - * In general it is not appropriate to use bind values within a functi= on - * unless the particulars of the function parameters are know. = - * As needed, other visitors or modifiers can set the literals used wi= thin - * a particular function as bind variables. = - */ - public void visit(IFunction obj) { - replaceWithBinding =3D false; - super.visit(obj); - } - - public void visit(IInCriteria obj) { - replaceWithBinding =3D true; - visitNodes(obj.getRightExpressions()); - } - - public void visit(ILikeCriteria obj) { - replaceWithBinding =3D true; - visitNode(obj.getRightExpression()); - } - - /** - * Note that this will only visit the right expression. In general mo= st compares - * involving literals will be something like element =3D literal (this= is enforced as - * much as possible by the QueryRewriter). In rare circumstances, it = is possible to - * have literal =3D literal (most notably null <> null). Using bind v= ariables on - * both sides of the operator is not supported by most databases. - */ - public void visit(ICompareCriteria obj) { - replaceWithBinding =3D true; - visitNode(obj.getRightExpression()); - } - - /** - * Will look for bind values in the when criteria. - * The actual restriction for case statements seems to be that at leas= t one branch must - * not contain a bind variable. - */ - public void visit(ISearchedCaseExpression obj) { - for (int i =3D 0; i < obj.getWhenCount(); i++) { - visitNode(obj.getWhenCriteria(i)); - } - } - - @Override - public void visit(IInsert obj) { - replaceWithBinding =3D true; - visitNodes(obj.getValues()); - } - = - @Override - public void visit(ISetClause obj) { - replaceWithBinding =3D true; - visitNode(obj.getValue()); - } - - public void visit(ILiteral obj) { - if (replaceWithBinding || TranslatedCommand.isBindEligible(obj)) { - obj.setBindValue(true); - } - } - = - public void visitNode(ILanguageObject obj) { - boolean replacementMode =3D replaceWithBinding; - super.visitNode(obj); - this.replaceWithBinding =3D replacementMode; - } -} \ No newline at end of file Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/extension/FunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/FunctionModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/FunctionModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.extension; - -import java.util.List; - -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; - -/** - * Implementations of this interface are used to modify metamatrix functio= ns - * coming in to the connector into alternate datasource-specific language,= if - * necessary. = - */ -public interface FunctionModifier { - = - /** - * Takes an IFunction and returns the datasource-specific IExpression, - * or can possibly return the unmodified function parameter itself. = - * @param function - * @return IExpression or unmodified function - * @since 4.2 - */ - IExpression modify(IFunction function); - = - /** - * Return a List of translated parts (LanguageObjects and Strings), or= null - * if this FunctionModifier wishes to rely on the default translation = of the - * conversion visitor. = - * @param function IFunction to be translated - * @return List of translated parts, or null - * @since 4.2 - */ - List translate(IFunction function); -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/extension/ResultsTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/ResultsTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/ResultsTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,126 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.extension; - -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; -import java.util.TimeZone; - -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.ICommand; - -/** - * Specify database-specific behavior for translating results. - */ -public interface ResultsTranslator { - = - /** - * Initialize the results translator with the connector's environment,= which - * can be used to retrieve configuration parameters - * @param env The connector environment - * @throws ConnectorException If an error occurs during initialization - */ - void initialize(ConnectorEnvironment env) throws ConnectorException; = - - /** - * Get a list of ValueTranslator objects that specify database-specifi= c value - * translation logic. By default, the JDBC connector has a large set = of available - * translator. - * @return List of ValueTranslator - */ - List getValueTranslators(); - - /** - * Used to specify a special database-specific value retriever. By de= fault, the BasicValueRetriever - * will be used to retrieve objects from the ResultSet via the getObje= ct() method. = - * @return The specialized ValueRetriever - */ - ValueRetriever getValueRetriever(); = - = - /** - * Execute a stored procedure - this is often database-dependent. - * @param stmt The CallableStatement created by the connector - * @param command The translated command information - * @return The ResultSet returned by the stored procedure - * @throws SQLException If an error occurs during execution - */ - ResultSet executeStoredProcedure(CallableStatement stmt, TranslatedCom= mand command) throws SQLException ; - = - /** - * Populate the prepared statement. - * The prepared statement values will be set. - * @param conn - * @param stmt - * @param command - * @throws SQLException - */ - public void bindPreparedStatementValues(Connection conn, PreparedState= ment stmt, TranslatedCommand command) throws SQLException; - = - /** - * Execute the bulk insert statement. = - * @param conn The connection - * @param stmt The prepared statement with the query - * @param command The translated command, which contains the large obj= ects to prepare with - * @return Update count for the execution - * @throws SQLException If an error occurs during execution - */ - public int executeStatementForBulkInsert(Connection conn, PreparedStat= ement stmt, TranslatedCommand command) throws SQLException; = - = - /** - * Determine the time zone the database is located in. Typically, thi= s time zone is = - * the same as the local time zone, in which case, null should be retu= rned. - * @return Database time zone - */ - TimeZone getDatabaseTimezone(); - = - /** - * Allow an extension to modify any batch before it is returned to Met= aMatrix. This - * method can be used to apply row-level entitlements, modify data val= ues for particular - * users, etc. = - * @param batch The batch to return - * @param context The execution context for the query = - * @param command The modified command that was obtained from the tran= slation visitor provided by the SQLTranslator - * @return The batch to use instead - * @since 4.2 - */ - List modifyRow(List batch, ExecutionContext context, ICommand command)= ; = - = - /** - * Get the max result rows allowed - * = - * @return the max result rows - */ - int getMaxResultRows(); - = - = - TypeFacility getTypeFacility(); -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/extension/SQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/SQLConversionVisitor.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/SQLConversionVisitor.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,347 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.extension; - -import java.sql.Time; -import java.sql.Timestamp; -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.TimeZone; - -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.IBulkInsert; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.language.ISetQuery; -import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.language.ISetQuery.Operation; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.visitor.util.SQLStringVisitor; - -/** - * This visitor takes an ICommand and does DBMS-specific conversion on it - * to produce a SQL String. This class is expected to be subclassed. - * Specialized instances of this class can be gotten from a SQL Translator - * {@link SQLTranslator#getTranslationVisitor(RuntimeMetadata) using this = method}. - */ -public class SQLConversionVisitor extends SQLStringVisitor{ - - private static DecimalFormat DECIMAL_FORMAT =3D = - new DecimalFormat("#############################0.0###############= ##############"); //$NON-NLS-1$ = - private static double SCIENTIC_LOW =3D Math.pow(10, -3); - private static double SCIENTIC_HIGH =3D Math.pow(10, 7); - = - private Map modifiers; - private ExecutionContext context; - private SQLTranslator translator; - private Calendar cal; - - private boolean prepared; - = - private List preparedValues =3D new ArrayList(); - private List preparedTypes =3D new ArrayList(); - = - public SQLConversionVisitor(SQLTranslator translator) { - this.translator =3D translator; - this.prepared =3D translator.usePreparedStatements(); - this.modifiers =3D translator.getFunctionModifiers(); - TimeZone tz =3D translator.getDatabaseTimeZone(); - if (tz !=3D null) { - this.cal =3D Calendar.getInstance(tz); - } - } - - public void visit(IBulkInsert obj) { - this.prepared =3D true; - - super.visit(obj); - = - for (int i =3D 0; i < obj.getElements().size(); i++) { - IElement element =3D (IElement) obj.getElements().get(i); - this.preparedTypes.add(element.getType()); - } - - this.preparedValues =3D obj.getRows(); - } = - = - /** - * @param type - * @param object - * @param valuesbuffer - */ - private void translateSQLType(Class type, Object obj, StringBuffer val= uesbuffer) { - if (obj =3D=3D null) { - valuesbuffer.append(NULL); - } else { - if(Number.class.isAssignableFrom(type)) { - boolean useFormatting =3D false; - = - if (Double.class.isAssignableFrom(type)){ - double value =3D ((Double)obj).doubleValue(); - useFormatting =3D (value <=3D SCIENTIC_LOW || value >= =3D SCIENTIC_HIGH); = - } - else if (Float.class.isAssignableFrom(type)){ - float value =3D ((Float)obj).floatValue(); - useFormatting =3D (value <=3D SCIENTIC_LOW || value >= =3D SCIENTIC_HIGH); - } - // The formatting is to avoid the so-called "scientic-nota= tion" - // where toString will use for numbers greater than 10p7 a= nd - // less than 10p-3, where database may not understand. - if (useFormatting) { - synchronized (DECIMAL_FORMAT) { - valuesbuffer.append(DECIMAL_FORMAT.format(obj)); - } - } - else { - valuesbuffer.append(obj); - } - } else if(type.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { - valuesbuffer.append(translator.translateLiteralBoolean((Bo= olean)obj)); - } else if(type.equals(TypeFacility.RUNTIME_TYPES.TIMESTAMP)) { - valuesbuffer.append(translator.translateLiteralTimestamp((= Timestamp)obj, cal)); - } else if(type.equals(TypeFacility.RUNTIME_TYPES.TIME)) { - valuesbuffer.append(translator.translateLiteralTime((Time)= obj, cal)); - } else if(type.equals(TypeFacility.RUNTIME_TYPES.DATE)) { - valuesbuffer.append(translator.translateLiteralDate((java.= sql.Date)obj, cal)); - } else { - // If obj is string, toSting() will not create a new Strin= g = - // object, it returns it self, so new object creation. = - valuesbuffer.append("'") //$NON-NLS-1$ - .append(escapeString(obj.toString())) - .append("'"); //$NON-NLS-1$ - } - } = - } - - /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IProcedure) - */ - public void visit(IProcedure obj) { - this.prepared =3D true; - /* - * preparedValues is now a list of procedure params instead of jus= t values - */ - this.preparedValues =3D obj.getParameters(); - super.buffer.append(generateSqlForStoredProcedure(obj)); - } - - /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IFunction) - */ - public void visit(IFunction obj) { - if(this.modifiers !=3D null) { - FunctionModifier functionModifier =3D (FunctionModifier)this.m= odifiers.get(obj.getName().toLowerCase()); - if(functionModifier !=3D null) { - List parts =3D functionModifier.translate(obj); - = - // null means the FunctionModifier will rely on default tr= anslation - if (parts !=3D null) { - Iterator iter =3D parts.iterator(); - while(iter.hasNext()) { - Object part =3D iter.next(); - if(part instanceof String) { - buffer.append(part); - } else { - append((ILanguageObject)part); - } - } - return; - } = - } = - } = - super.visit(obj); - } - - /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.ILiteral) - */ - public void visit(ILiteral obj) { - if (this.prepared && obj.isBindValue()) { - buffer.append(UNDEFINED_PARAM); - preparedValues.add(obj.getValue()); - preparedTypes.add(obj.getType()); - } else { - translateSQLType(obj.getType(), obj.getValue(), buffer); - } - } - - /** - * Set the per-command execution context on this visitor. = - * @param context ExecutionContext - * @since 4.3 - */ - public void setExecutionContext(ExecutionContext context) { - this.context =3D context; - } - = - /** - * Retrieve the per-command execution context for this visitor = - * (intended for subclasses to use). - * @return - * @since 4.3 - */ - protected ExecutionContext getExecutionContext() { - return this.context; - } - - protected String getSourceComment(ICommand command) { - return this.translator.getSourceComment(this.context, command); - } - = - /** - * This is a generic implementation. Subclass should override this met= hod - * if necessary. - * @param exec The command for the stored procedure. - * @return String to be executed by CallableStatement. - */ - protected String generateSqlForStoredProcedure(IProcedure exec) { - StringBuffer prepareCallBuffer =3D new StringBuffer(); - prepareCallBuffer.append("{ "); //$NON-NLS-1$ - - List params =3D exec.getParameters(); - - //check whether a "?" is needed if there are returns - boolean needQuestionMark =3D false; - Iterator iter =3D params.iterator(); - while(iter.hasNext()){ - IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() =3D=3D Direction.RETURN){ - needQuestionMark =3D true; - break; - } - } - = - prepareCallBuffer.append(getSourceComment(exec)); - = - if(needQuestionMark){ - prepareCallBuffer.append("?=3D"); //$NON-NLS-1$ - } - - prepareCallBuffer.append(" call ");//$NON-NLS-1$ - prepareCallBuffer.append(exec.getMetadataID() !=3D null ? getName(= exec.getMetadataID()) : exec.getProcedureName()); - prepareCallBuffer.append("("); //$NON-NLS-1$ - - int numberOfParameters =3D 0; - iter =3D params.iterator(); - while(iter.hasNext()){ - IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() =3D=3D Direction.IN || param.getDirect= ion() =3D=3D Direction.OUT || param.getDirection() =3D=3D Direction.INOUT){ - if(numberOfParameters > 0){ - prepareCallBuffer.append(","); //$NON-NLS-1$ - } - prepareCallBuffer.append("?"); //$NON-NLS-1$ - numberOfParameters++; - } - } - prepareCallBuffer.append(")"); //$NON-NLS-1$ - prepareCallBuffer.append("}"); //$NON-NLS-1$ - return prepareCallBuffer.toString(); - } - = - /** = - * @return the preparedValues - */ - List getPreparedValues() { - return this.preparedValues; - } - = - /** = - * @return the preparedValues - */ - List getPreparedTypes() { - return this.preparedTypes; - } - = - public boolean isPrepared() { - return prepared; - } - = - public void setPrepared(boolean prepared) { - this.prepared =3D prepared; - } - = - @Override - protected boolean useAsInGroupAlias() { - return this.translator.useAsInGroupAlias(); - } - = - @Override - public void visit(IQuery obj) { - if (obj.getLimit() !=3D null) { - handleLimit(obj); - } else { - super.visit(obj); - } - } - = - @Override - public void visit(ISetQuery obj) { - if (obj.getLimit() !=3D null) { - handleLimit(obj); - } else { - super.visit(obj); - } - } - = - @Override - protected boolean useParensForSetQueries() { - return translator.useParensForSetQueries(); - } - = - private void handleLimit(IQueryCommand obj) { - ILimit limit =3D obj.getLimit(); - obj.setLimit(null); - StringBuffer current =3D this.buffer; - this.buffer =3D new StringBuffer(); - append(obj); - current.append(this.translator.addLimitString(this.buffer.toString(),= limit)); - this.buffer =3D current; - obj.setLimit(limit); - } - = - @Override - protected String replaceElementName(String group, String element) { - return translator.replaceElementName(group, element); - } - = - @Override - protected void appendSetOperation(Operation operation) { - buffer.append(translator.getSetOperationString(operation)); - } - = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/extension/SQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/SQLTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/SQLTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,248 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.extension; - -import java.sql.Time; -import java.sql.Timestamp; -import java.text.MessageFormat; -import java.util.Calendar; -import java.util.HashMap; -import java.util.Map; -import java.util.TimeZone; - -import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.jdbc.JDBCPropertyNames; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ISetQuery; - -/** - * Base class for creating source SQL queries and retrieving results. - * Specific databases should override as necessary. - */ -public class SQLTranslator { - - private static final MessageFormat COMMENT =3D new MessageFormat("/*te= iid sessionid:{0}, requestid:{1}.{2}*/ "); //$NON-NLS-1$ - - public final static TimeZone DEFAULT_TIME_ZONE =3D TimeZone.getDefault= (); - - private Map functionModifiers =3D new HashMap(); - private TimeZone databaseTimeZone; - private ConnectorEnvironment environment; - = - private boolean useComments; - private boolean usePreparedStatements; - = - /** - * Initialize the SQLTranslator. - * @param env - * @param metadata - * @throws ConnectorException - */ - public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { - this.environment =3D env; - - String timeZone =3D env.getProperties().getProperty(JDBCPropertyNa= mes.DATABASE_TIME_ZONE); - if(timeZone !=3D null && timeZone.trim().length() > 0) { - TimeZone tz =3D TimeZone.getTimeZone(timeZone); - // Check that the dbms time zone is really different than the = local time zone - if(!DEFAULT_TIME_ZONE.hasSameRules(tz)) { - this.databaseTimeZone =3D tz; = - } = - } = - = - this.useComments =3D PropertiesUtils.getBooleanProperty(env.getPro= perties(), JDBCPropertyNames.USE_COMMENTS_SOURCE_QUERY, false); - this.usePreparedStatements =3D PropertiesUtils.getBooleanProperty(= env.getProperties(), JDBCPropertyNames.USE_BIND_VARIABLES, false); - } - = - public TimeZone getDatabaseTimeZone() { - return databaseTimeZone; - } - = - public ConnectorEnvironment getEnvironment() { - return environment; - } - = - public ILanguageFactory getLanguageFactory() { - return environment.getLanguageFactory(); - } - = - /** - * Modify the command. - * @param command - * @param context - * @return - */ - public ICommand modifyCommand(ICommand command, ExecutionContext conte= xt) throws ConnectorException { - return command; - } - = - /** - * Return a map of function name in lower case to FunctionModifier. - * @return Map of function name to FunctionModifier. - */ - public Map getFunctionModifiers() { - return functionModifiers; - } - = - public void registerFunctionModifier(String name, FunctionModifier mod= ifier) { - this.functionModifiers.put(name, modifier); - } - = - /** - * Subclasses should override this method to provide a different sql t= ranslation - * of the literal boolean value. By default, a boolean literal is rep= resented as: - * '0' or '1'. - * @param booleanValue Boolean value, never null - * @return Translated string - */ - public String translateLiteralBoolean(Boolean booleanValue) { - if(booleanValue.booleanValue()) { - return "1"; //$NON-NLS-1$ - } - return "0"; //$NON-NLS-1$ - } - - /** - * Subclasses should override this method to provide a different sql t= ranslation - * of the literal date value. By default, a date literal is represent= ed as: - * {d'2002-12-31'} - * @param dateValue Date value, never null - * @return Translated string - */ - public String translateLiteralDate(java.sql.Date dateValue, Calendar c= al) { - return "{d'" + formatDateValue(dateValue, cal) + "'}"; //$NON-NLS-= 1$ //$NON-NLS-2$ - } - - /** - * Subclasses should override this method to provide a different sql t= ranslation - * of the literal time value. By default, a time literal is represent= ed as: - * {t'23:59:59'} - * @param timeValue Time value, never null - * @return Translated string - */ - public String translateLiteralTime(Time timeValue, Calendar cal) { - if (!hasTimeType()) { - return "{ts'1970-01-01 " + formatDateValue(timeValue, cal) + "'}"; /= /$NON-NLS-1$ //$NON-NLS-2$ - } - return "{t'" + formatDateValue(timeValue, cal) + "'}"; //$NON-NLS-= 1$ //$NON-NLS-2$ - } - - /** - * Subclasses should override this method to provide a different sql t= ranslation - * of the literal timestamp value. By default, a timestamp literal is - * represented as: {ts'2002-12-31 23:59:59'}. - * @param timestampValue Timestamp value, never null - * @return Translated string - */ - public String translateLiteralTimestamp(Timestamp timestampValue, Cale= ndar cal) { - return "{ts'" + formatDateValue(timestampValue, cal) + "'}"; //$NO= N-NLS-1$ //$NON-NLS-2$ - } - = - /** - * Format the dateObject (of type date, time, or timestamp) into a str= ing - * using the DatabaseTimeZone format. - * @param dateObject - * @param cal - * @return Formatted string - */ - public String formatDateValue(java.util.Date dateObject, Calendar cal)= { - if (dateObject instanceof Timestamp && getTimestampNanoSecondPreci= sion() < 9) { - Timestamp ts =3D (Timestamp)dateObject; - Timestamp newTs =3D new Timestamp(ts.getTime()); - if (getTimestampNanoSecondPrecision() > 0) { - int mask =3D 10^(9-getTimestampNanoSecondPrecision()); - newTs.setNanos(ts.getNanos()/mask*mask); - } - dateObject =3D newTs; - } - = - if(cal =3D=3D null) { - return dateObject.toString(); - } - = - return getEnvironment().getTypeFacility().convertDate(dateObject, - DEFAULT_TIME_ZONE, cal, dateObject.getClass()).toString(); = - } = - = - public boolean addSourceComment() { - return useComments; - } = - = - public String addLimitString(String queryCommand, ILimit limit) { - return queryCommand + " " + limit.toString(); //$NON-NLS-1$ - } - = - /** - * Indicates whether group alias should be of the form - * "...FROM groupA AS X" or "...FROM groupA X". Certain - * data sources (such as Oracle) may not support the first - * form. = - * @return boolean - */ - public boolean useAsInGroupAlias(){ - return true; - } - = - public boolean usePreparedStatements() { - return this.usePreparedStatements; - } - = - public boolean useParensForSetQueries() { - return false; - } - = - public boolean hasTimeType() { - return true; - } - = - public String getSetOperationString(ISetQuery.Operation operation) { - return operation.toString(); - } - = - public String getSourceComment(ExecutionContext context, ICommand comm= and) { - if (addSourceComment() && context !=3D null) { - synchronized (COMMENT) { - return COMMENT.format(new Object[] {context.getConnectionIden= tifier(), context.getRequestIdentifier(), context.getPartIdentifier()}); - } - } - return ""; //$NON-NLS-1$ = - } - = - public String replaceElementName(String group, String element) { - return null; - } - = - public int getTimestampNanoSecondPrecision() { - return 9; - } - = - public String getConnectionTestQuery() { - return "select 1"; //$NON-NLS-1$ - } - = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/extension/TranslatedCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/TranslatedCommand.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/TranslatedCommand.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,171 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.extension; - -import java.util.List; -import java.util.Map; - -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.visitor.util.CollectorVisitor; - -/** - * This is a utility class used to translate an ICommand using a SQLConver= sionVisitor. - * The SQLConversionVisitor should not be invoked directly; this object wi= ll use it to - * translate the ICommand. - */ -public class TranslatedCommand { - - private String sql; - private boolean prepared; - private List preparedValues; - private List preparedTypes; - = - private SQLConversionVisitor sqlConversionVisitor; - private FunctionReplacementVisitor functionVisitor; - private ExecutionContext context; - private SQLTranslator sqlTranslator; - = - /** - * Constructor, takes a SQLConversionVisitor subclass = - * @param visitor a SQLConversionVisitor subclass = - */ - public TranslatedCommand(ExecutionContext context, SQLTranslator sqlTr= anslator){ - this.context =3D context; - this.sqlTranslator =3D sqlTranslator; - = - Map modifiers =3D sqlTranslator.getFunction= Modifiers(); - this.sqlConversionVisitor =3D new SQLConversionVisitor(sqlTranslat= or); - sqlConversionVisitor.setExecutionContext(context); - this.functionVisitor =3D new FunctionReplacementVisitor(modifiers); - } - = - public TranslatedCommand(ExecutionContext context, SQLTranslator sqlTr= anslator, SQLConversionVisitor sqlConversionVisitor, FunctionReplacementVis= itor functionVisitor) { - this.context =3D context; - this.sqlTranslator =3D sqlTranslator; - this.sqlConversionVisitor =3D sqlConversionVisitor; - this.functionVisitor =3D functionVisitor; - } - = - /** - * The method to cause this object to do it's thing. This method shou= ld - * be called right after the constructor; afterward, all of the getter= methods - * can be called to retrieve results. = - * @param command ICommand to be translated - * @throws ConnectorException = - */ - public void translateCommand(ICommand command) throws ConnectorExcepti= on { - this.sql =3D getSQL(command); - this.preparedValues =3D this.sqlConversionVisitor.getPreparedValue= s(); - this.preparedTypes =3D this.sqlConversionVisitor.getPreparedTypes(= ); - this.prepared =3D this.sqlConversionVisitor.isPrepared(); - } - = - private String getSQL(ICommand command) throws ConnectorException { - command =3D sqlTranslator.modifyCommand(command, context); - command.acceptVisitor(functionVisitor); - = - if (sqlTranslator.usePreparedStatements() || hasBindValue(command)= ) { - this.sqlConversionVisitor.setPrepared(true); - = - command.acceptVisitor(new BindValueVisitor()); - } - = - this.sqlConversionVisitor.append(command); - return this.sqlConversionVisitor.toString(); - } - - /** - * Simple check to see if any values in the command should be replaced= with bind values - * = - * @param command - * @return - */ - private boolean hasBindValue(ICommand command) { - for (ILiteral l : CollectorVisitor.collectObjects(ILiteral.class, = command)) { - if (l.isBindValue() || isBindEligible(l)) { - return true; - } - } - return false; - } - - /** = - * @param l - * @return - */ - static boolean isBindEligible(ILiteral l) { - if (TypeFacility.RUNTIME_TYPES.CLOB.equals(l.getType()) - || TypeFacility.RUNTIME_TYPES.BLOB.equals(l.getTyp= e()) = - || TypeFacility.RUNTIME_TYPES.OBJECT.equals(l.getT= ype())) { - return true; - } - return false; - } - = - /** - * Return List of values to set on a prepared statement, if = - * necessary (see {@link #getStatementType}) - * @return List of values to be set on a prepared statement - */ - public List getPreparedValues() { - return preparedValues; - } - = - /** - * Return List of types to set on a prepared statement, if = - * necessary (see {@link #getStatementType}) - * @return List of types to be set on a prepared statement - */ - public List getPreparedTypes() { - return preparedTypes; - } - - /** - * 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} - */ - 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 - */ - public boolean isPrepared() { - return prepared; - } - -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/extension/ValueRetriever.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/ValueRetriever.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/extension/ValueRetriever.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.extension; - -import java.sql.CallableStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Calendar; - -import com.metamatrix.connector.api.TypeFacility; - -/** - * Specifies how value objects are retrieved from JDBC ResultSet for diffe= rent = - * expected output types. This allows database-specific connectors to use = - * specialized methods like getClob() rather than generic getObject() meth= ods. = - */ -public interface ValueRetriever { - = - /** - * Retrieve the value at columnIndex from the specified <= code>results. - * = - * @param results The results to retrieve the value from = - * @param columnIndex The index to use when retrieving the value - * @param expectedType The MetaMatrix runtime type class that is expec= ted to be returned, as = - * specified by the select statement of the query - * @param cal The Calendar to be used for Date, Time, and Timestamp va= lues - * @return The object that was retrieved - * @throws SQLException If an error occurred retrieving the value - */ - Object retrieveValue(ResultSet results, int columnIndex, Class expecte= dType, Calendar cal, TypeFacility typeFacility) throws SQLException; - = - /** - * Retrieve the value at parameterIndex from the callable= statement - * @param results - * @param parameterIndex - * @param expectedType - * @param cal - * @return - * @throws SQLException - */ - Object retrieveValue(CallableStatement results, int parameterIndex, Cl= ass expectedType, Calendar cal, TypeFacility typeFacility) throws SQLExcept= ion; = -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/informix/InformixSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixSQLTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixSQLTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -27,12 +27,12 @@ import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.Translator; = /** */ -public class InformixSQLTranslator extends SQLTranslator { +public class InformixSQLTranslator extends Translator { = @Override public void initialize(ConnectorEnvironment env) throws ConnectorExceptio= n { @@ -41,7 +41,7 @@ } = @Override - public String getConnectionTestQuery() { + public String getDefaultConnectionTestQuery() { return "select 'x' from informix.sysusers where 1=3D0"; //$NON-NLS-1$ } = Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/mm/MMSingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mm/MMSingleIdentityConnectionFactory.java 2009-02-23 16:17:44 UTC (rev= 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mm/MMSingleIdentityConnectionFactory.java 2009-02-23 17:43:19 UTC (rev= 481) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.mm; - -import com.metamatrix.connector.jdbc.*; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory; - -/** = - * @since 4.3 - */ -public class MMSingleIdentityConnectionFactory extends JDBCSingleIdentityC= onnectionFactory{ - private String queryTest =3D "Select 1"; //$NON-NLS-1$ - = - /** = - * @see com.metamatrix.connector.jdbc.JDBCSourceConnectionFactory#crea= teConnectionStrategy() - * @since 4.3 - */ - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } - = -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/mysql/MySQLConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLConvertModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLConvertModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -25,8 +25,8 @@ import java.util.Arrays; import java.util.List; = -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/mysql/MySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -25,18 +25,17 @@ import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; -import java.util.Calendar; = import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; +import com.metamatrix.connector.jdbc.translator.Translator; = = /** = * @since 4.3 */ -public class MySQLTranslator extends SQLTranslator { +public class MySQLTranslator extends Translator { = @Override public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { @@ -45,18 +44,18 @@ } = = @Override - public String translateLiteralDate(Date dateValue, Calendar cal) { - return "DATE('" + formatDateValue(dateValue, cal) + "')"; //$NON-= NLS-1$//$NON-NLS-2$ + public String translateLiteralDate(Date dateValue) { + return "DATE('" + formatDateValue(dateValue) + "')"; //$NON-NLS-1= $//$NON-NLS-2$ } = @Override - public String translateLiteralTime(Time timeValue, Calendar cal) { - return "TIME('" + formatDateValue(timeValue, cal) + "')"; //$NON-= NLS-1$//$NON-NLS-2$ + public String translateLiteralTime(Time timeValue) { + return "TIME('" + formatDateValue(timeValue) + "')"; //$NON-NLS-1= $//$NON-NLS-2$ } = @Override - public String translateLiteralTimestamp(Timestamp timestampValue, Cale= ndar cal) { - return "TIMESTAMP('" + formatDateValue(timestampValue, cal) + "')"= ; //$NON-NLS-1$//$NON-NLS-2$ + public String translateLiteralTimestamp(Timestamp timestampValue) { + return "TIMESTAMP('" + formatDateValue(timestampValue) + "')"; //= $NON-NLS-1$//$NON-NLS-2$ } = @Override Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/ConcatFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ConcatFunctionModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ConcatFunctionModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -27,7 +27,7 @@ import java.util.List; = import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; import com.metamatrix.connector.language.ICriteria; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; @@ -54,7 +54,7 @@ } = /** = - * @see com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModi= fier#modify(com.metamatrix.connector.language.IFunction) + * @see com.metamatrix.connector.jdbc.translator.BasicFunctionModifier= #modify(com.metamatrix.connector.language.IFunction) */ public IExpression modify(IFunction function) { List when =3D new ArrayList(); @@ -111,7 +111,7 @@ } = /** = - * @see com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModi= fier#translate(com.metamatrix.connector.language.IFunction) + * @see com.metamatrix.connector.jdbc.translator.BasicFunctionModifier= #translate(com.metamatrix.connector.language.IFunction) */ public List translate(IFunction function) { return null; //allow default translation Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/DayWeekQuarterFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/DayWeekQuarterFunctionModifier.java 2009-02-23 16:17:44 UTC (re= v 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/DayWeekQuarterFunctionModifier.java 2009-02-23 17:43:19 UTC (re= v 481) @@ -22,8 +22,8 @@ = package com.metamatrix.connector.jdbc.oracle; = -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.*; = /** Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/ExtractFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ExtractFunctionModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ExtractFunctionModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -25,8 +25,8 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/LeftOrRightFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LeftOrRightFunctionModifier.java 2009-02-23 16:17:44 UTC (rev 4= 80) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LeftOrRightFunctionModifier.java 2009-02-23 17:43:19 UTC (rev 4= 81) @@ -23,8 +23,8 @@ package com.metamatrix.connector.jdbc.oracle; = import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.*; = /** Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/LocateFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LocateFunctionModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LocateFunctionModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -22,8 +22,8 @@ = package com.metamatrix.connector.jdbc.oracle; = -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.*; = /** Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/Log10FunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/Log10FunctionModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/Log10FunctionModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -22,8 +22,8 @@ = package com.metamatrix.connector.jdbc.oracle; = -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.*; = public class Log10FunctionModifier extends BasicFunctionModifier implement= s FunctionModifier { Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/MonthOrDayNameFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/MonthOrDayNameFunctionModifier.java 2009-02-23 16:17:44 UTC (re= v 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/MonthOrDayNameFunctionModifier.java 2009-02-23 17:43:19 UTC (re= v 481) @@ -22,8 +22,8 @@ = package com.metamatrix.connector.jdbc.oracle; = -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.*; = /** Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/OracleConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleConvertModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleConvertModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -25,9 +25,9 @@ import java.util.List; = import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; @@ -46,7 +46,7 @@ /** * Intentionally return null, rely on the SQLStringVisitor being used = by caller * (Oracle or Oracle8 SQLConversionVisitor (SQLConversionVisitor)) - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#trans= late(com.metamatrix.connector.language.IFunction) + * @see com.metamatrix.connector.jdbc.translator.FunctionModifier#tran= slate(com.metamatrix.connector.language.IFunction) */ public List translate(IFunction function) { return null; Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/oracle/OracleResultsTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleResultsTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleResultsTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.oracle; - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Types; -import java.util.Calendar; - -import com.metamatrix.connector.jdbc.extension.impl.BasicResultsTranslator; - -public class OracleResultsTranslator extends BasicResultsTranslator { - protected void bindValue(PreparedStatement stmt, Object param, Class p= aramType, int i, Calendar cal) throws SQLException { - if(param =3D=3D null && Object.class.equals(paramType)){ - //Oracle drive does not support JAVA_OBJECT type - stmt.setNull(i, Types.LONGVARBINARY); - return; - } - super.bindValue(stmt, param, paramType, i, cal); - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/OracleSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -24,14 +24,21 @@ */ package com.metamatrix.connector.jdbc.oracle; = +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Types; import java.util.List; = import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; +import com.metamatrix.connector.jdbc.JDBCPlugin; +import com.metamatrix.connector.jdbc.translator.AliasModifier; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IGroup; @@ -44,7 +51,7 @@ = /** */ -public class OracleSQLTranslator extends SQLTranslator { +public class OracleSQLTranslator extends Translator { = public final static String HINT_PREFIX =3D "/*+"; //$NON-NLS-1$ public final static String DUAL =3D "DUAL"; //$NON-NLS-1$ @@ -223,8 +230,52 @@ } = @Override - public String getConnectionTestQuery() { + public String getDefaultConnectionTestQuery() { return "Select 'x' from DUAL"; //$NON-NLS-1$ } = + @Override + public void bindValue(PreparedStatement stmt, Object param, Class para= mType, int i) throws SQLException { + if(param =3D=3D null && Object.class.equals(paramType)){ + //Oracle drive does not support JAVA_OBJECT type + stmt.setNull(i, Types.LONGVARBINARY); + return; + } + super.bindValue(stmt, param, paramType, i); + } + = + @Override + public void afterInitialConnectionCreation(Connection connection) { + String errorStr =3D JDBCPlugin.Util.getString("ConnectionListener.fai= led_to_report_oracle_connection_details"); //$NON-NLS-1$ + ResultSet rs =3D null; + Statement stmt =3D null; + try { = + stmt =3D connection.createStatement(); + rs =3D stmt.executeQuery("select * from v$instance"); = + = + int columnCount =3D rs.getMetaData().getColumnCount(); + while (rs.next()) { + StringBuffer sb =3D new StringBuffer(); + for (int i =3D 1; i <=3D columnCount; i++) { + sb.append(rs.getMetaData().getColumnName(i)).append("= =3D").append(rs.getString(i)).append(";"); //$NON-NLS-1$ //$NON-NLS-2$ + } = + // log the queried information + getEnvironment().getLogger().logInfo(sb.toString()); = = + } = + = + } catch (SQLException e) { + getEnvironment().getLogger().logInfo(errorStr); = + }finally { + try { + if (rs !=3D null) { + rs.close(); + } = + if (stmt !=3D null) { + stmt.close(); + } + } catch (SQLException e1) { + getEnvironment().getLogger().logInfo(errorStr); + } + } + } } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/oracle/OracleSingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSingleIdentityConnectionFactory.java 2009-02-23 16:17:44 = UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSingleIdentityConnectionFactory.java 2009-02-23 17:43:19 = UTC (rev 481) @@ -1,120 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.oracle; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.jdbc.ConnectionListener; -import com.metamatrix.connector.jdbc.ConnectionQueryStrategy; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.DefaultConnectionListener; -import com.metamatrix.connector.jdbc.JDBCPlugin; -import com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory; - -public class OracleSingleIdentityConnectionFactory extends JDBCSingleIdent= ityConnectionFactory{ - private String queryTest =3D "Select 'x' from DUAL"; //$NON-NLS-1$ - private ConnectionListener connectionListener =3D new OracleConnection= Listener(); - = - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } - = - /** - * @see com.metamatrix.connector.jdbc.JDBCSourceConnectionFactory#getC= onnectionListener() - */ - protected ConnectionListener getConnectionListener() { - return connectionListener; - } - = - /** - * A connection listener strategy class, where gets called after the c= onnection = - * is created and before connection is terminated. - */ - private static class OracleConnectionListener extends DefaultConnectio= nListener{ - // Since this going to used inside a pool, we would like to repor= t only once = - boolean alreadyReportedDetails =3D false; = - = - /** - * log some debug information about the oracle driver being used. - * defect request 13979 & 13978 - * @see com.metamatrix.connector.jdbc.ConnectionStrategy#afterConn= ectionCreation(java.sql.Connection) - */ - public void afterConnectionCreation(Connection connection, Connect= orEnvironment env) { - super.afterConnectionCreation(connection, env); - = - if (alreadyReportedDetails) { = - return; - } - = - alreadyReportedDetails =3D true; = - String errorStr =3D JDBCPlugin.Util.getString("ConnectionListe= ner.failed_to_report_oracle_connection_details"); //$NON-NLS-1$ - executeSQL(connection, env, "select * from v$instance", errorS= tr); //$NON-NLS-1$ - } - - /** - * Execute any SQL aginst the connection - * @param connection - * @param env - * @param sql - */ - private void executeSQL(Connection connection, ConnectorEnvironmen= t env, String sql, String errorStr) { = - ResultSet rs =3D null; - Statement stmt =3D null; - try { = - stmt =3D connection.createStatement(); - rs =3D stmt.executeQuery(sql); = - = - = - int columnCount =3D rs.getMetaData().getColumnCount(); - while (rs.next()) { - StringBuffer sb =3D new StringBuffer(); - for (int i =3D 1; i <=3D columnCount; i++) { - sb.append(rs.getMetaData().getColumnName(i)).appen= d("=3D").append(rs.getString(i)).append(";"); //$NON-NLS-1$ //$NON-NLS-2$ - } = - // log the queried information - env.getLogger().logInfo(sb.toString()); = = - } = - = - } catch (SQLException e) { - env.getLogger().logInfo(errorStr); = - }finally { - try { - if (rs !=3D null) { - rs.close(); - } = - if (stmt !=3D null) { - stmt.close(); - } - } catch (SQLException e1) { - env.getLogger().logInfo(errorStr); - } - } - } = - } -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/oracle/OracleUserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleUserIdentityConnectionFactory.java 2009-02-23 16:17:44 UT= C (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleUserIdentityConnectionFactory.java 2009-02-23 17:43:19 UT= C (rev 481) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.oracle; - -import com.metamatrix.connector.jdbc.*; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCUserIdentityConnectionFactory; - -public class OracleUserIdentityConnectionFactory extends JDBCUserIdentityC= onnectionFactory{ - private String queryTest =3D "Select 'x' from DUAL"; //$NON-NLS-1$ - = - protected ConnectionStrategy createConnectionStrategy() { - return new ConnectionQueryStrategy(queryTest); = - } - -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/postgresql/DatePartFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/DatePartFunctionModifier.java 2009-02-23 16:17:44 UTC (rev = 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/DatePartFunctionModifier.java 2009-02-23 17:43:19 UTC (rev = 481) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.jdbc.postgresql; = -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/postgresql/PostgreSQLConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLConvertModifier.java 2009-02-23 16:17:44 UTC (rev= 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLConvertModifier.java 2009-02-23 17:43:19 UTC (rev= 481) @@ -27,9 +27,9 @@ import java.util.Arrays; import java.util.List; = -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/postgresql/PostgreSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -25,17 +25,16 @@ import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; -import java.util.Calendar; = import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.SourceSystemFunctions; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; import com.metamatrix.connector.jdbc.oracle.LeftOrRightFunctionModifier; import com.metamatrix.connector.jdbc.oracle.MonthOrDayNameFunctionModifier; +import com.metamatrix.connector.jdbc.translator.AliasModifier; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.IAggregate; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ILimit; @@ -46,7 +45,7 @@ /** = * @since 4.3 */ -public class PostgreSQLTranslator extends SQLTranslator { +public class PostgreSQLTranslator extends Translator { = public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { = @@ -88,18 +87,18 @@ } = @Override - public String translateLiteralDate(Date dateValue, Calendar cal) { - return "DATE '" + formatDateValue(dateValue, cal) + "'"; //$NON-NL= S-1$//$NON-NLS-2$ + public String translateLiteralDate(Date dateValue) { + return "DATE '" + formatDateValue(dateValue) + "'"; //$NON-NLS-1$/= /$NON-NLS-2$ } = @Override - public String translateLiteralTime(Time timeValue, Calendar cal) { - return "TIME '" + formatDateValue(timeValue, cal) + "'"; //$NON-NL= S-1$//$NON-NLS-2$ + public String translateLiteralTime(Time timeValue) { + return "TIME '" + formatDateValue(timeValue) + "'"; //$NON-NLS-1$/= /$NON-NLS-2$ } = @Override - public String translateLiteralTimestamp(Timestamp timestampValue, Cale= ndar cal) { - return "to_timestamp('" + formatDateValue(timestampValue, cal) + "= ', 'YYYY-MM-DD HH24:MI:SS.US')"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + public String translateLiteralTimestamp(Timestamp timestampValue) { + return "to_timestamp('" + formatDateValue(timestampValue) + "', 'Y= YYY-MM-DD HH24:MI:SS.US')"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ } = @Override Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/sqlserver/SqlServerSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerSQLTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerSQLTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -27,9 +27,8 @@ import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; import com.metamatrix.connector.jdbc.sybase.SybaseSQLTranslator; -import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.jdbc.translator.AliasModifier; = /** */ @@ -37,7 +36,7 @@ = public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { super.initialize(env); - //FEDERATE-168 remove mod modifier for SQL Server 2008 + //TEIID-31 remove mod modifier for SQL Server 2008 registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new Ali= asModifier("day")); //$NON-NLS-1$ //$NON-NLS-2$ registerFunctionModifier(SourceSystemFunctions.REPEAT, new AliasMo= difier("replicate")); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -46,10 +45,5 @@ public String getLengthFunctionName() { return "len"; //$NON-NLS-1$ } - = - @Override - public String addLimitString(String queryCommand, ILimit limit) { - return "SELECT TOP " + limit.getRowLimit() + " * FROM (" + queryComma= nd + ") AS X"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - + = } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/ssl/JDBCSequeLinkSingleIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ssl/JDBCSequeLinkSingleIdentityConnectionFactory.java 2009-02-23 16:17= :44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ssl/JDBCSequeLinkSingleIdentityConnectionFactory.java 2009-02-23 17:43= :19 UTC (rev 481) @@ -1,97 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - * com.metamatrix.connector.jdbc.ssl.JDBCSequeLinkSingleIdentityConnection= Factory - * Created by JChoate on Jan 28, 2005 - * (c) 2005 MetaMatrix, Inc. - */ -package com.metamatrix.connector.jdbc.ssl; - -import java.sql.Connection; -import java.sql.Driver; -import java.sql.SQLException; -import java.util.Properties; - -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.ConnectionQueryStrategy; -import com.metamatrix.connector.jdbc.ConnectionStrategy; -import com.metamatrix.connector.jdbc.JDBCPropertyNames; -import com.metamatrix.connector.jdbc.JDBCSingleIdentityConnectionFactory; -import com.metamatrix.connector.jdbc.JDBCSourceConnection; - -public class JDBCSequeLinkSingleIdentityConnectionFactory extends - JDBCSingleIdentityConnectionFactory { - = - private static final String JDBC_CAPABILITIES =3D "com.metamatrix.co= nnector.jdbc.JDBCCapabilities"; //$NON-NLS-1$ - private static final String ORACLE_CAPABILITIES =3D "com.metamatrix.co= nnector.jdbc.oracle.OracleCapabilities"; //$NON-NLS-1$ - private static final String DB2_CAPABILITIES =3D "com.metamatrix.co= nnector.jdbc.db2.DB2Capabilities"; //$NON-NLS-1$ - private static final String SYBASE_CAPABILITIES =3D "com.metamatrix.co= nnector.jdbc.sybase.SybaseCapabilities"; //$NON-NLS-1$ - private static final String SQLSERVER_CAPABILITIES =3D "com.metamatrix= .connector.jdbc.sqlserver.SqlServerCapabilities"; //$NON-NLS-1$ - = - // Fix for Case 4049 - USTranscom - // By default we were not creating a connectionStrategy and therefore = not testing connections - // when pulling them from the pool, this caused problems when the Sequ= eLink proxy would go down - // and come back up since we never removed the bad connection. = - // Adding this logic lets us run the test query when getting connectio= ns from the pool. = - // This is a slight hack, ultimately we want to add an option to Oracl= e, DB2, etc.. connectorTypes - // to select ssl mode and remove this Connector type. = - protected ConnectionStrategy createConnectionStrategy() { - - String capabilityClass =3D this.getConnectorEnvironment().getPrope= rties().getProperty(JDBCPropertyNames.EXT_CAPABILITY_CLASS, JDBC_CAPABILITI= ES); = - String queryTest =3D null; - = - if (capabilityClass.equals(ORACLE_CAPABILITIES)) { - queryTest =3D "Select 'x' from DUAL"; //$NON-NLS-1$ - } else if (capabilityClass.equals(DB2_CAPABILITIES)) { - queryTest =3D "Select 'x' from sysibm.systables where 1 =3D 2"= ; //$NON-NLS-1$ - } else if (capabilityClass.equals(SYBASE_CAPABILITIES)) { - queryTest =3D "Select 'x'"; //$NON-NLS-1$ - } else if (capabilityClass.equals(SQLSERVER_CAPABILITIES)) { - queryTest =3D "Select 'x'"; //$NON-NLS-1$ - } else { - return null; - } - return new ConnectionQueryStrategy(queryTest); = - } - - /** - * This creates a JDBC connection. - * It overrides the functionality in abstract class com.metamatrix.con= nector.jdbc.JDBCSourceConnectionFactory - * @throws ConnectorException if there is an error establishing the c= onnection. - */ - protected com.metamatrix.connector.api.Connection createJDBCConnection= (Driver driver, String url, int transactionIsolationLevel, Properties userP= rops) throws ConnectorException { - Connection connection =3D null; - - // Connect - try { - connection =3D driver.connect(url, userProps); - if(transactionIsolationLevel !=3D NO_ISOLATION_LEVEL_SET){ - connection.setTransactionIsolation(transactionIsolationLev= el); - } - } catch ( SQLException e ) { - throw new ConnectorException(e); - } - - return new JDBCSourceConnection(connection, getConnectorEnvironmen= t(), createConnectionStrategy(), getConnectionListener(), getResultsTransla= tor(), getSqlTranslator()); - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/sybase/ModFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/ModFunctionModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/ModFunctionModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -25,7 +25,7 @@ import java.util.List; = import com.metamatrix.connector.api.TypeFacility.RUNTIME_TYPES; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; +import com.metamatrix.connector.jdbc.translator.AliasModifier; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/sybase/SybaseConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseConvertModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseConvertModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -25,9 +25,9 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.*; = /** Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/sybase/SybaseSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseSQLTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseSQLTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -27,13 +27,14 @@ import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.impl.AliasModifier; -import com.metamatrix.connector.jdbc.extension.impl.SubstringFunctionModif= ier; +import com.metamatrix.connector.jdbc.translator.AliasModifier; +import com.metamatrix.connector.jdbc.translator.SubstringFunctionModifier; +import com.metamatrix.connector.jdbc.translator.Translator; +import com.metamatrix.connector.language.ILimit; = /** */ -public class SybaseSQLTranslator extends SQLTranslator { +public class SybaseSQLTranslator extends Translator { = /* = * @see com.metamatrix.connector.jdbc.extension.SQLTranslator#initiali= ze(com.metamatrix.data.api.ConnectorEnvironment, com.metamatrix.data.metada= ta.runtime.RuntimeMetadata) @@ -62,6 +63,11 @@ @Override public boolean hasTimeType() { return false; - } + } = + @Override + public String addLimitString(String queryCommand, ILimit limit) { + return "SELECT TOP " + limit.getRowLimit() + " * FROM (" + queryComma= nd + ") AS X"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + = } Copied: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connec= tor/jdbc/translator/AliasModifier.java (from rev 475, trunk/connectors/conn= ector-jdbc/src/main/java/com/metamatrix/connector/jdbc/extension/impl/Alias= Modifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/AliasModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/AliasModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ +package com.metamatrix.connector.jdbc.translator; + +import com.metamatrix.connector.language.*; + +/** + */ +public class AliasModifier extends BasicFunctionModifier { + // The alias to use + private String alias; + = + /** + * Constructor that takes the alias to use for functions. + * @param alias The alias to replace the incoming function name with + */ + public AliasModifier(String alias) { + this.alias =3D alias; = + } + = + /** + * @see com.metamatrix.connector.jdbc.translator.FunctionModifier#modi= fy(com.metamatrix.connector.language.IFunction) + */ + public IExpression modify(IFunction function) { + function.setName(alias); + return function; + } + +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/com/meta= matrix/connector/jdbc/translator/AliasModifier.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connec= tor/jdbc/translator/BasicFunctionModifier.java (from rev 475, trunk/connect= ors/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/extension/im= pl/BasicFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/BasicFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/BasicFunctionModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -0,0 +1,116 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ +package com.metamatrix.connector.jdbc.translator; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.HashMap; + +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; + +/** + */ +public abstract class BasicFunctionModifier implements FunctionModifier { + + /* + * Public sharing part for the mapping between class and type in forma= t of MapInteger>. + */ + public static final int STRING =3D 0; + public static final int CHAR =3D 1; + public static final int BOOLEAN =3D 2; + public static final int BYTE =3D 3; + public static final int SHORT =3D 4; + public static final int INTEGER =3D 5; + public static final int LONG =3D 6; + public static final int BIGINTEGER =3D 7; + public static final int FLOAT =3D 8; + public static final int DOUBLE =3D 9; + public static final int BIGDECIMAL =3D 10; + public static final int DATE =3D 11; + public static final int TIME =3D 12; + public static final int TIMESTAMP =3D 13; + public static final int OBJECT =3D 14; + public static final int BLOB =3D 15; + public static final int CLOB =3D 16; + public static final int XML =3D 17; + + public static final Map typeMap =3D new HashMap(); + = + static { + typeMap.put(TypeFacility.RUNTIME_TYPES.STRING, new Integer(STRING)= ); + typeMap.put(TypeFacility.RUNTIME_TYPES.CHAR, new Integer(CHAR)); + typeMap.put(TypeFacility.RUNTIME_TYPES.BOOLEAN, new Integer(BOOLEA= N)); + typeMap.put(TypeFacility.RUNTIME_TYPES.BYTE, new Integer(BYTE)); + typeMap.put(TypeFacility.RUNTIME_TYPES.SHORT, new Integer(SHORT)); + typeMap.put(TypeFacility.RUNTIME_TYPES.INTEGER, new Integer(INTEGE= R)); + typeMap.put(TypeFacility.RUNTIME_TYPES.LONG, new Integer(LONG)); + typeMap.put(TypeFacility.RUNTIME_TYPES.BIG_INTEGER, new Integer(BI= GINTEGER)); + typeMap.put(TypeFacility.RUNTIME_TYPES.FLOAT, new Integer(FLOAT)); + typeMap.put(TypeFacility.RUNTIME_TYPES.DOUBLE, new Integer(DOUBLE)= ); + typeMap.put(TypeFacility.RUNTIME_TYPES.BIG_DECIMAL, new Integer(BI= GDECIMAL)); + typeMap.put(TypeFacility.RUNTIME_TYPES.DATE, new Integer(DATE)); + typeMap.put(TypeFacility.RUNTIME_TYPES.TIME, new Integer(TIME)); + typeMap.put(TypeFacility.RUNTIME_TYPES.TIMESTAMP, new Integer(TIME= STAMP)); + typeMap.put(TypeFacility.RUNTIME_TYPES.OBJECT, new Integer(OBJECT)= ); = + typeMap.put(TypeFacility.RUNTIME_TYPES.BLOB, new Integer(BLOB)); + typeMap.put(TypeFacility.RUNTIME_TYPES.CLOB, new Integer(CLOB)); + typeMap.put(TypeFacility.RUNTIME_TYPES.XML, new Integer(XML)); + } = + = + /** + * Subclass should override this method as needed. + * @see com.metamatrix.connector.jdbc.translator.FunctionModifier#modi= fy(com.metamatrix.connector.language.IFunction) + */ + public IExpression modify(IFunction function) { + return function; + } + + /** + * Subclass should override this method as needed. + * @see com.metamatrix.connector.jdbc.translator.FunctionModifier#tran= slate(com.metamatrix.connector.language.IFunction) + */ + public List translate(IFunction function) { + List objs =3D new ArrayList(); + objs.add(function.getName()); + objs.add("("); //$NON-NLS-1$ + IExpression[] params =3D function.getParameters(); + if(params.length > 0) { = + objs.add(params[0]); + if(params.length > 1) { + for(int i=3D1; i null). Using bind v= ariables on + * both sides of the operator is not supported by most databases. + */ + public void visit(ICompareCriteria obj) { + replaceWithBinding =3D true; + visitNode(obj.getRightExpression()); + } + + /** + * Will look for bind values in the when criteria. + * The actual restriction for case statements seems to be that at leas= t one branch must + * not contain a bind variable. + */ + public void visit(ISearchedCaseExpression obj) { + for (int i =3D 0; i < obj.getWhenCount(); i++) { + visitNode(obj.getWhenCriteria(i)); + } + } + + @Override + public void visit(IInsert obj) { + replaceWithBinding =3D true; + visitNodes(obj.getValues()); + } + = + @Override + public void visit(ISetClause obj) { + replaceWithBinding =3D true; + visitNode(obj.getValue()); + } + + public void visit(ILiteral obj) { + if (replaceWithBinding || TranslatedCommand.isBindEligible(obj)) { + obj.setBindValue(true); + } + } + = + public void visitNode(ILanguageObject obj) { + boolean replacementMode =3D replaceWithBinding; + super.visitNode(obj); + this.replaceWithBinding =3D replacementMode; + } +} \ No newline at end of file Property changes on: trunk/connectors/connector-jdbc/src/main/java/com/meta= matrix/connector/jdbc/translator/BindValueVisitor.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connec= tor/jdbc/translator/DropFunctionModifier.java (from rev 475, trunk/connecto= rs/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/extension/imp= l/DropFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/DropFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/DropFunctionModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.connector.jdbc.translator; + +import com.metamatrix.connector.jdbc.JDBCPlugin; +import com.metamatrix.connector.language.*; + +/** + * This FunctionModifier will cause this function to be dropped by replaci= ng the function + * with (by default) the first argument of the function. Optionally, the = replacement index = + * can be overridden. This modifier should only be used with functions ha= ving the + * minimum or more number of arguments. = + */ +public class DropFunctionModifier extends BasicFunctionModifier implements= FunctionModifier { + + private int replaceIndex =3D 0; + = + public void setReplaceIndex(int index) { + this.replaceIndex =3D index; + } + = + public IExpression modify(IFunction function) { + IExpression[] args =3D function.getParameters(); + if(args.length <=3D replaceIndex) { = + throw new IllegalArgumentException(JDBCPlugin.Util.getString("= DropFunctionModifier.DropFunctionModifier_can_only_be_used_on_functions_wit= h___1") + function); //$NON-NLS-1$ + } + + return args[replaceIndex]; + } +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/com/meta= matrix/connector/jdbc/translator/DropFunctionModifier.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connec= tor/jdbc/translator/EscapeSyntaxModifier.java (from rev 475, trunk/connecto= rs/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/extension/imp= l/EscapeSyntaxModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/EscapeSyntaxModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/EscapeSyntaxModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.connector.jdbc.translator; + +import java.util.ArrayList; +import java.util.List; + +import com.metamatrix.connector.language.IFunction; + +/** + * Wrap a function in standard JDBC escape syntax. In some cases, the = + * driver can then convert to the correct database syntax for us. = + * @since 5.0 + */ +public class EscapeSyntaxModifier extends BasicFunctionModifier { + + public EscapeSyntaxModifier() { + super(); + } + = + /** = + * @see com.metamatrix.connector.jdbc.translator.BasicFunctionModifier= #translate(com.metamatrix.connector.language.IFunction) + * @since 5.0 + */ + public List translate(IFunction function) { + List normalParts =3D super.translate(function); + List wrappedParts =3D new ArrayList(normalParts.size() + 2); + wrappedParts.add("{fn "); //$NON-NLS-1$ + wrappedParts.addAll(normalParts); + wrappedParts.add("}"); //$NON-NLS-1$ + return wrappedParts; + } + +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/com/meta= matrix/connector/jdbc/translator/EscapeSyntaxModifier.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connec= tor/jdbc/translator/FunctionModifier.java (from rev 475, trunk/connectors/c= onnector-jdbc/src/main/java/com/metamatrix/connector/jdbc/extension/Functio= nModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/FunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/FunctionModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ +package com.metamatrix.connector.jdbc.translator; + +import java.util.List; + +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; + +/** + * Implementations of this interface are used to modify metamatrix functio= ns + * coming in to the connector into alternate datasource-specific language,= if + * necessary. = + */ +public interface FunctionModifier { + = + /** + * Takes an IFunction and returns the datasource-specific IExpression, + * or can possibly return the unmodified function parameter itself. = + * @param function + * @return IExpression or unmodified function + * @since 4.2 + */ + IExpression modify(IFunction function); + = + /** + * Return a List of translated parts (LanguageObjects and Strings), or= null + * if this FunctionModifier wishes to rely on the default translation = of the + * conversion visitor. = + * @param function IFunction to be translated + * @return List of translated parts, or null + * @since 4.2 + */ + List translate(IFunction function); +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/com/meta= matrix/connector/jdbc/translator/FunctionModifier.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connec= tor/jdbc/translator/SQLConversionVisitor.java (from rev 476, trunk/connecto= rs/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/extension/SQL= ConversionVisitor.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/SQLConversionVisitor.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/SQLConversionVisitor.java 2009-02-23 17:43:19 UTC (rev 481) @@ -0,0 +1,340 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ +package com.metamatrix.connector.jdbc.translator; + +import java.sql.Time; +import java.sql.Timestamp; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.IBulkInsert; +import com.metamatrix.connector.language.ICommand; +import com.metamatrix.connector.language.IElement; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageObject; +import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.IParameter; +import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IQuery; +import com.metamatrix.connector.language.IQueryCommand; +import com.metamatrix.connector.language.ISetQuery; +import com.metamatrix.connector.language.IParameter.Direction; +import com.metamatrix.connector.language.ISetQuery.Operation; +import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.visitor.util.SQLStringVisitor; + +/** + * This visitor takes an ICommand and does DBMS-specific conversion on it + * to produce a SQL String. This class is expected to be subclassed. + * Specialized instances of this class can be gotten from a SQL Translator + * {@link Translator#getTranslationVisitor(RuntimeMetadata) using this met= hod}. + */ +public class SQLConversionVisitor extends SQLStringVisitor{ + + private static DecimalFormat DECIMAL_FORMAT =3D = + new DecimalFormat("#############################0.0###############= ##############"); //$NON-NLS-1$ = + private static double SCIENTIC_LOW =3D Math.pow(10, -3); + private static double SCIENTIC_HIGH =3D Math.pow(10, 7); + = + private Map modifiers; + private ExecutionContext context; + private Translator translator; + + private boolean prepared; + = + private List preparedValues =3D new ArrayList(); + private List preparedTypes =3D new ArrayList(); + = + public SQLConversionVisitor(Translator translator) { + this.translator =3D translator; + this.prepared =3D translator.usePreparedStatements(); + this.modifiers =3D translator.getFunctionModifiers(); + } + + public void visit(IBulkInsert obj) { + this.prepared =3D true; + + super.visit(obj); + = + for (int i =3D 0; i < obj.getElements().size(); i++) { + IElement element =3D (IElement) obj.getElements().get(i); + this.preparedTypes.add(element.getType()); + } + + this.preparedValues =3D obj.getRows(); + } = + = + /** + * @param type + * @param object + * @param valuesbuffer + */ + private void translateSQLType(Class type, Object obj, StringBuffer val= uesbuffer) { + if (obj =3D=3D null) { + valuesbuffer.append(NULL); + } else { + if(Number.class.isAssignableFrom(type)) { + boolean useFormatting =3D false; + = + if (Double.class.isAssignableFrom(type)){ + double value =3D ((Double)obj).doubleValue(); + useFormatting =3D (value <=3D SCIENTIC_LOW || value >= =3D SCIENTIC_HIGH); = + } + else if (Float.class.isAssignableFrom(type)){ + float value =3D ((Float)obj).floatValue(); + useFormatting =3D (value <=3D SCIENTIC_LOW || value >= =3D SCIENTIC_HIGH); + } + // The formatting is to avoid the so-called "scientic-nota= tion" + // where toString will use for numbers greater than 10p7 a= nd + // less than 10p-3, where database may not understand. + if (useFormatting) { + synchronized (DECIMAL_FORMAT) { + valuesbuffer.append(DECIMAL_FORMAT.format(obj)); + } + } + else { + valuesbuffer.append(obj); + } + } else if(type.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { + valuesbuffer.append(translator.translateLiteralBoolean((Bo= olean)obj)); + } else if(type.equals(TypeFacility.RUNTIME_TYPES.TIMESTAMP)) { + valuesbuffer.append(translator.translateLiteralTimestamp((= Timestamp)obj)); + } else if(type.equals(TypeFacility.RUNTIME_TYPES.TIME)) { + valuesbuffer.append(translator.translateLiteralTime((Time)= obj)); + } else if(type.equals(TypeFacility.RUNTIME_TYPES.DATE)) { + valuesbuffer.append(translator.translateLiteralDate((java.= sql.Date)obj)); + } else { + // If obj is string, toSting() will not create a new Strin= g = + // object, it returns it self, so new object creation. = + valuesbuffer.append("'") //$NON-NLS-1$ + .append(escapeString(obj.toString())) + .append("'"); //$NON-NLS-1$ + } + } = + } + + /** + * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IProcedure) + */ + public void visit(IProcedure obj) { + this.prepared =3D true; + /* + * preparedValues is now a list of procedure params instead of jus= t values + */ + this.preparedValues =3D obj.getParameters(); + super.buffer.append(generateSqlForStoredProcedure(obj)); + } + + /** + * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IFunction) + */ + public void visit(IFunction obj) { + if(this.modifiers !=3D null) { + FunctionModifier functionModifier =3D (FunctionModifier)this.m= odifiers.get(obj.getName().toLowerCase()); + if(functionModifier !=3D null) { + List parts =3D functionModifier.translate(obj); + = + // null means the FunctionModifier will rely on default tr= anslation + if (parts !=3D null) { + Iterator iter =3D parts.iterator(); + while(iter.hasNext()) { + Object part =3D iter.next(); + if(part instanceof String) { + buffer.append(part); + } else { + append((ILanguageObject)part); + } + } + return; + } = + } = + } = + super.visit(obj); + } + + /** + * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.ILiteral) + */ + public void visit(ILiteral obj) { + if (this.prepared && obj.isBindValue()) { + buffer.append(UNDEFINED_PARAM); + preparedValues.add(obj.getValue()); + preparedTypes.add(obj.getType()); + } else { + translateSQLType(obj.getType(), obj.getValue(), buffer); + } + } + + /** + * Set the per-command execution context on this visitor. = + * @param context ExecutionContext + * @since 4.3 + */ + public void setExecutionContext(ExecutionContext context) { + this.context =3D context; + } + = + /** + * Retrieve the per-command execution context for this visitor = + * (intended for subclasses to use). + * @return + * @since 4.3 + */ + protected ExecutionContext getExecutionContext() { + return this.context; + } + + protected String getSourceComment(ICommand command) { + return this.translator.getSourceComment(this.context, command); + } + = + /** + * This is a generic implementation. Subclass should override this met= hod + * if necessary. + * @param exec The command for the stored procedure. + * @return String to be executed by CallableStatement. + */ + protected String generateSqlForStoredProcedure(IProcedure exec) { + StringBuffer prepareCallBuffer =3D new StringBuffer(); + prepareCallBuffer.append("{ "); //$NON-NLS-1$ + + List params =3D exec.getParameters(); + + //check whether a "?" is needed if there are returns + boolean needQuestionMark =3D false; + Iterator iter =3D params.iterator(); + while(iter.hasNext()){ + IParameter param =3D (IParameter)iter.next(); + if(param.getDirection() =3D=3D Direction.RETURN){ + needQuestionMark =3D true; + break; + } + } + = + prepareCallBuffer.append(getSourceComment(exec)); + = + if(needQuestionMark){ + prepareCallBuffer.append("?=3D"); //$NON-NLS-1$ + } + + prepareCallBuffer.append(" call ");//$NON-NLS-1$ + prepareCallBuffer.append(exec.getMetadataID() !=3D null ? getName(= exec.getMetadataID()) : exec.getProcedureName()); + prepareCallBuffer.append("("); //$NON-NLS-1$ + + int numberOfParameters =3D 0; + iter =3D params.iterator(); + while(iter.hasNext()){ + IParameter param =3D (IParameter)iter.next(); + if(param.getDirection() =3D=3D Direction.IN || param.getDirect= ion() =3D=3D Direction.OUT || param.getDirection() =3D=3D Direction.INOUT){ + if(numberOfParameters > 0){ + prepareCallBuffer.append(","); //$NON-NLS-1$ + } + prepareCallBuffer.append("?"); //$NON-NLS-1$ + numberOfParameters++; + } + } + prepareCallBuffer.append(")"); //$NON-NLS-1$ + prepareCallBuffer.append("}"); //$NON-NLS-1$ + return prepareCallBuffer.toString(); + } + = + /** = + * @return the preparedValues + */ + List getPreparedValues() { + return this.preparedValues; + } + = + /** = + * @return the preparedValues + */ + List getPreparedTypes() { + return this.preparedTypes; + } + = + public boolean isPrepared() { + return prepared; + } + = + public void setPrepared(boolean prepared) { + this.prepared =3D prepared; + } + = + @Override + protected boolean useAsInGroupAlias() { + return this.translator.useAsInGroupAlias(); + } + = + @Override + public void visit(IQuery obj) { + if (obj.getLimit() !=3D null) { + handleLimit(obj); + } else { + super.visit(obj); + } + } + = + @Override + public void visit(ISetQuery obj) { + if (obj.getLimit() !=3D null) { + handleLimit(obj); + } else { + super.visit(obj); + } + } + = + @Override + protected boolean useParensForSetQueries() { + return translator.useParensForSetQueries(); + } + = + private void handleLimit(IQueryCommand obj) { + ILimit limit =3D obj.getLimit(); + obj.setLimit(null); + StringBuffer current =3D this.buffer; + this.buffer =3D new StringBuffer(); + append(obj); + current.append(this.translator.addLimitString(this.buffer.toString(),= limit)); + this.buffer =3D current; + obj.setLimit(limit); + } + = + @Override + protected String replaceElementName(String group, String element) { + return translator.replaceElementName(group, element); + } + = + @Override + protected void appendSetOperation(Operation operation) { + buffer.append(translator.getSetOperationString(operation)); + } + = +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/com/meta= matrix/connector/jdbc/translator/SQLConversionVisitor.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connec= tor/jdbc/translator/SubstringFunctionModifier.java (from rev 475, trunk/con= nectors/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/extensio= n/impl/SubstringFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/SubstringFunctionModifier.java (rev= 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/SubstringFunctionModifier.java 2009-02-23 17:43:19 UTC (rev= 481) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.connector.jdbc.translator; + +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; + +/** + * Common logic for Substring modifiers requiring 3 parameters + */ +public class SubstringFunctionModifier extends BasicFunctionModifier { + + private ILanguageFactory languageFactory; + private String length_function; + = + public SubstringFunctionModifier(ILanguageFactory languageFactory, Str= ing substring_function, String length_function) { + this.languageFactory =3D languageFactory; = + this.length_function =3D length_function; + } + + /** + * @see com.metamatrix.connector.jdbc.translator.FunctionModifier#modi= fy(com.metamatrix.query.sql.symbol.Function) + */ + public IExpression modify(IFunction function) { + IExpression[] args =3D function.getParameters(); + IExpression[] newArgs =3D new IExpression[3]; + function.setParameters(newArgs); + + newArgs[0] =3D args[0]; + newArgs[1] =3D args[1]; + = + if(args.length =3D=3D 2) { + newArgs[2] =3D languageFactory.createFunction(length_function,= new IExpression[] { args[0] }, Integer.class); = + } else { + newArgs[2] =3D args[2]; + } + = + function.setParameters(newArgs); + = + return function; + } +} \ No newline at end of file Property changes on: trunk/connectors/connector-jdbc/src/main/java/com/meta= matrix/connector/jdbc/translator/SubstringFunctionModifier.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connec= tor/jdbc/translator/TranslatedCommand.java (from rev 476, trunk/connectors/= connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/extension/Transl= atedCommand.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/TranslatedCommand.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/TranslatedCommand.java 2009-02-23 17:43:19 UTC (rev 481) @@ -0,0 +1,171 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ +package com.metamatrix.connector.jdbc.translator; + +import java.util.List; +import java.util.Map; + +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; +import com.metamatrix.connector.language.ICommand; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.visitor.util.CollectorVisitor; + +/** + * This is a utility class used to translate an ICommand using a SQLConver= sionVisitor. + * The SQLConversionVisitor should not be invoked directly; this object wi= ll use it to + * translate the ICommand. + */ +public class TranslatedCommand { + + private String sql; + private boolean prepared; + private List preparedValues; + private List preparedTypes; + = + private SQLConversionVisitor sqlConversionVisitor; + private FunctionReplacementVisitor functionVisitor; + private ExecutionContext context; + private Translator sqlTranslator; + = + /** + * Constructor, takes a SQLConversionVisitor subclass = + * @param visitor a SQLConversionVisitor subclass = + */ + public TranslatedCommand(ExecutionContext context, Translator sqlTrans= lator){ + this.context =3D context; + this.sqlTranslator =3D sqlTranslator; + = + Map modifiers =3D sqlTranslator.getFunction= Modifiers(); + this.sqlConversionVisitor =3D new SQLConversionVisitor(sqlTranslat= or); + sqlConversionVisitor.setExecutionContext(context); + this.functionVisitor =3D new FunctionReplacementVisitor(modifiers); + } + = + public TranslatedCommand(ExecutionContext context, Translator sqlTrans= lator, SQLConversionVisitor sqlConversionVisitor, FunctionReplacementVisito= r functionVisitor) { + this.context =3D context; + this.sqlTranslator =3D sqlTranslator; + this.sqlConversionVisitor =3D sqlConversionVisitor; + this.functionVisitor =3D functionVisitor; + } + = + /** + * The method to cause this object to do it's thing. This method shou= ld + * be called right after the constructor; afterward, all of the getter= methods + * can be called to retrieve results. = + * @param command ICommand to be translated + * @throws ConnectorException = + */ + public void translateCommand(ICommand command) throws ConnectorExcepti= on { + this.sql =3D getSQL(command); + this.preparedValues =3D this.sqlConversionVisitor.getPreparedValue= s(); + this.preparedTypes =3D this.sqlConversionVisitor.getPreparedTypes(= ); + this.prepared =3D this.sqlConversionVisitor.isPrepared(); + } + = + private String getSQL(ICommand command) throws ConnectorException { + command =3D sqlTranslator.modifyCommand(command, context); + command.acceptVisitor(functionVisitor); + = + if (sqlTranslator.usePreparedStatements() || hasBindValue(command)= ) { + this.sqlConversionVisitor.setPrepared(true); + = + command.acceptVisitor(new BindValueVisitor()); + } + = + this.sqlConversionVisitor.append(command); + return this.sqlConversionVisitor.toString(); + } + + /** + * Simple check to see if any values in the command should be replaced= with bind values + * = + * @param command + * @return + */ + private boolean hasBindValue(ICommand command) { + for (ILiteral l : CollectorVisitor.collectObjects(ILiteral.class, = command)) { + if (l.isBindValue() || isBindEligible(l)) { + return true; + } + } + return false; + } + + /** = + * @param l + * @return + */ + static boolean isBindEligible(ILiteral l) { + if (TypeFacility.RUNTIME_TYPES.CLOB.equals(l.getType()) + || TypeFacility.RUNTIME_TYPES.BLOB.equals(l.getTyp= e()) = + || TypeFacility.RUNTIME_TYPES.OBJECT.equals(l.getT= ype())) { + return true; + } + return false; + } + = + /** + * Return List of values to set on a prepared statement, if = + * necessary (see {@link #getStatementType}) + * @return List of values to be set on a prepared statement + */ + public List getPreparedValues() { + return preparedValues; + } + = + /** + * Return List of types to set on a prepared statement, if = + * necessary (see {@link #getStatementType}) + * @return List of types to be set on a prepared statement + */ + public List getPreparedTypes() { + return preparedTypes; + } + + /** + * 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} + */ + 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 + */ + public boolean isPrepared() { + return prepared; + } + +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/com/meta= matrix/connector/jdbc/translator/TranslatedCommand.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connec= tor/jdbc/translator/Translator.java (from rev 476, trunk/connectors/connect= or-jdbc/src/main/java/com/metamatrix/connector/jdbc/extension/SQLTranslator= .java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/Translator.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/Translator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -0,0 +1,714 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.connector.jdbc.translator; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Time; +import java.sql.Timestamp; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; + +import com.metamatrix.common.util.PropertiesUtils; +import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.api.ValueTranslator; +import com.metamatrix.connector.internal.ConnectorPropertyNames; +import com.metamatrix.connector.jdbc.JDBCPlugin; +import com.metamatrix.connector.jdbc.JDBCPropertyNames; +import com.metamatrix.connector.language.ICommand; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.IParameter; +import com.metamatrix.connector.language.ISetQuery; +import com.metamatrix.connector.language.IParameter.Direction; + +/** + * Base class for creating source SQL queries and retrieving results. + * Specific databases should override as necessary. + */ +public class Translator { + + // Because the retrieveValue() method will be hit for every value of = + // every JDBC result set returned, we do lots of weird special stuff h= ere = + // to improve the performance (most importantly to remove big if/else = checks + // of every possible type. = + = + private static final Map, Integer> TYPE_CODE_MAP =3D new Hash= Map, Integer>(); + = + private static final int INTEGER_CODE =3D 0; + private static final int LONG_CODE =3D 1; + private static final int DOUBLE_CODE =3D 2; + private static final int BIGDECIMAL_CODE =3D 3; + private static final int SHORT_CODE =3D 4; + private static final int FLOAT_CODE =3D 5; + private static final int TIME_CODE =3D 6; + private static final int DATE_CODE =3D 7; + private static final int TIMESTAMP_CODE =3D 8; + private static final int BLOB_CODE =3D 9; + private static final int CLOB_CODE =3D 10; + = + static { + TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.INTEGER, new Integer(= INTEGER_CODE)); + TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.LONG, new Integer(LON= G_CODE)); + TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.DOUBLE, new Integer(D= OUBLE_CODE)); + TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.BIG_DECIMAL, new Inte= ger(BIGDECIMAL_CODE)); + TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.SHORT, new Integer(SH= ORT_CODE)); + TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.FLOAT, new Integer(FL= OAT_CODE)); + TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.TIME, new Integer(TIM= E_CODE)); + TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.DATE, new Integer(DAT= E_CODE)); + TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.TIMESTAMP, new Intege= r(TIMESTAMP_CODE)); + TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.BLOB, new Integer(BLO= B_CODE)); + TYPE_CODE_MAP.put(TypeFacility.RUNTIME_TYPES.CLOB, new Integer(CLO= B_CODE)); + } + = + private static final MessageFormat COMMENT =3D new MessageFormat("/*te= iid sessionid:{0}, requestid:{1}.{2}*/ "); //$NON-NLS-1$ + public final static TimeZone DEFAULT_TIME_ZONE =3D TimeZone.getDefault= (); + + private static final ThreadLocal CALENDAR =3D new ThreadLoca= l(); + + private Map functionModifiers =3D new HashMap(); + private TimeZone databaseTimeZone; + private ConnectorEnvironment environment; + = + private boolean useComments; + private boolean usePreparedStatements; + = + private List> valueTranslators =3D new ArrayList= >(); + private int maxResultRows =3D 0; + private TypeFacility typeFacility; + + private volatile boolean initialConnection; + private String connectionTestQuery; + private int isValidTimeout =3D -1; + = + /** + * Initialize the SQLTranslator. + * @param env + * @param metadata + * @throws ConnectorException + */ + public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { + this.environment =3D env; + this.typeFacility =3D env.getTypeFacility(); + + String timeZone =3D env.getProperties().getProperty(JDBCPropertyNa= mes.DATABASE_TIME_ZONE); + if(timeZone !=3D null && timeZone.trim().length() > 0) { + TimeZone tz =3D TimeZone.getTimeZone(timeZone); + // Check that the dbms time zone is really different than the = local time zone + if(!DEFAULT_TIME_ZONE.hasSameRules(tz)) { + this.databaseTimeZone =3D tz; = + } = + } = + = + this.useComments =3D PropertiesUtils.getBooleanProperty(env.getPro= perties(), JDBCPropertyNames.USE_COMMENTS_SOURCE_QUERY, false); + this.usePreparedStatements =3D PropertiesUtils.getBooleanProperty(= env.getProperties(), JDBCPropertyNames.USE_BIND_VARIABLES, false); + this.connectionTestQuery =3D env.getProperties().getProperty(JDBCProp= ertyNames.CONNECTION_TEST_QUERY, getDefaultConnectionTestQuery()); + this.isValidTimeout =3D PropertiesUtils.getIntProperty(env.getPropert= ies(), JDBCPropertyNames.IS_VALID_TIMEOUT, -1); + = + String maxResultRowsString =3D env.getProperties().getProperty(Connec= torPropertyNames.MAX_RESULT_ROWS); + if ( maxResultRowsString !=3D null && maxResultRowsString.trim().l= ength() > 0 ) { + try { + maxResultRows =3D Integer.parseInt(maxResultRowsString); + String exceptionOnMaxRowsString =3D env.getProperties().ge= tProperty( + ConnectorPropertyNames.EXCEPTION_ON_MAX_ROWS); + maxResultRows =3D Math.max(0, maxResultRows); + //if the connector work needs to throw an excpetion, set t= he size plus 1 + if (maxResultRows > 0 && Boolean.valueOf(exceptionOnMaxRow= sString).booleanValue()) { + maxResultRows++; + } + } catch (NumberFormatException e) { + //this will already be logged by the connector worker + } + } + } + = + public TimeZone getDatabaseTimeZone() { + return databaseTimeZone; + } + = + public Calendar getDatabaseCalendar() { + if (this.databaseTimeZone =3D=3D null) { + return null; + } + Calendar cal =3D CALENDAR.get(); + if (cal =3D=3D null) { + cal =3D Calendar.getInstance(this.databaseTimeZone); + CALENDAR.set(cal); + } + return cal; + } + = + public final ConnectorEnvironment getEnvironment() { + return environment; + } + = + public final ILanguageFactory getLanguageFactory() { + return environment.getLanguageFactory(); + } + = + /** + * Modify the command. + * @param command + * @param context + * @return + */ + public ICommand modifyCommand(ICommand command, ExecutionContext conte= xt) throws ConnectorException { + return command; + } + = + /** + * Return a map of function name in lower case to FunctionModifier. + * @return Map of function name to FunctionModifier. + */ + public Map getFunctionModifiers() { + return functionModifiers; + } + = + public void registerFunctionModifier(String name, FunctionModifier mod= ifier) { + this.functionModifiers.put(name, modifier); + } + = + public void registerValueTranslator(ValueTranslator translator) { + this.valueTranslators.add(translator); + } + = + /** + * Subclasses should override this method to provide a different sql t= ranslation + * of the literal boolean value. By default, a boolean literal is rep= resented as: + * '0' or '1'. + * @param booleanValue Boolean value, never null + * @return Translated string + */ + public String translateLiteralBoolean(Boolean booleanValue) { + if(booleanValue.booleanValue()) { + return "1"; //$NON-NLS-1$ + } + return "0"; //$NON-NLS-1$ + } + + /** + * Subclasses should override this method to provide a different sql t= ranslation + * of the literal date value. By default, a date literal is represent= ed as: + * {d'2002-12-31'} + * @param dateValue Date value, never null + * @return Translated string + */ + public String translateLiteralDate(java.sql.Date dateValue) { + return "{d'" + formatDateValue(dateValue) + "'}"; //$NON-NLS-1$ //= $NON-NLS-2$ + } + + /** + * Subclasses should override this method to provide a different sql t= ranslation + * of the literal time value. By default, a time literal is represent= ed as: + * {t'23:59:59'} + * @param timeValue Time value, never null + * @return Translated string + */ + public String translateLiteralTime(Time timeValue) { + if (!hasTimeType()) { + return "{ts'1970-01-01 " + formatDateValue(timeValue) + "'}"; //$NON= -NLS-1$ //$NON-NLS-2$ + } + return "{t'" + formatDateValue(timeValue) + "'}"; //$NON-NLS-1$ //= $NON-NLS-2$ + } + + /** + * Subclasses should override this method to provide a different sql t= ranslation + * of the literal timestamp value. By default, a timestamp literal is + * represented as: {ts'2002-12-31 23:59:59'}. + * @param timestampValue Timestamp value, never null + * @return Translated string + */ + public String translateLiteralTimestamp(Timestamp timestampValue) { + return "{ts'" + formatDateValue(timestampValue) + "'}"; //$NON-NLS= -1$ //$NON-NLS-2$ + } + = + /** + * Format the dateObject (of type date, time, or timestamp) into a str= ing + * using the DatabaseTimeZone format. + * @param dateObject + * @return Formatted string + */ + public String formatDateValue(java.util.Date dateObject) { + if (dateObject instanceof Timestamp && getTimestampNanoSecondPreci= sion() < 9) { + Timestamp ts =3D (Timestamp)dateObject; + Timestamp newTs =3D new Timestamp(ts.getTime()); + if (getTimestampNanoSecondPrecision() > 0) { + int mask =3D 10^(9-getTimestampNanoSecondPrecision()); + newTs.setNanos(ts.getNanos()/mask*mask); + } + dateObject =3D newTs; + } + Calendar cal =3D getDatabaseCalendar(); + if(cal =3D=3D null) { + return dateObject.toString(); + } + = + return getEnvironment().getTypeFacility().convertDate(dateObject, + DEFAULT_TIME_ZONE, cal, dateObject.getClass()).toString(); = + } = + = + public boolean addSourceComment() { + return useComments; + } = + = + public String addLimitString(String queryCommand, ILimit limit) { + return queryCommand + " " + limit.toString(); //$NON-NLS-1$ + } + = + /** + * Indicates whether group alias should be of the form + * "...FROM groupA AS X" or "...FROM groupA X". Certain + * data sources (such as Oracle) may not support the first + * form. = + * @return boolean + */ + public boolean useAsInGroupAlias(){ + return true; + } + = + public boolean usePreparedStatements() { + return this.usePreparedStatements; + } + = + public boolean useParensForSetQueries() { + return false; + } + = + public boolean hasTimeType() { + return true; + } + = + public String getSetOperationString(ISetQuery.Operation operation) { + return operation.toString(); + } + = + public String getSourceComment(ExecutionContext context, ICommand comm= and) { + if (addSourceComment() && context !=3D null) { + synchronized (COMMENT) { + return COMMENT.format(new Object[] {context.getConnectionIden= tifier(), context.getRequestIdentifier(), context.getPartIdentifier()}); + } + } + return ""; //$NON-NLS-1$ = + } + = + public String replaceElementName(String group, String element) { + return null; + } + = + public int getTimestampNanoSecondPrecision() { + return 9; + } + = + public String getConnectionTestQuery() { + return connectionTestQuery; + } + = + public String getDefaultConnectionTestQuery() { + return "select 1"; //$NON-NLS-1$ + } + = + public TypeFacility getTypeFacility() { + return typeFacility; + } + = + /** + * This is a generic implementation. Because different databases handle + * stored procedures differently, subclasses should override this meth= od + * if necessary. + */ + public ResultSet executeStoredProcedure(CallableStatement statement, T= ranslatedCommand command) throws SQLException { + List params =3D command.getPreparedValues(); + int index =3D 1; + = + Iterator iter =3D params.iterator(); + while(iter.hasNext()){ + IParameter param =3D (IParameter)iter.next(); + if(param.getDirection() =3D=3D Direction.RETURN){ + registerSpecificTypeOfOutParameter(statement,param, index+= +); + } + } + = + iter =3D params.iterator(); + while(iter.hasNext()){ + IParameter param =3D (IParameter)iter.next(); + = + if(param.getDirection() =3D=3D Direction.INOUT){ + registerSpecificTypeOfOutParameter(statement,param, index); + }else if(param.getDirection() =3D=3D Direction.OUT){ + registerSpecificTypeOfOutParameter(statement,param, index+= +); + } + = + if(param.getDirection() =3D=3D Direction.IN || param.getDirect= ion() =3D=3D Direction.INOUT){ + bindValue(statement, param.getValue(), param.getType(), in= dex++); + } + } + = + boolean resultSetNext =3D statement.execute(); + = + while (!resultSetNext) { + int update_count =3D statement.getUpdateCount(); + if (update_count =3D=3D -1) { + break; + } = + resultSetNext =3D statement.getMoreResults(); + } + return statement.getResultSet(); + } + + /** + * @see com.metamatrix.connector.jdbc.extension.ResultsTranslator#getV= alueTranslators() + */ + public List getValueTranslators() { + return valueTranslators; + } + = + /** + * For registering specific output parameter types we need to translat= e these into the appropriate + * java.sql.Types output parameters + * We will need to match these up with the appropriate standard sql ty= pes + * @param cstmt + * @param parameter + * @throws SQLException + */ + protected void registerSpecificTypeOfOutParameter(CallableStatement st= atement, IParameter param, int index) throws SQLException { + Class runtimeType =3D param.getType(); + int typeToSet =3D TypeFacility.getSQLTypeFromRuntimeType(runtimeTy= pe); + = + statement.registerOutParameter(index,typeToSet); + } + = + /** + * Will be called by Query and Update executions if a PreparedStatemen= t is used. + * = + * bindValue is ultimately called from this method and for binding Cal= lableStatement + * values, so subclasses should override that method if necessery to c= hange the binding = + * behavior. + * = + * @see com.metamatrix.connector.jdbc.extension.ResultsTranslator#bind= PreparedStatementValues(java.sql.Connection, java.sql.PreparedStatement, co= m.metamatrix.connector.jdbc.translator.TranslatedCommand) + */ + public void bindPreparedStatementValues(Connection conn, PreparedState= ment stmt, TranslatedCommand command) throws SQLException { + List params =3D command.getPreparedValues(); + = + setPreparedStatementValues(stmt, params, command.getPreparedTypes(= )); + } + + private void setPreparedStatementValues(PreparedStatement stmt, List p= aramValues, List paramTypes) throws SQLException { + Calendar cal =3D getDatabaseCalendar(); + for (int i =3D 0; i< paramValues.size(); i++) { + Object parmvalue =3D paramValues.get(i); + Class paramType =3D (Class)paramTypes.get(i); + // this means the params is one row + bindValue(stmt, parmvalue, paramType, i+1); + } = + } + + /** + * Sets prepared statement parameter i with param. + * = + * Performs special handling to translate dates using the database tim= e zone and to + * translate biginteger, float, and char to JDBC safe objects. + * = + * @param stmt + * @param param + * @param paramType + * @param i + * @param cal + * @throws SQLException + */ + protected void bindValue(PreparedStatement stmt, Object param, Class p= aramType, int i) throws SQLException { + int type =3D TypeFacility.getSQLTypeFromRuntimeType(paramType); + = + if (param =3D=3D null) { + stmt.setNull(i, type); + return; + } = + //if this is a Date object, then use the database calendar + if (paramType.equals(TypeFacility.RUNTIME_TYPES.DATE)) { + stmt.setDate(i,(java.sql.Date)param, getDatabaseCalendar()); + return; + } = + if (paramType.equals(TypeFacility.RUNTIME_TYPES.TIME)) { + stmt.setTime(i,(java.sql.Time)param, getDatabaseCalendar()); + return; + } = + if (paramType.equals(TypeFacility.RUNTIME_TYPES.TIMESTAMP)) { + stmt.setTimestamp(i,(java.sql.Timestamp)param, getDatabaseCale= ndar()); + return; + } + //convert these the following to jdbc safe values + if (TypeFacility.RUNTIME_TYPES.BIG_INTEGER.equals(paramType)) { + param =3D new BigDecimal((BigInteger)param); + } else if (TypeFacility.RUNTIME_TYPES.FLOAT.equals(paramType)) { + param =3D new Double(((Float)param).doubleValue()); + } else if (TypeFacility.RUNTIME_TYPES.CHAR.equals(paramType)) { + param =3D ((Character)param).toString(); + } + stmt.setObject(i, param, type); + } + = + public int executeStatementForBulkInsert(Connection conn, PreparedStat= ement stmt, TranslatedCommand command) throws SQLException { + List rows =3D command.getPreparedValues(); + Calendar cal =3D getDatabaseCalendar(); + int updateCount =3D 0; + = + for (int i =3D 0; i< rows.size(); i++) { + List row =3D (List) rows.get(i); + = + setPreparedStatementValues(stmt, row, command.getPreparedTypes= ()); + = + stmt.addBatch(); + } + = + int[] results =3D stmt.executeBatch(); + = + for (int i=3D0; iCreates connections from DataSources both XA and non-XA.

- */ -public class JDBCSingleIdentityDSConnectionFactory extends JDBCSingleIdent= ityConnectionFactory{ - private DataSource ds; - private String resourceName; - - protected void verifyConnectionProperties(final Properties connectionP= rops) throws ConnectorException { - // Get the JDBC properties ... - String dataSourceClassName =3D connectionProps.getProperty(JDBCPro= pertyNames.DRIVER_CLASS); - String username =3D connectionProps.getProperty(XAJDBCPropertyName= s.USER); - String password =3D connectionProps.getProperty(XAJDBCPropertyName= s.PASSWORD); - String serverName =3D connectionProps.getProperty(XAJDBCPropertyNa= mes.SERVER_NAME); - String serverPort =3D connectionProps.getProperty(XAJDBCPropertyNa= mes.PORT_NUMBER); - - // Unique resource name for this connector - final StringBuffer dataSourceResourceName =3D new StringBuffer(con= nectionProps.getProperty(XAJDBCPropertyNames.DATASOURCE_NAME, "XADS")); //$= NON-NLS-1$ - dataSourceResourceName.append('_'); = - dataSourceResourceName.append(serverName); - dataSourceResourceName.append('_'); = - dataSourceResourceName.append(connectionProps.getProperty(XAJDBCPr= opertyNames.CONNECTOR_ID)); - resourceName =3D dataSourceResourceName.toString(); - connectionProps.setProperty( XAJDBCPropertyNames.DATASOURCE_NAME, = resourceName); - - // Verify required items - if (dataSourceClassName =3D=3D null || dataSourceClassName.trim().= length() =3D=3D 0) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Missing_JDBC_driver_class_name_1")); //$NON-NLS-1$ - } - dataSourceClassName =3D dataSourceClassName.trim(); - if ( serverName =3D=3D null || serverName.trim().length() =3D=3D 0= ) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.MissingProp", //$NON-NLS-1$ - XAJDBCPropertyNames.SERVER_NAME)); - } - if ( serverPort =3D=3D null || serverPort.trim().length() =3D=3D 0= ) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.MissingProp", //$NON-NLS-1$ - XAJDBCPropertyNames.PORT_NUMBER)); - } - if ( username =3D=3D null || username.trim().length() =3D=3D 0 ) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.MissingProp", //$NON-NLS-1$ - XAJDBCPropertyNames.USER)); - } - if ( password =3D=3D null || password.trim().length() =3D=3D 0 ) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.MissingProp", //$NON-NLS-1$ - XAJDBCPropertyNames.PASSWORD)); - } - - // create data source - final DataSource baseDs; - try { - Class clazz =3D Thread.currentThread().getContextClassLoader().lo= adClass(dataSourceClassName); - baseDs =3D (DataSource) clazz.newInstance(); - } catch(Exception e) { - throw new ConnectorException(e,JDBCPlugin.Util.getString("JDBC= SourceConnectionFactory.Unable_to_load_the_JDBC_driver_class_6", dataSource= ClassName)); //$NON-NLS-1$ - } - - setDSProperties(connectionProps, baseDs); - - ds =3D baseDs; - } - - @Override - public PoolAwareConnection getConnection(ExecutionContext context) thr= ows ConnectorException { - try{ - XAConnection conn =3D ((XADataSource)ds).getXAConnection(); - Connection sqlConn =3D conn.getConnection(); - if(getTransactionIsolation() !=3D NO_ISOLATION_LEVEL_SET && ge= tTransactionIsolation() !=3D Connection.TRANSACTION_NONE){ - sqlConn.setTransactionIsolation(getTransactionIsolation()); - } - return new JDBCSourceXAConnection(sqlConn, conn, getConnectorE= nvironment(), createConnectionStrategy(), getConnectionListener(), getResul= tsTranslator(), getSqlTranslator()); - }catch(SQLException se){ - throw new ConnectorException(se); - } - } - - /** - * @param props - * @param dataSource - */ - protected void setDSProperties(final Properties props, final DataSourc= e dataSource) throws ConnectorException { - // Move all prop names to lower case so we can use reflection to g= et - // method names and look them up in the connection props. - final Properties connProps =3D lowerCaseAllPropNames(props); - final Method[] methods =3D dataSource.getClass().getMethods(); - for (int i =3D 0; i < methods.length; i++) { - final Method method =3D methods[i]; - final String methodName =3D method.getName(); - // If setter ... - if ( methodName.startsWith("set") && method.getParameterTypes(= ).length =3D=3D 1 ) { //$NON-NLS-1$ - // Get the property name - final String propertyName =3D methodName.substring(3); = // remove the "set" - final String propertyValue =3D (String) connProps.get(prop= ertyName.toLowerCase()); - if ( propertyValue !=3D null ) { = - final Class argType =3D method.getParameterTypes()[0]; - final Object[] params =3D new Object[1]; - if ( argType =3D=3D Integer.TYPE ) { - params[0] =3D Integer.decode(propertyValue); - } else if ( argType =3D=3D Boolean.TYPE ) { - params[0] =3D Boolean.valueOf(propertyValue); - } else if ( argType =3D=3D String.class ) { - params[0] =3D propertyValue; - } - - // Actually set the property ... - //getConnectorEnvironment().getLogger().logTrace("setD= SProperties - Setting property \"" + propertyName + //$NON-NLS-1$ - // "\" = =3D \"" + params[0] + "\" on \"" + props.getProperty(JDBCPropertyNames.DRIV= ER_CLASS) + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-N= LS-3$ - try { - method.invoke(dataSource, params); - } catch (Throwable e) { - final Object[] msgParams =3D new Object[]{property= Name, propertyValue}; - final String msg =3D JDBCPlugin.Util.getString("JD= BCSingleIdentityDSConnectionFactory.Unable_to_set_DataSource_property", msg= Params); //$NON-NLS-1$ - throw new ConnectorException(msg); = - } - } - } - } - } - - private Properties lowerCaseAllPropNames(final Properties connectionPr= ops) { - final Properties lcProps =3D new Properties(); - final Iterator itr =3D connectionProps.keySet().iterator(); - while ( itr.hasNext() ) { - final String name =3D (String) itr.next(); - Object propValue =3D connectionProps.get(name); - if (propValue instanceof String) { - // we're only interested in prop values of type String - // here since we'll be looking for params to reflected met= hods - lcProps.setProperty(name.toLowerCase(), (String)propValue); - } // if - } - return lcProps; - } - = -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/xa/JDBCSourceXAConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/JDBCSourceXAConnection.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/JDBCSourceXAConnection.java 2009-02-23 17:43:19 UTC (rev 481) @@ -33,11 +33,8 @@ = import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.ConnectionListener; -import com.metamatrix.connector.jdbc.ConnectionStrategy; import com.metamatrix.connector.jdbc.JDBCSourceConnection; -import com.metamatrix.connector.jdbc.extension.ResultsTranslator; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.xa.api.XAConnection; = public class JDBCSourceXAConnection extends JDBCSourceConnection implement= s XAConnection { @@ -45,8 +42,8 @@ private XAResource resource; private boolean errorOccurred; = - public JDBCSourceXAConnection(Connection conn, javax.sql.XAConnection = xaConn, ConnectorEnvironment environment, ConnectionStrategy connectionStra= tegy, ConnectionListener connectionListener, ResultsTranslator resultsTrans= lator, SQLTranslator sqlTranslator) throws ConnectorException, SQLException= { = - super(conn, environment, connectionStrategy, connectionListener, r= esultsTranslator, sqlTranslator); + public JDBCSourceXAConnection(Connection conn, javax.sql.XAConnection = xaConn, ConnectorEnvironment environment, Translator sqlTranslator) throws = ConnectorException, SQLException { = + super(conn, environment, sqlTranslator); this.xaConn =3D xaConn; this.xaConn.addConnectionEventListener(new ConnectionEventListener= () { @Override @@ -84,7 +81,7 @@ */ @Override public void closeCalled() { - super.closeCalled(); + closeSourceConnection(); try { this.physicalConnection =3D this.xaConn.getConnection(); } catch (SQLException e) { @@ -100,4 +97,8 @@ return super.isAlive(); } = + public javax.sql.XAConnection getXAConnection() { + return this.xaConn; + } + = } Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/xa/JDBCXAConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/JDBCXAConnector.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/JDBCXAConnector.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,107 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.xa; - -import java.util.List; -import java.util.Properties; - -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.jdbc.JDBCConnector; -import com.metamatrix.connector.jdbc.JDBCPropertyNames; -import com.metamatrix.connector.xa.api.TransactionContext; -import com.metamatrix.connector.xa.api.XAConnection; -import com.metamatrix.connector.xa.api.XAConnector; -import com.metamatrix.core.util.StringUtil; - -(a)ConnectionPooling -public class JDBCXAConnector extends JDBCConnector implements XAConnector{ - - @Override - public void start(ConnectorEnvironment environment) - throws ConnectorException { - Properties appEnvProps =3D environment.getProperties(); = - - // Get and parse URL for some DataSource properties - add to conne= ctionProps - final String url =3D appEnvProps.getProperty(JDBCPropertyNames.URL= ); - if ( url =3D=3D null || url.trim().length() =3D=3D 0 ) { - throw new ConnectorException("Missing required property: " + J= DBCPropertyNames.URL); //$NON-NLS-1$ - } - = - parseURL(url, appEnvProps); - - super.start(environment); - - //TODO: this assumes single identity support - Connection conn =3D this.getXAConnection(null, null); - conn.close(); - } - = - /* - * @see com.metamatrix.data.api.xa.XAConnector#getXAConnection(com.met= amatrix.data.api.SecurityContext) - */ - public XAConnection getXAConnection(ExecutionContext context, final Tr= ansactionContext transactionContext) throws ConnectorException { - return (XAConnection)this.getConnection(context); - } - - /** - * Parse URL for DataSource connection properties and add to connectio= nProps. - * @param url - * @param connectionProps - */ - static void parseURL(final String url, final Properties connectionProp= s) { - // Will be: [jdbc:mmx:dbType://aHost:aPort], [DatabaseName=3DaData= Base], [CollectionID=3DaCollectionID], ... - final List urlParts =3D StringUtil.split(url, ";"); //$NON-NLS-1$ - - // Will be: [jdbc:mmx:dbType:], [aHost:aPort] - final List protoHost =3D StringUtil.split((String)urlParts.get(0),= "//"); //$NON-NLS-1$ - - // Will be: [aHost], [aPort] - final List hostPort =3D StringUtil.split((String) protoHost.get(1)= , ":"); //$NON-NLS-1$ - connectionProps.setProperty(XAJDBCPropertyNames.SERVER_NAME, (Stri= ng)hostPort.get(0)); - connectionProps.setProperty(XAJDBCPropertyNames.PORT_NUMBER, (Stri= ng)hostPort.get(1)); - - // For "databaseName", "SID", and all optional props - // (=3D;=3D;...) - for ( int i =3D 1; i < urlParts.size(); i++ ) { - final String nameVal =3D (String) urlParts.get( i ); - // Will be: [propName], [propVal] - final List aProp =3D StringUtil.split(nameVal, "=3D"); //$NON-= NLS-1$ - if ( aProp.size() > 1) { - final String propName =3D (String) aProp.get(0); - if ( propName.equalsIgnoreCase(XAJDBCPropertyNames.DATABAS= E_NAME) ) { - connectionProps.setProperty(XAJDBCPropertyNames.DATABA= SE_NAME, (String) aProp.get(1)); - } else { - // Set optional prop names lower case so that we can f= ind - // set method names for them when we introspect the Da= taSource - connectionProps.setProperty(propName.toLowerCase(), (S= tring) aProp.get(1)); - } - } - } - } -} Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/xa/XAJDBCPropertyNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/XAJDBCPropertyNames.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/XAJDBCPropertyNames.java 2009-02-23 17:43:19 UTC (rev 481) @@ -31,59 +31,13 @@ */ public class XAJDBCPropertyNames { = - /** - * The environment property used to identify a routing ID. This value= should - * be used to locate this particular connector from the DQP. - * @since 4.0 - */ - public static final String CONNECTOR_ID =3D "ConnectorID"; //$NON-NLS-= 1$ - /** An XA Transaction-related property. The XADataSource'= s unique * resource name for the underlying ConnectionPoolDataSource object. */ public static final String DATASOURCE_NAME =3D "dataSourceName"; //$NO= N-NLS-1$ = - public static final String DATABASE_NAME =3D "databaseName";//$NON-NLS= -1$ - - public static final String DESCRIPTION =3D "description";//$NON-NLS-1$ - - public static final String NETWORK_PROTOCOL =3D "networkProtocol";//$N= ON-NLS-1$ - - public static final String PASSWORD =3D "password";//$NON-NLS-1$ - public static final String PORT_NUMBER =3D "portNumber";//$NON-NLS-1$ = - public static final String ROLE_NAME =3D "roleName";//$NON-NLS-1$ - public static final String SERVER_NAME =3D "serverName";//$NON-NLS-1$ = - public static final String USER =3D "user";//$NON-NLS-1$ - - /** Not a standard DataSource property - only for debugging */ - public static final String SPYING =3D "spyAttributes";//$NON-NLS-1$ - - /** - * Oracle-specific properties - */ - public static class Oracle { - public static final String SID =3D "sid";//$NON-NLS-1$ - } - - /** - * DB2-specific properties - */ - public static class DB2 { - public static final String COLLECTIONID =3D "CollectionID";//$NON-= NLS-1$ - public static final String PACKAGENAME =3D "PackageName";//$NON-NL= S-1$ - } - - public static final String IS_XA =3D "isXA";//$NON-NLS-1$ - = - /** - * If true, the XAConnection obtained from the pool will not be = - * returned until the transaction is finished. = - */ - public static final String USE_CONNECTION_EXCLUSIVE =3D "UseConnection= Exclusive"; //$NON-NLS-1$ - - } Deleted: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conne= ctor/jdbc/TestConnectionQueryStrategy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/TestConnectionQueryStrategy.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/TestConnectionQueryStrategy.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc; - -import java.sql.Connection; - -import com.metamatrix.core.util.SimpleMock; - -import junit.framework.TestCase; - - -/** = - * Test case for ConnectionQueryStrategy - * @since 4.3 - */ -public class TestConnectionQueryStrategy extends TestCase { - = - private final static String TEST_QUERY =3D "select 'x' from dual"; //$= NON-NLS-1$ - = - private ConnectionQueryStrategy strategy; - private FakeConnection fakeConnection; - private Connection connection; - = - public TestConnectionQueryStrategy(String name) { - super(name); - } - = - public void setUp() throws Exception { - strategy =3D new ConnectionQueryStrategy(TEST_QUERY); - = - fakeConnection =3D new FakeConnection(); - connection =3D SimpleMock.createSimpleMock(fakeConnection, Connect= ion.class); - } - = - - /** - * Tests ConnectionQueryStrategy.isConnectionAlive() - * @since 4.3 - */ - public void testIsConnectionAlive() { - //closed connections should not be 'alive' - fakeConnection.closed =3D true; = - assertFalse(strategy.isConnectionAlive(connection)); - = - = - //open connections should be 'alive' - fakeConnection.closed =3D false; = - assertTrue(strategy.isConnectionAlive(connection)); - = - //failed connections should not be 'alive' - fakeConnection.fail =3D true; = - assertFalse(strategy.isConnectionAlive(connection)); - = - } - = -} Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/TestJDBCSourceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/TestJDBCSourceConnection.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/TestJDBCSourceConnection.java 2009-02-23 17:43:19 UTC (rev 481) @@ -30,8 +30,7 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.basic.BasicConnectorCapabilities; -import com.metamatrix.connector.jdbc.extension.impl.BasicResultsTranslator; -import com.metamatrix.connector.jdbc.oracle.OracleSQLTranslator; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.core.util.SimpleMock; = = @@ -41,18 +40,13 @@ */ public class TestJDBCSourceConnection extends TestCase { = - private final static String TEST_QUERY =3D "select 'x' from dual"; //$= NON-NLS-1$ - = - = private FakeConnection fakeConnection; private Connection connection; private ConnectorEnvironment environment; - private ConnectionQueryStrategy strategy; = = public TestJDBCSourceConnection(String name) { super(name); - = } = public void setUp() throws Exception { @@ -60,13 +54,9 @@ connection =3D SimpleMock.createSimpleMock(fakeConnection, Connect= ion.class); = final Properties properties =3D new Properties(); - properties.setProperty(JDBCPropertyNames.EXT_SQL_TRANSLATOR_CLASS,= OracleSQLTranslator.class.getName()); = - properties.setProperty(JDBCPropertyNames.EXT_RESULTS_TRANSLATOR_CL= ASS, BasicResultsTranslator.class.getName()); = properties.setProperty(JDBCPropertyNames.EXT_CAPABILITY_CLASS, Bas= icConnectorCapabilities.class.getName()); = = environment =3D EnvironmentUtility.createEnvironment(properties, f= alse); = - = - strategy =3D new ConnectionQueryStrategy(TEST_QUERY); } = = @@ -75,7 +65,12 @@ * @since 4.3 */ public void testIsAlive() throws Exception { - JDBCSourceConnection sourceConnection =3D new JDBCSourceConnection= (connection, environment, strategy, null, null); = + JDBCSourceConnection sourceConnection =3D new JDBCSourceConnection= (connection, environment, new Translator() { + @Override + public String getConnectionTestQuery() { + return "select 1"; + } + }); = = //closed connections should not be 'alive' = fakeConnection.closed =3D true; @@ -96,7 +91,12 @@ * @since 4.3 */ public void testIsAliveNullStrategy() throws Exception { - JDBCSourceConnection sourceConnection =3D new JDBCSourceConnection= (connection, environment, null, null, null); = + JDBCSourceConnection sourceConnection =3D new JDBCSourceConnection= (connection, environment, new Translator() { + @Override + public String getConnectionTestQuery() { + return null; + } + }); = = //closed connections should not be 'alive' = fakeConnection.closed =3D true; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/access/TestAccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/access/TestAccessSQLTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/access/TestAccessSQLTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -29,8 +29,8 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ICommand; = = @@ -39,7 +39,7 @@ */ public class TestAccessSQLTranslator extends TestCase { = - private static SQLTranslator TRANSLATOR; = + private static Translator TRANSLATOR; = = static { try { Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/db2/TestDB2ConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/db2/TestDB2ConvertModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/db2/TestDB2ConvertModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -32,7 +32,7 @@ import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/db2/TestDB2SqlTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/db2/TestDB2SqlTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/db2/TestDB2SqlTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -32,7 +32,7 @@ import com.metamatrix.cdk.unittest.FakeTranslationFactory; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; import com.metamatrix.connector.language.ICommand; import com.metamatrix.core.util.UnitTestUtil; = Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/derby/TestDerbyConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/derby/TestDerbyConvertModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/derby/TestDerbyConvertModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -32,7 +32,7 @@ import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/extension/impl/TestDropFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/extension/impl/TestDropFunctionModifier.java 2009-02-23 16:17:44 UTC (= rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/extension/impl/TestDropFunctionModifier.java 2009-02-23 17:43:19 UTC (= rev 481) @@ -25,6 +25,7 @@ import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILiteral; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/extension/impl/TestEscapeSyntaxModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/extension/impl/TestEscapeSyntaxModifier.java 2009-02-23 16:17:44 UTC (= rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/extension/impl/TestEscapeSyntaxModifier.java 2009-02-23 17:43:19 UTC (= rev 481) @@ -28,6 +28,7 @@ import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.connector.jdbc.translator.EscapeSyntaxModifier; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILiteral; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/mysql/TestMySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/mysql/TestMySQLTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/mysql/TestMySQLTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -30,7 +30,7 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.MetadataFactory; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; import com.metamatrix.connector.language.ICommand; = /** Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestDayWeekQuarterFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestDayWeekQuarterFunctionModifier.java 2009-02-23 16:17:44 UTC= (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestDayWeekQuarterFunctionModifier.java 2009-02-23 17:43:19 UTC= (rev 481) @@ -29,7 +29,7 @@ = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestExtractFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestExtractFunctionModifier.java 2009-02-23 16:17:44 UTC (rev 4= 80) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestExtractFunctionModifier.java 2009-02-23 17:43:19 UTC (rev 4= 81) @@ -30,7 +30,7 @@ import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestLeftOrRightFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLeftOrRightFunctionModifier.java 2009-02-23 16:17:44 UTC (r= ev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLeftOrRightFunctionModifier.java 2009-02-23 17:43:19 UTC (r= ev 481) @@ -28,7 +28,7 @@ = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestLocateFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLocateFunctionModifier.java 2009-02-23 16:17:44 UTC (rev 48= 0) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLocateFunctionModifier.java 2009-02-23 17:43:19 UTC (rev 48= 1) @@ -28,7 +28,7 @@ = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-23 16:17:44 UTC= (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-23 17:43:19 UTC= (rev 481) @@ -29,7 +29,7 @@ = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestOracleConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestOracleConvertModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestOracleConvertModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -32,7 +32,7 @@ import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestOracleTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestOracleTranslator.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestOracleTranslator.java 2009-02-23 17:43:19 UTC (rev 481) @@ -30,13 +30,13 @@ import com.metamatrix.cdk.unittest.FakeTranslationFactory; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.access.AccessSQLTranslator; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ICommand; = public class TestOracleTranslator extends TestCase { = - private static SQLTranslator TRANSLATOR; = + private static Translator TRANSLATOR; = = static { try { Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestSubstringFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestSubstringFunctionModifier.java 2009-02-23 16:17:44 UTC (rev= 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestSubstringFunctionModifier.java 2009-02-23 17:43:19 UTC (rev= 481) @@ -29,8 +29,8 @@ import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.FunctionModifier; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.FunctionModifier; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/postgresql/TestPostgreSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/postgresql/TestPostgreSQLTranslator.java 2009-02-23 16:17:44 UTC (rev = 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/postgresql/TestPostgreSQLTranslator.java 2009-02-23 17:43:19 UTC (rev = 481) @@ -30,7 +30,7 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.MetadataFactory; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; import com.metamatrix.connector.language.ICommand; = /** Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/sqlserver/TestSqlServerConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sqlserver/TestSqlServerConversionVisitor.java 2009-02-23 16:17:44 UTC = (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sqlserver/TestSqlServerConversionVisitor.java 2009-02-23 17:43:19 UTC = (rev 481) @@ -30,8 +30,8 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.MetadataFactory; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; = Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/sybase/TestSybaseConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestSybaseConvertModifier.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestSybaseConvertModifier.java 2009-02-23 17:43:19 UTC (rev 481) @@ -32,7 +32,7 @@ import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/sybase/TestSybaseSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestSybaseSQLConversionVisitor.java 2009-02-23 16:17:44 UTC (re= v 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestSybaseSQLConversionVisitor.java 2009-02-23 17:43:19 UTC (re= v 481) @@ -29,8 +29,8 @@ import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.jdbc.MetadataFactory; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; = Deleted: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conne= ctor/jdbc/userpool/MockExampleConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/userpool/MockExampleConnectionFactory.java 2009-02-23 16:17:44 UTC (re= v 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/userpool/MockExampleConnectionFactory.java 2009-02-23 17:43:19 UTC (re= v 481) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.userpool; - -import java.sql.Driver; -import java.util.Properties; - -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.JDBCUserIdentityConnectionFactory; - -/** - * Overrides createConnection stuff so we can fake obtaining a connection. - */ -public class MockExampleConnectionFactory extends JDBCUserIdentityConnecti= onFactory { - - public void shutdown() {} - = - @Override - protected Connection createJDBCConnection( - Driver driver, - String url, - int transactionIsolationLevel, - Properties userProps) - throws ConnectorException { - = - String user =3D userProps.getProperty("user"); //$NON-NLS-1$ - String password =3D userProps.getProperty("password"); //$NON-NLS-= 1$ - = - return new MockSourceConnection(url, transactionIsolationLevel, us= er, password); = - } - - @Override - protected Driver createDriver(String driverClassName) throws Connector= Exception { - return null; - } - = - @Override - protected void validateURL(Driver driver, String url) - throws ConnectorException { - } -} Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/userpool/TestPerUserPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/userpool/TestPerUserPool.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/userpool/TestPerUserPool.java 2009-02-23 17:43:19 UTC (rev 481) @@ -25,17 +25,20 @@ import java.io.Serializable; import java.util.Properties; = -import junit.framework.TestCase; +import javax.sql.DataSource; = import org.mockito.Mockito; = +import junit.framework.TestCase; + +import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.internal.ConnectorPropertyNames; +import com.metamatrix.connector.jdbc.JDBCConnector; import com.metamatrix.connector.jdbc.JDBCPropertyNames; -import com.metamatrix.connector.jdbc.JDBCSourceConnectionFactory; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; = /** @@ -50,10 +53,12 @@ = public void testWrongCredentials() throws Exception { ConnectorEnvironment env =3D initConnectorEnvironment(); - JDBCSourceConnectionFactory factory =3D new MockExampleConnectionF= actory(); - factory.initialize(env); - ExecutionContext ctx =3D createSecurityContext("pw1", false, facto= ry); //$NON-NLS-1$ + JDBCConnector factory =3D new JDBCConnector(); + factory.setUseCredentialMap(true); + factory.setAdminConnectionsAllowed(false); + factory.start(env); try { + ExecutionContext ctx =3D createSecurityContext("pw1", false, f= actory); //$NON-NLS-1$ factory.getConnection(ctx); fail("expected failure"); //$NON-NLS-1$ } catch (ConnectorException e) { @@ -63,20 +68,14 @@ = private ConnectorEnvironment initConnectorEnvironment() throws Excepti= on { final Properties connProps =3D new Properties(); - connProps.put(JDBCPropertyNames.DRIVER_CLASS, "com.metamatrix.jdbc= .oracle.OracleDriver"); //$NON-NLS-1$ + connProps.put(JDBCPropertyNames.CONNECTION_SOURCE_CLASS, "com.meta= matrix.jdbc.oracle.OracleDriver"); //$NON-NLS-1$ connProps.put(JDBCPropertyNames.URL, TEST_URL); = connProps.put(ConnectorPropertyNames.CONNECTOR_BINDING_NAME, "orac= le system"); //$NON-NLS-1$ connProps.put(JDBCPropertyNames.EXT_CAPABILITY_CLASS, "com.metamat= rix.connector.jdbc.oracle.OracleCapabilities"); //$NON-NLS-1$ - connProps.put(JDBCPropertyNames.EXT_CONNECTION_FACTORY_CLASS, "com= .metamatrix.connector.jdbc.oracle.OracleUserIdentityConnectionFactory"); //= $NON-NLS-1$ - connProps.put(JDBCPropertyNames.EXT_SQL_TRANSLATOR_CLASS, "com.met= amatrix.connector.jdbc.oracle.OracleSQLTranslator"); //$NON-NLS-1$ - connProps.put(JDBCPropertyNames.EXT_RESULTS_TRANSLATOR_CLASS, "com= .metamatrix.connector.jdbc.oracle.OracleResultsTranslator"); //$NON-NLS-1$ - ConnectorEnvironment env =3D Mockito.mock(ConnectorEnvironment.cla= ss); - Mockito.stub(env.getConnectorName()).toReturn("oracle system"); //= $NON-NLS-1$ - Mockito.stub(env.getProperties()).toReturn(connProps); - return env; + return EnvironmentUtility.createEnvironment(connProps, false); } = - private ExecutionContext createSecurityContext(String credentialsStr, = boolean useMap, JDBCSourceConnectionFactory factory) throws Exception { + private ExecutionContext createSecurityContext(String credentialsStr, = boolean useMap, JDBCConnector factory) throws Exception { Serializable credentials =3D credentialsStr; if (useMap) { credentials =3D CredentialMap.parseCredentials(credentialsStr); @@ -90,28 +89,37 @@ = public void testCredentialMapInSessionPayload() throws Exception { ConnectorEnvironment env =3D initConnectorEnvironment(); - JDBCSourceConnectionFactory factory =3D new MockExampleConnectionF= actory(); - factory.initialize(env); + JDBCConnector factory =3D new JDBCConnector() { + @Override + public DataSource getDataSource() { + return Mockito.mock(DataSource.class); + } + }; + factory.setUseCredentialMap(true); + factory.setAdminConnectionsAllowed(false); + factory.setConnectorName("oracle system"); + factory.start(env); = ExecutionContext ctx =3D createSecurityContext("(system=3Doracle s= ystem,user=3Dbqt2,password=3Dmm)", true, factory); //$NON-NLS-1$ - MockSourceConnection conn =3D (MockSourceConnection)factory.getCon= nection(ctx); - assertEquals("bqt2", conn.getUser()); //$NON-NLS-1$ - assertEquals("mm", conn.getPassword()); //$NON-NLS-1$ + factory.getConnection(ctx); } = public void testCredentialMapMissingSystem() throws Exception { ConnectorEnvironment env =3D initConnectorEnvironment(); - JDBCSourceConnectionFactory factory =3D new MockExampleConnectionF= actory(); - factory.initialize(env); + JDBCConnector factory =3D new JDBCConnector(); + factory.setUseCredentialMap(true); + factory.setAdminConnectionsAllowed(false); + factory.setConnectorName("oracle system"); + factory.start(env); = // Set system to "x" instead of "oracle system" which will cause n= o credentials to be found - ExecutionContext ctx =3D createSecurityContext("(system=3Dx,user= =3Dbqt2,password=3Dmm)", true, factory); //$NON-NLS-1$ try { + ExecutionContext ctx =3D createSecurityContext("(system=3Dx,us= er=3Dbqt2,password=3Dmm)", true, factory); //$NON-NLS-1$ factory.getConnection(ctx); fail("Expected exception when creating connection with missing= system credentials"); //$NON-NLS-1$ } catch(Exception e) { // expected - assertEquals("Required connection property \"user\" missing fo= r system \"oracle system\".", e.getMessage()); //$NON-NLS-1$ + assertEquals("Payload missing credentials for oracle system", = e.getMessage()); //$NON-NLS-1$ } } = Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/util/TestFunctionReplacementVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/util/TestFunctionReplacementVisitor.java 2009-02-23 16:17:44 UTC (rev = 480) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/util/TestFunctionReplacementVisitor.java 2009-02-23 17:43:19 UTC (rev = 481) @@ -28,7 +28,7 @@ import junit.framework.TestCase; = import com.metamatrix.connector.jdbc.MetadataFactory; -import com.metamatrix.connector.jdbc.extension.impl.DropFunctionModifier; +import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; import com.metamatrix.connector.language.ICommand; = /** Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnection.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnection.java 2009-02-23 17:43:19 UTC (rev 481) @@ -39,12 +39,11 @@ import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.pool.PoolAwareConnection; = /** = * Represents a connection to an LDAP data source. = */ -public class LDAPConnection extends BasicConnection implements PoolAwareCo= nnection { = +public class LDAPConnection extends BasicConnection { = = // Standard Connection data members private ConnectorLogger logger; Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/Connector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/Connector.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/Connector.java 2009-02-23 17:43:19 UTC (rev 481) @@ -34,10 +34,10 @@ import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.pool.ConnectorIdentity; -import com.metamatrix.connector.pool.ConnectorIdentityFactory; -import com.metamatrix.connector.pool.SingleIdentityFactory; -import com.metamatrix.connector.pool.UserIdentityFactory; +import com.metamatrix.connector.identity.ConnectorIdentity; +import com.metamatrix.connector.identity.ConnectorIdentityFactory; +import com.metamatrix.connector.identity.SingleIdentityFactory; +import com.metamatrix.connector.identity.UserIdentityFactory; import com.metamatrix.connector.salesforce.connection.SalesforceConnection; = @ConnectionPooling Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/connection/SalesforceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/connection/SalesforceConnection.java 2009-02-23 16:17:44 U= TC (rev 480) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/connection/SalesforceConnection.java 2009-02-23 17:43:19 U= TC (rev 481) @@ -33,7 +33,6 @@ import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.pool.PoolAwareConnection; import com.metamatrix.connector.salesforce.Messages; import com.metamatrix.connector.salesforce.connection.impl.ConnectionImpl; import com.metamatrix.connector.salesforce.execution.DataPayload; @@ -41,7 +40,7 @@ import com.metamatrix.connector.salesforce.execution.UpdateExecutionParent; import com.sforce.soap.partner.QueryResult; = -public class SalesforceConnection extends BasicConnection implements PoolA= wareConnection { +public class SalesforceConnection extends BasicConnection { = private ConnectorEnvironment connectorEnv; private ConnectionImpl connection; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/ObjectConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnection.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnection.java 2009-02-23 17:43:19 UTC (rev 481) @@ -35,13 +35,12 @@ import com.metamatrix.connector.object.extension.IObjectSource; import com.metamatrix.connector.object.extension.ISourceTranslator; import com.metamatrix.connector.object.util.ObjectConnectorUtil; -import com.metamatrix.connector.pool.PoolAwareConnection; import com.metamatrix.core.util.ArgCheck; = /** * Implementation of Connection interface for Object connection. */ -public class ObjectConnection extends BasicConnection implements PoolAware= Connection { +public class ObjectConnection extends BasicConnection { = // private static final String DEFAULT_TRANSLATOR =3D "com.metamatrix.c= onnector.object.extension.source.BasicSourceTranslator";//$NON-NLS-1$ = Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/ObjectConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnector.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnector.java 2009-02-23 17:43:19 UTC (rev 481) @@ -29,9 +29,9 @@ import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.identity.ConnectorIdentity; +import com.metamatrix.connector.identity.ConnectorIdentityFactory; import com.metamatrix.connector.object.util.ObjectConnectorUtil; -import com.metamatrix.connector.pool.ConnectorIdentity; -import com.metamatrix.connector.pool.ConnectorIdentityFactory; = /** * Implmentation of the connector interface. Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/SourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/SourceConnectionFactory.java 2009-02-23 16:17:44 UTC (rev = 480) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/SourceConnectionFactory.java 2009-02-23 17:43:19 UTC (rev = 481) @@ -4,9 +4,8 @@ import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.pool.ConnectorIdentity; -import com.metamatrix.connector.pool.SingleIdentity; -import com.metamatrix.connector.pool.UserIdentity; +import com.metamatrix.connector.identity.ConnectorIdentity; +import com.metamatrix.connector.identity.SingleIdentity; = public interface SourceConnectionFactory { = @@ -30,7 +29,7 @@ * Create an identity object based on a security context. This method= determines * how different security contexts are treated within the connection p= ool. For = * example, using a {@link SingleIdentity} specifies that ALL contexts= are treated - * equally and thus use the same pool. A {@link UserIdentity} specifi= es that contexts + * equally and thus use the same pool. A {@link CredentialMapIdentity= } specifies that contexts * are differentiated based on user name, thus creating a per-user poo= l of connections. * Implementors of this class may use a different implementation of th= e = * {@link ConnectorIdentity} interface to similarly affect pooling. = Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/source/BaseSourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BaseSourceConnectionFactory.java 2009-02-= 23 16:17:44 UTC (rev 480) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BaseSourceConnectionFactory.java 2009-02-= 23 17:43:19 UTC (rev 481) @@ -28,11 +28,11 @@ import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.identity.ConnectorIdentity; +import com.metamatrix.connector.identity.SingleIdentity; import com.metamatrix.connector.object.ObjectConnection; import com.metamatrix.connector.object.SourceConnectionFactory; import com.metamatrix.connector.object.extension.IObjectSource; -import com.metamatrix.connector.pool.ConnectorIdentity; -import com.metamatrix.connector.pool.SingleIdentity; = /** * Represents a base factory class for the creation of the source connecti= on. Subclasses @@ -60,7 +60,7 @@ = = /** = - * @see com.metamatrix.data.pool.SourceConnectionFactory#createConnect= ion(com.metamatrix.connector.pool.ConnectorIdentity) + * @see com.metamatrix.data.pool.SourceConnectionFactory#createConnect= ion(com.metamatrix.connector.identity.ConnectorIdentity) * @since 4.3 */ public final Connection createConnection(ConnectorIdentity id) throws = ConnectorException { @@ -81,7 +81,7 @@ * @since 4.3 */ public ConnectorIdentity createIdentity(ExecutionContext context) thro= ws ConnectorException { - return new SingleIdentity(context); + return new SingleIdentity(); } = } Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java 20= 09-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java 20= 09-02-23 17:43:19 UTC (rev 481) @@ -24,7 +24,7 @@ = import java.util.List; = -import com.metamatrix.connector.jdbc.extension.impl.BasicFunctionModifier; +import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILiteral; Deleted: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/co= m/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialResultsTranslator.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialResultsTranslator.java 2= 009-02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialResultsTranslator.java 2= 009-02-23 17:43:19 UTC (rev 481) @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - * Created on Mar 20, 2004 To change the template for this generated file = go to Window>Preferences>Java>Code - * Generation>Code and Comments - */ -package com.metamatrix.connector.jdbc.oracle.spatial; - -import java.util.ArrayList; -import java.util.List; - -import com.metamatrix.connector.jdbc.oracle.OracleResultsTranslator; - -public class OracleSpatialResultsTranslator extends OracleResultsTranslato= r { - - private List translators; - - public OracleSpatialResultsTranslator() { - ArrayList translators =3D new ArrayList(); - if (super.getValueTranslators() !=3D null) { - translators.addAll(super.getValueTranslators()); - } - } - - public List getValueTranslators() { - return translators; - } - -} \ No newline at end of file Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-= 02-23 16:17:44 UTC (rev 480) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-= 02-23 17:43:19 UTC (rev 481) @@ -30,7 +30,7 @@ import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.extension.SQLTranslator; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ICriteria; import com.metamatrix.connector.language.IFunction; @@ -39,7 +39,7 @@ import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.connector.visitor.util.CollectorVisitor; = -public class OracleSpatialSQLTranslator extends SQLTranslator { +public class OracleSpatialSQLTranslator extends Translator { = @Override public void initialize(ConnectorEnvironment env) throws ConnectorExceptio= n { Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services= /EmbeddedDataService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embed= dedDataService.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embed= dedDataService.java 2009-02-23 17:43:19 UTC (rev 481) @@ -72,7 +72,6 @@ public class EmbeddedDataService extends EmbeddedBaseDQPService implements= DataService { private static final String SYSTEM_PHYSICAL_MODEL_CONNECTOR_BINDING_CL= ASSNAME =3D "com.metamatrix.dqp.embedded.services.DefaultIndexConnectorBind= ing"; //$NON-NLS-1$ private static final String CONNECTOR_MGR_IMPL =3D "com.metamatrix.dqp= .internal.datamgr.impl.ConnectorManager"; //$NON-NLS-1$ = - private static final String CONNECTOR_CLASSPATH =3D "ConnectorClassPat= h"; //$NON-NLS-1$ = // Map of connector binding name to ConnectorID private Map connectorIDs =3D new HashMap(); @@ -562,34 +561,26 @@ throws ApplicationLifecycleException{ = try { - ConnectorManager mgr =3D null; // Ask the configuration if we can use the extension class loa= der. = boolean useExtensionClassPath =3D (getConfigurationService().u= seExtensionClasspath()); = - String classPath =3D connectorProperties.getProperty(CONNECTOR= _CLASSPATH); + String classPath =3D connectorProperties.getProperty(Connector= PropertyNames.CONNECTOR_CLASSPATH); if (classPath =3D=3D null || classPath.length() =3D=3D 0) { useExtensionClassPath =3D false; } = if (!useExtensionClassPath) { - connectorProperties.setProperty(ConnectorPropertyNames.DEREGI= STER_DRIVER, ConnectorPropertyNames.DEREGISTER_BY_CLASSNAME); - mgr =3D new ConnectorManager(); + return new ConnectorManager(); } - else { - DQPEmbeddedPlugin.logInfo("DataService.useClassloader", ne= w Object[] {classPath}); //$NON-NLS-1$ - URL context =3D getConfigurationService().getExtensionPath= (); - URL[] urlPath =3D ExtensionModuleReader.resolveExtensionCl= asspath(classPath, context); - = - ClassLoader classLoader =3D new URLFilteringClassLoader(ur= lPath, Thread.currentThread().getContextClassLoader(), new MetaMatrixURLStr= eamHandlerFactory()); - Class cmgrImplClass =3D classLoader.loadClass(CONNECTOR_MG= R_IMPL); - = - // Here even though we use a new class loader for the CM, = we actually setting the - // class loader for the JDBC Connectors. Since the CM may = already be loaded, getClass().getCL() - // will return a another CL than, above so to cheat we do = this below property. - connectorProperties.put(ConnectorPropertyNames.CONNECTOR_C= LASS_LOADER, classLoader); - = - return (ConnectorManager)cmgrImplClass.newInstance(); = = - } - return mgr; + DQPEmbeddedPlugin.logInfo("DataService.useClassloader", new Ob= ject[] {classPath}); //$NON-NLS-1$ + URL context =3D getConfigurationService().getExtensionPath(); + URL[] urlPath =3D ExtensionModuleReader.resolveExtensionClassp= ath(classPath, context); + = + ClassLoader classLoader =3D new URLFilteringClassLoader(urlPat= h, Thread.currentThread().getContextClassLoader(), new MetaMatrixURLStreamH= andlerFactory()); + Class cmgrImplClass =3D classLoader.loadClass(CONNECTOR_MGR_IM= PL); + = + ConnectorManager cm =3D (ConnectorManager)cmgrImplClass.newIns= tance(); + cm.setClassloader(classLoader); + return cm; } catch (Exception e) { throw new ApplicationLifecycleException(e); } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ConnectorManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorManager.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorManager.java 2009-02-23 17:43:19 UTC (rev 481) @@ -61,7 +61,9 @@ import com.metamatrix.connector.internal.ConnectorPropertyNames; import com.metamatrix.connector.xa.api.XAConnection; import com.metamatrix.connector.xa.api.XAConnector; +import com.metamatrix.core.MetaMatrixCoreException; import com.metamatrix.core.util.Assertion; +import com.metamatrix.core.util.ReflectionHelper; import com.metamatrix.core.util.StringUtil; import com.metamatrix.dqp.DQPPlugin; import com.metamatrix.dqp.internal.cache.ResultSetCache; @@ -338,17 +340,21 @@ */ private void initStartConnector(String connectorName, ConnectorEnviron= ment env) throws ApplicationLifecycleException { String connectorClassName =3D env.getProperties().getProperty(Conn= ectorPropertyNames.CONNECTOR_CLASS); - classloader =3D (ClassLoader)props.get(ConnectorPropertyNames.CONN= ECTOR_CLASS_LOADER); if(classloader =3D=3D null){ classloader =3D getClass().getClassLoader(); + } else { + env.getProperties().setProperty(ConnectorPropertyNames.USING_CUST= OM_CLASSLOADER, Boolean.TRUE.toString()); } Thread currentThread =3D Thread.currentThread(); ClassLoader threadContextLoader =3D currentThread.getContextClassL= oader(); try { currentThread.setContextClassLoader(classloader); - Class clazz =3D classloader.loadClass(connectorClassName); - - Connector c =3D (Connector) clazz.newInstance(); + Connector c; + try { + c =3D (Connector)ReflectionHelper.create(connectorClassName, null, cla= ssloader); + } catch (MetaMatrixCoreException e) { + throw new ApplicationLifecycleException(e, DQPPlugin.Util.get= String("failed_find_Connector_class", connectorClassName)); //$NON-NLS-1$ + } if(c instanceof XAConnector){ this.isXa =3D true; if (this.getTransactionService() =3D=3D null) { = = @@ -371,15 +377,21 @@ if (this.isXa) { if (this.connector.supportsSingleIdentity()) { // add this connector as the recovery source - final XAConnection xaConn =3D ((XAConnector)connector).getXAConnectio= n(null, null); - TransactionServer ts =3D this.getTransactionService().get= TransactionServer(); = ts.registerRecoverySource(connectorName, new TransactionP= rovider.XAConnectionSource() { - + XAConnection conn =3D null; + = @Override public XAResource getXAResource() throws SQLException { + if (conn =3D=3D null) { + try { + conn =3D ((XAConnector)connector).getXAConnection(null, null); + } catch (ConnectorException e) { + throw new SQLException(e); + } + } try { - return xaConn.getXAResource(); + return conn.getXAResource(); } catch (ConnectorException e) { throw new SQLException(e); } @@ -387,19 +399,15 @@ = @Override public void close() { - xaConn.close(); + if (conn !=3D null) { + conn.close(); + } } }); } else { LogManager.logWarning(LogConstants.CTX_CONNECTOR, DQPPlug= in.Util.getString("ConnectorManager.cannot_add_to_recovery", this.getName()= )); //$NON-NLS-1$ = } } - } catch (InstantiationException e) { - throw new ApplicationLifecycleException(e, DQPPlugin.Util.getS= tring("failed_instantiate_Connector_class", new Object[]{connectorClassName= })); //$NON-NLS-1$ - } catch (IllegalAccessException e) { - throw new ApplicationLifecycleException(e, DQPPlugin.Util.getS= tring("failed_access_Connector_class", new Object[]{connectorClassName})); = //$NON-NLS-1$ - } catch (ClassNotFoundException e) { - throw new ApplicationLifecycleException(e, DQPPlugin.Util.getS= tring("failed_find_Connector_class", connectorClassName)); //$NON-NLS-1$ } catch (ConnectorException e) { throw new ApplicationLifecycleException(e, DQPPlugin.Util.getS= tring("failed_start_Connector", new Object[] {this.getConnectorID(), e.getM= essage()})); //$NON-NLS-1$ } finally { @@ -609,6 +617,10 @@ return isXa; } = + public void setClassloader(ClassLoader classloader) { + this.classloader =3D classloader; + } + = /** * Overloads the connector capabilities with one defined in the connector= binding properties */ Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ConnectorWrapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWrapper.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWrapper.java 2009-02-23 17:43:19 UTC (rev 481) @@ -28,9 +28,9 @@ import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.pool.ConnectorIdentity; -import com.metamatrix.connector.pool.ConnectorIdentityFactory; -import com.metamatrix.connector.pool.SingleIdentity; +import com.metamatrix.connector.identity.ConnectorIdentity; +import com.metamatrix.connector.identity.ConnectorIdentityFactory; +import com.metamatrix.connector.identity.SingleIdentity; import com.metamatrix.connector.xa.api.TransactionContext; import com.metamatrix.connector.xa.api.XAConnection; import com.metamatrix.connector.xa.api.XAConnector; @@ -116,7 +116,7 @@ if (actualConnector instanceof ConnectorIdentityFactory) { return ((ConnectorIdentityFactory)actualConnector).createIdentity(conte= xt); } - return new SingleIdentity(context); + return new SingleIdentity(); } = public boolean supportsSingleIdentity() { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ExecutionContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Exe= cutionContextImpl.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Exe= cutionContextImpl.java 2009-02-23 17:43:19 UTC (rev 481) @@ -29,7 +29,7 @@ = import com.metamatrix.common.buffer.impl.BufferConfig; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.pool.ConnectorIdentity; +import com.metamatrix.connector.identity.ConnectorIdentity; import com.metamatrix.core.util.HashCodeUtil; = /** Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/co= nnector/ConnectionPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionPool.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionPool.java 2009-02-23 17:43:19 UTC (rev 481) @@ -43,9 +43,9 @@ import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.pool.ConnectorIdentity; -import com.metamatrix.connector.pool.PoolAwareConnection; -import com.metamatrix.connector.pool.SingleIdentity; +import com.metamatrix.connector.identity.ConnectorIdentity; +import com.metamatrix.connector.identity.PoolAwareConnection; +import com.metamatrix.connector.identity.SingleIdentity; import com.metamatrix.connector.xa.api.TransactionContext; import com.metamatrix.connector.xa.api.XAConnector; import com.metamatrix.core.log.MessageLevel; @@ -208,7 +208,7 @@ id =3D executionContext.getConnectorIdentity(); } if (id =3D=3D null) { - id =3D new SingleIdentity(executionContext); + id =3D new SingleIdentity(); } = LogManager.logTrace(CTX_CONNECTOR, new Object[] {"Obtaining connec= tion for id", id}); //$NON-NLS-1$ = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/co= nnector/ConnectionWrapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionWrapper.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionWrapper.java 2009-02-23 17:43:19 UTC (rev 481) @@ -29,10 +29,10 @@ import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.Execution; import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.identity.ConnectorIdentity; +import com.metamatrix.connector.identity.PoolAwareConnection; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.pool.ConnectorIdentity; -import com.metamatrix.connector.pool.PoolAwareConnection; import com.metamatrix.connector.xa.api.XAConnection; = public class ConnectionWrapper implements PoolAwareConnection, XAConnectio= n { @@ -66,13 +66,11 @@ if (isDead) { return false; } - if (connection instanceof PoolAwareConnection) { - long now =3D System.currentTimeMillis(); - if (now - lastTest > testInterval) { - boolean result =3D ((PoolAwareConnection)connection).isAlive(); - lastTest =3D now; = - this.isDead =3D !result; - } + long now =3D System.currentTimeMillis(); + if (now - lastTest > testInterval) { + boolean result =3D connection.isAlive(); + lastTest =3D now; = + this.isDead =3D !result; } return !isDead; } Modified: trunk/engine/src/main/java/com/metamatrix/query/function/Function= Library.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/function/FunctionLibrar= y.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/engine/src/main/java/com/metamatrix/query/function/FunctionLibrar= y.java 2009-02-23 17:43:19 UTC (rev 481) @@ -341,7 +341,15 @@ = // Invoke the method and return the result try { - return method.invoke(null, values); + Object result =3D method.invoke(null, values); + if (result instanceof String) { + String str =3D (String)result; + if (str.length() > DataTypeManager.MAX_STRING_LENGTH) { + return str.substring(0, DataTypeManager.MAX_STRING_LENGTH); + } + return result; + } = + return DataTypeManager.convertToRuntimeType(result); } catch(InvocationTargetException e) { throw new FunctionExecutionException(e.getTargetException(), E= rrorMessageKeys.FUNCTION_0003, QueryPlugin.Util.getString(ErrorMessageKeys.= FUNCTION_0003, fd.getName())); } catch(IllegalAccessException e) { Modified: trunk/engine/src/main/java/com/metamatrix/query/function/Function= Methods.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/function/FunctionMethod= s.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/engine/src/main/java/com/metamatrix/query/function/FunctionMethod= s.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1205,9 +1205,6 @@ for (int i =3D 0; i < repeatCount && result.length() <=3D DataTypeManag= er.MAX_STRING_LENGTH; i++) { result.append((String)str); } - if (result.length() > DataTypeManager.MAX_STRING_LENGTH) { - return result.substring(0, DataTypeManager.MAX_STRING_LENGTH); - } return result.toString(); } = Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/im= pl/TestConnectorManagerImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Tes= tConnectorManagerImpl.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Tes= tConnectorManagerImpl.java 2009-02-23 17:43:19 UTC (rev 481) @@ -137,7 +137,6 @@ ConnectorManager cm =3D new ConnectorManager(); Properties props =3D new Properties(); props.setProperty(ConnectorPropertyNames.CONNECTOR_CLASS, FakeConn= ector.class.getName()); - props.put(ConnectorPropertyNames.CONNECTOR_CLASS_LOADER, this.getC= lass().getClassLoader()); startConnectorManager(cm, props); assertTrue(cm.isXa()); cm.stop(); @@ -154,7 +153,6 @@ final String connectorName =3D FakeConnector.class.getName(); props.setProperty(ConnectorPropertyNames.CONNECTOR_CLASS, connecto= rName);//$NON-NLS-1$ URLClassLoader cl =3D new URLClassLoader(new URL[0]); - props.put(ConnectorPropertyNames.CONNECTOR_CLASS_LOADER, cl); startConnectorManager(cm, props); ((FakeConnector)cm.getConnector().getActualConnector()).setClasslo= ader(cl); AtomicRequestMessage request =3D TestConnectorWorkItem.createNewAt= omicRequestMessage(1, 1); Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/FakeUserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeUserIdentityConnectionFactory.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeUserIdentityConnectionFactory.java 2009-02-23 17:43:19 UTC (rev 481) @@ -26,9 +26,9 @@ = import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.pool.ConnectorIdentity; -import com.metamatrix.connector.pool.ConnectorIdentityFactory; -import com.metamatrix.connector.pool.UserIdentity; +import com.metamatrix.connector.identity.ConnectorIdentity; +import com.metamatrix.connector.identity.ConnectorIdentityFactory; +import com.metamatrix.connector.identity.UserIdentity; = /** */ @@ -42,7 +42,7 @@ return null; } //use user name for now - return new UserIdentity(context); + return new UserIdentity(context.getUser(), null, null); } = } Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/TestConnectionPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionPool.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionPool.java 2009-02-23 17:43:19 UTC (rev 481) @@ -29,7 +29,7 @@ import junit.framework.TestCase; = import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.pool.UserIdentity; +import com.metamatrix.connector.identity.UserIdentity; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorWrapper; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; = @@ -69,7 +69,7 @@ public static ExecutionContext createContext(final String user, boolea= n userIdentity) { ExecutionContextImpl context =3D new ExecutionContextImpl(null, null,= user, null, null, null, null, null, null, null, false); if (userIdentity) { - context.setConnectorIdentity(new UserIdentity(context)); + context.setConnectorIdentity(new UserIdentity(context.getUser(), nul= l, null)); } return context; } Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/TestConnectionWrapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionWrapper.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionWrapper.java 2009-02-23 17:43:19 UTC (rev 481) @@ -27,7 +27,7 @@ import org.mockito.Mockito; = import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.pool.PoolAwareConnection; +import com.metamatrix.connector.identity.PoolAwareConnection; = public class TestConnectionWrapper extends TestCase { = Modified: trunk/server/src/main/java/com/metamatrix/server/connector/servic= e/ConnectorService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/connector/service/Conn= ectorService.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/server/src/main/java/com/metamatrix/server/connector/service/Conn= ectorService.java 2009-02-23 17:43:19 UTC (rev 481) @@ -245,8 +245,8 @@ String connID =3D id.getVMControllerID().getID() + "|" + id.ge= tID(); //$NON-NLS-1$ deMaskedProps.put(ConnectorPropertyNames.CONNECTOR_ID, connID); deMaskedProps.put(ConnectorPropertyNames.CONNECTOR_BINDING_NAM= E, getInstanceName()); - deMaskedProps.put(ConnectorPropertyNames.CONNECTOR_CLASS_LOADE= R, loader); deMaskedProps.put(ConnectorPropertyNames.CONNECTOR_VM_NAME, VM= Naming.getVMName()); + connectorManager.setClassloader(loader); connectorManager.initialize(deMaskedProps); return connectorManager; = @@ -263,7 +263,7 @@ // Decrypt masked properties Properties deMaskedProps =3D decryptMaskedProperties(props); = - String urls =3D deMaskedProps.getProperty(ConnectorServiceProperty= Names.CONNECTOR_CLASS_PATH); + String urls =3D deMaskedProps.getProperty(ConnectorPropertyNames.C= ONNECTOR_CLASSPATH); = ClassLoader loader =3D getCustomClassLoader(urls); // Build a Connector manager using the custom class loader and ini= tialize Deleted: trunk/server/src/main/java/com/metamatrix/server/connector/service= /ConnectorServicePropertyNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/connector/service/Conn= ectorServicePropertyNames.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/server/src/main/java/com/metamatrix/server/connector/service/Conn= ectorServicePropertyNames.java 2009-02-23 17:43:19 UTC (rev 481) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - * Date: Sep 25, 2003 - * Time: 4:38:45 PM - */ -package com.metamatrix.server.connector.service; - -/** - * ConnectorServicePropertyNames. - */ -public class ConnectorServicePropertyNames { - - /** - * Don't allow instantiation. - */ - private ConnectorServicePropertyNames() { - } - - /** Metadata service - provides acecss to runtime metadata */ - public static final String METADATA_SERVICE =3D "dqp.metadata"; //$NON= -NLS-1$ - = - public static final String CONNECTOR_CLASS_PATH =3D "ConnectorClassPat= h"; //$NON-NLS-1$ -} Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/extension/TestSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-23 17:43:19 UTC (rev 481) @@ -33,6 +33,9 @@ import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.jdbc.JDBCPropertyNames; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ILanguageObject; @@ -115,7 +118,7 @@ private String getStringWithContext(ILanguageObject obj) throws Connec= torException { Properties props =3D new Properties(); = props.setProperty(JDBCPropertyNames.USE_COMMENTS_SOURCE_QUERY, Boo= lean.TRUE.toString()); - SQLTranslator trans =3D new SQLTranslator(); + Translator trans =3D new Translator(); trans.initialize(EnvironmentUtility.createEnvironment(props, false= )); SQLConversionVisitor visitor =3D new SQLConversionVisitor(trans); visitor.setExecutionContext(context); @@ -136,7 +139,7 @@ boolean useMetadata, boolean u= sePreparedStatement) throws ConnectorException { // Apply function replacement FunctionReplacementVisitor funcVisitor =3D new FunctionReplacement= Visitor(modifiers); - SQLTranslator trans =3D new SQLTranslator(); + Translator trans =3D new Translator(); Properties p =3D new Properties(); if (usePreparedStatement) { p.setProperty(JDBCPropertyNames.USE_BIND_VARIABLES, Boolean.TRUE.= toString()); Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/oracle/TestOracleSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/orac= le/TestOracleSQLConversionVisitor.java 2009-02-23 16:17:44 UTC (rev 480) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/orac= le/TestOracleSQLConversionVisitor.java 2009-02-23 17:43:19 UTC (rev 481) @@ -34,8 +34,8 @@ import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.jdbc.JDBCPropertyNames; -import com.metamatrix.connector.jdbc.extension.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.extension.TranslatedCommand; +import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; +import com.metamatrix.connector.jdbc.translator.TranslatedCommand; import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/test-integration/src/test/resources/xml-vp/xmlvp.DEF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/resources/xml-vp/xmlvp.DEF 2009-02-23 1= 6:17:44 UTC (rev 480) +++ trunk/test-integration/src/test/resources/xml-vp/xmlvp.DEF 2009-02-23 1= 7:43:19 UTC (rev 481) @@ -45,115 +45,37 @@ - + - + - + - + - + - + - - - vdb - session - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - fal= se - - 5 - mm - 60 - 60 - bqt2 - false - false - com.metamatrix= .connector.jdbc.oracle.OracleCapabilities - 16384 - com.metamatrix.connector= .jdbc.JDBCConnector - 500000 - jdbc:mmx:oracle://slntds04:1521;SID= =3Dds04 - com.met= amatrix.connector.jdbc.oracle.OracleSingleIdentityConnectionFactory + 10000 120000 - com.metamatrix.server.= connector.service.ConnectorService - 0 - 5 5 - com.metama= trix.connector.jdbc.oracle.OracleSQLTranslator - extensionjar:MJjdbc.= jar;extensionjar:jdbcconn.jar - 120000 - com.metamatrix.jdbc.oracle.Oracl= eDriver - com.me= tamatrix.connector.jdbc.oracle.OracleResultsTranslator + + fal= se + extensionjar:loopbac= kconn.jar + 1 + com.metamatrix.server.= connector.service.ConnectorService + com.metamatrix.connector= .loopback.LoopbackConnector + 0 --===============8929463875138425339==-- From teiid-commits at lists.jboss.org Mon Feb 23 14:47:13 2009 Content-Type: multipart/mixed; boundary="===============1380852554293286492==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r482 - trunk/server/src/main/java/com/metamatrix/server. Date: Mon, 23 Feb 2009 14:46:08 -0500 Message-ID: --===============1380852554293286492== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-23 14:46:08 -0500 (Mon, 23 Feb 2009) New Revision: 482 Added: trunk/server/src/main/java/com/metamatrix/server/FileLogListenerProvider= .java Modified: trunk/server/src/main/java/com/metamatrix/server/Configuration.java trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceModu= le.java trunk/server/src/main/java/com/metamatrix/server/Main.java trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProvi= der.java Log: TEIID-361 Modified: trunk/server/src/main/java/com/metamatrix/server/Configuration.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/Configuration.java 200= 9-02-23 17:43:19 UTC (rev 481) +++ trunk/server/src/main/java/com/metamatrix/server/Configuration.java 200= 9-02-23 19:46:08 UTC (rev 482) @@ -28,5 +28,7 @@ final String VMNAME =3D "VMName"; //$NON-NLS-1$ final String VMID =3D "VMId"; //$NON-NLS-1$ final String CLUSTERNAME =3D "ClusterName"; //$NON-NLS-1$ + final String LOGFILE =3D "LogFile"; //$NON-NLS-1$ + final String LOGDIR =3D "LogDir"; //$NON-NLS-1$ = } Added: trunk/server/src/main/java/com/metamatrix/server/FileLogListenerProv= ider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/FileLogListenerProvide= r.java (rev 0) +++ trunk/server/src/main/java/com/metamatrix/server/FileLogListenerProvide= r.java 2009-02-23 19:46:08 UTC (rev 482) @@ -0,0 +1,93 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.server; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.PrintStream; +import java.util.Properties; + +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.name.Named; +import com.metamatrix.common.config.CurrentConfiguration; +import com.metamatrix.core.MetaMatrixRuntimeException; +import com.metamatrix.core.log.FileLimitSizeLogWriter; +import com.metamatrix.core.log.LogListener; +import com.metamatrix.internal.core.log.PlatformLog; + +public class FileLogListenerProvider implements Provider { + + @Inject + @Named(com.metamatrix.server.Configuration.LOGFILE) + String logFile; + + @Inject + @Named(com.metamatrix.server.Configuration.LOGDIR) = + String path; + = + @Override + public LogListener get() { + final PlatformLog log =3D new PlatformLog(); + try { + FileLimitSizeLogWriter flw =3D buildFileLogger(); = + log.addListener(flw); + } catch (FileNotFoundException e) { + throw new MetaMatrixRuntimeException(e); + } + return log; + } + + = + FileLimitSizeLogWriter buildFileLogger() throws FileNotFoundException { + File tmpFile =3D new File(path, logFile); + tmpFile.getParentFile().mkdirs(); + + // if log file exists then create a archive + if (tmpFile.exists()) { + int index =3D logFile.lastIndexOf("."); //$NON-NLS-1$ + String archiveName =3D FileLimitSizeLogWriter.buildArchiveFileName(logF= ile.substring(0, index), logFile.substring(index)); + tmpFile.renameTo(new File(path, archiveName)); + } + + FileOutputStream fos =3D new FileOutputStream(tmpFile); + PrintStream ps =3D new PrintStream(fos); + + System.setOut(ps); + System.setErr(ps); + + Properties logProps =3D new Properties(); + Properties configProps =3D CurrentConfiguration.getInstance().getPropert= ies(); + if (configProps.containsKey(FileLimitSizeLogWriter.FILE_SIZE_LIMIT)) { + logProps.setProperty(FileLimitSizeLogWriter.FILE_SIZE_LIMIT,configProps= .getProperty(FileLimitSizeLogWriter.FILE_SIZE_LIMIT)); + } + if (configProps.containsKey(FileLimitSizeLogWriter.FILE_SIZE_MONITOR_TIM= E)) { + logProps.setProperty(FileLimitSizeLogWriter.FILE_SIZE_MONITOR_TIME,conf= igProps.getProperty(FileLimitSizeLogWriter.FILE_SIZE_MONITOR_TIME)); + } + + FileLimitSizeLogWriter flw =3D new FileLimitSizeLogWriter(tmpFile,logPro= ps, false); + return flw; + } + = +} Property changes on: trunk/server/src/main/java/com/metamatrix/server/FileL= ogListenerProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/server/src/main/java/com/metamatrix/server/HostControllerGu= iceModule.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceMod= ule.java 2009-02-23 17:43:19 UTC (rev 481) +++ trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceMod= ule.java 2009-02-23 19:46:08 UTC (rev 482) @@ -64,6 +64,9 @@ bindConstant().annotatedWith(Names.named(Configuration.HOSTNAME)).to(hos= t.getFullName()); bind(Host.class).annotatedWith(Names.named(Configuration.HOST)).toInstan= ce(host); bindConstant().annotatedWith(Names.named(Configuration.CLUSTERNAME)).to(= systemName); + bindConstant().annotatedWith(Names.named(Configuration.LOGFILE)).to(Stri= ngUtil.replaceAll(host.getFullName(), ".", "_")+"_hc.log"); //$NON-NLS-1$ /= /$NON-NLS-2$ //$NON-NLS-3$ + bindConstant().annotatedWith(Names.named(Configuration.LOGDIR)).to(host.= getLogDirectory()); + = = Names.bindProperties(binder(), CurrentConfiguration.getInstance().getPro= perties()); = @@ -77,8 +80,7 @@ = bind(LogConfiguration.class).toProvider(LogConfigurationProvider.class).= in(Scopes.SINGLETON); = = - String logFileName =3D StringUtil.replaceAll(host.getFullName(), "= .", "_")+"_hc.log"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - bind(LogListener.class).toProvider(new ServerLogListernerProvider(host.g= etLogDirectory(), logFileName, false)).in(Scopes.SINGLETON); = + bind(LogListener.class).toProvider(FileLogListenerProvider.class).in(Sco= pes.SINGLETON); = = // this needs to be removed. binder().requestStaticInjection(LogManager.class); = Modified: trunk/server/src/main/java/com/metamatrix/server/Main.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/Main.java 2009-02-23 1= 7:43:19 UTC (rev 481) +++ trunk/server/src/main/java/com/metamatrix/server/Main.java 2009-02-23 1= 9:46:08 UTC (rev 482) @@ -55,44 +55,49 @@ @Inject LogListener logListener; = - public static void main(String[] args) throws Exception{ + public static void main(String[] args) { = - if (args.length < 2 || args.length > 4) { - System.out.println("Usage: java com.metamatrix.server.Main "); //$NON-NLS-1$ - System.exit(1); = - } + try { + if (args.length < 2 || args.length > 4) { + System.out.println("Usage: java com.metamatrix.server.Main "); //$NON-NLS-1$ + System.exit(1); = + } = - String vmName =3D args[0]; - String hostName =3D args[1]; + String vmName =3D args[0]; + String hostName =3D args[1]; = - Host host =3D null; - try { - host =3D CurrentConfiguration.getInstance().getHost(hostName); = - } catch (ConfigurationException e) { - } - = - if (host =3D=3D null) { - System.err.println(PlatformPlugin.Util.getString("SocketVMController= .5", hostName)); //$NON-NLS-1$ - System.exit(-1); - } - = - VMComponentDefn deployedVM =3D CurrentConfiguration.getInstance().= getConfiguration().getVMForHost(hostName, vmName); - String bindAddress =3D deployedVM.getBindAddress(); - = - VMNaming.setVMName(vmName); - VMNaming.setup(host.getFullName(), host.getHostAddress(), bindAddress); - = - // write info log - writeInfoLog(host, vmName); - = - createTempDirectory(); = - = - // wire up guice modules - Main main =3D loadMain(host, vmName); - = - // launch the server - = - main.launchServer(); + Host host =3D null; + try { + host =3D CurrentConfiguration.getInstance().getHost(hostName); = + } catch (ConfigurationException e) { + } + = + if (host =3D=3D null) { + System.err.println(PlatformPlugin.Util.getString("SocketVMControlle= r.5", hostName)); //$NON-NLS-1$ + System.exit(-1); + } + = + VMComponentDefn deployedVM =3D CurrentConfiguration.getInstance().getCo= nfiguration().getVMForHost(hostName, vmName); + String bindAddress =3D deployedVM.getBindAddress(); + = + VMNaming.setVMName(vmName); + VMNaming.setup(host.getFullName(), host.getHostAddress(), bindAddress); + = + // write info log + writeInfoLog(host, vmName); + = + createTempDirectory(); = + = + // wire up guice modules + Main main =3D loadMain(host, vmName); + = + // launch the server + = + main.launchServer(); + } catch (Throwable e) { + e.printStackTrace(); + throw new RuntimeException(e); + } = } = = Modified: trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModul= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java= 2009-02-23 17:43:19 UTC (rev 481) +++ trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java= 2009-02-23 19:46:08 UTC (rev 482) @@ -83,6 +83,8 @@ bindConstant().annotatedWith(Names.named(Configuration.VMID)).to(vmID); bind(Host.class).annotatedWith(Names.named(Configuration.HOST)).toInstan= ce(host); bindConstant().annotatedWith(Names.named(Configuration.CLUSTERNAME)).to(= systemName); + bindConstant().annotatedWith(Names.named(Configuration.LOGFILE)).to(Stri= ngUtil.replaceAll(host.getFullName(), ".", "_")+".log"); //$NON-NLS-1$ //$N= ON-NLS-2$ //$NON-NLS-3$ + bindConstant().annotatedWith(Names.named(Configuration.LOGDIR)).to(host.= getLogDirectory()); = Names.bindProperties(binder(), CurrentConfiguration.getInstance().getPro= perties()); = @@ -101,13 +103,9 @@ // this needs to be removed. binder().requestStaticInjection(PlatformProxyHelper.class); = + // Start the log file bind(LogConfiguration.class).toProvider(LogConfigurationProvider.class).= in(Scopes.SINGLETON); = bind(LogListener.class).toProvider(ServerLogListernerProvider.class).in(= Scopes.SINGLETON); = - - // Start the log file - String logFileName =3D StringUtil.replaceAll(host.getFullName(), "= .", "_")+".log"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - bind(LogListener.class).toProvider(new ServerLogListernerProvider(host.g= etLogDirectory(), logFileName, true)).in(Scopes.SINGLETON); = - = // this needs to be removed. binder().requestStaticInjection(LogManager.class); Modified: trunk/server/src/main/java/com/metamatrix/server/ServerLogListern= erProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProv= ider.java 2009-02-23 17:43:19 UTC (rev 481) +++ trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProv= ider.java 2009-02-23 19:46:08 UTC (rev 482) @@ -22,15 +22,11 @@ = package com.metamatrix.server; = -import java.io.File; import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.PrintStream; import java.util.EventObject; import java.util.Properties; = import com.google.inject.Inject; -import com.google.inject.Provider; import com.google.inject.Singleton; import com.metamatrix.common.config.CurrentConfiguration; import com.metamatrix.common.config.api.Configuration; @@ -49,62 +45,52 @@ import com.metamatrix.platform.config.event.ConfigurationChangeEvent; = @Singleton -class ServerLogListernerProvider implements Provider { - - String logFile; - String path; - boolean addDBLogger; - DbLogListener dbLogger; +class ServerLogListernerProvider extends FileLogListenerProvider { + public static final String LOG_DB_ENABLED =3D "metamatrix.log.jdbcData= base.enabled"; //$NON-NLS-1$ = @Inject MessageBus messsgeBus; = - public ServerLogListernerProvider(String path, String fileName, boolean a= ddDbLogger) { - this.path =3D path; - this.logFile =3D fileName; - this.addDBLogger =3D addDbLogger; - } - = @Override public LogListener get() { = - final PlatformLog realLog =3D new PlatformLog(); + final PlatformLog log =3D new PlatformLog(); = try { FileLimitSizeLogWriter flw =3D buildFileLogger(); = - realLog.addListener(flw); + log.addListener(flw); = } catch (FileNotFoundException e) { throw new MetaMatrixRuntimeException(e); } = - if (this.addDBLogger) { - this.dbLogger =3D buildDBLogger(); - realLog.addListener(this.dbLogger); = - = - try { - = - this.messsgeBus.addListener(ConfigurationChangeEvent.class, new EventO= bjectListener() { - = - public void processEvent(EventObject obj) { + final DbLogListener dbLogger =3D buildDBLogger(); + log.addListener(dbLogger); = + = + try { + = + this.messsgeBus.addListener(ConfigurationChangeEvent.class, new EventOb= jectListener() { + = + public void processEvent(EventObject obj) { + if(obj instanceof ConfigurationChangeEvent){ if(obj instanceof ConfigurationChangeEvent){ - if(obj instanceof ConfigurationChangeEvent){ - try { - Configuration currentConfig =3D CurrentConfiguration.getInstance(= ).getConfiguration(); - dbLogger.determineIfEnabled(currentConfig.getProperties()); - } catch( ConfigurationException ce ) { - LogManager.logError(LogContextsUtil.CommonConstants.CTX_MESSAGE_B= US, ce, ce.getMessage()); - } + try { + Configuration currentConfig =3D CurrentConfiguration.getInstance()= .getConfiguration(); + Properties props =3D currentConfig.getProperties(); + boolean enabled =3D PropertiesUtils.getBooleanProperty(props, LOG_= DB_ENABLED, true); + dbLogger.enableDBLogging(enabled); + } catch( ConfigurationException ce ) { + LogManager.logError(LogContextsUtil.CommonConstants.CTX_MESSAGE_BU= S, ce, ce.getMessage()); } } - } = - }); - = - } catch (MessagingException e) { - throw new MetaMatrixRuntimeException(e); - } = - } - return realLog; + } + } = + }); + = + } catch (MessagingException e) { + throw new MetaMatrixRuntimeException(e); + } = + return log; } = private DbLogListener buildDBLogger() { @@ -112,38 +98,5 @@ Properties resultsProps =3D PropertiesUtils.clone(currentProps, null, tr= ue, false); return new DbLogListener(resultsProps); } - - private FileLimitSizeLogWriter buildFileLogger() - throws FileNotFoundException { - File tmpFile =3D new File(path, logFile); - tmpFile.getParentFile().mkdirs(); - - // if log file exists then create a archive - if (tmpFile.exists()) { - int index =3D logFile.lastIndexOf("."); //$NON-NLS-1$ - String archiveName =3D FileLimitSizeLogWriter.buildArchiveFileName(logF= ile.substring(0, index), logFile.substring(index)); - tmpFile.renameTo(new File(path, archiveName)); - } - - FileOutputStream fos =3D new FileOutputStream(tmpFile); - PrintStream ps =3D new PrintStream(fos); - - System.setOut(ps); - System.setErr(ps); - - Properties logProps =3D new Properties(); - Properties configProps =3D CurrentConfiguration.getInstance().getPropert= ies(); - if (configProps.containsKey(FileLimitSizeLogWriter.FILE_SIZE_LIMIT)) { - logProps.setProperty(FileLimitSizeLogWriter.FILE_SIZE_LIMIT,configProps= .getProperty(FileLimitSizeLogWriter.FILE_SIZE_LIMIT)); - } - if (configProps.containsKey(FileLimitSizeLogWriter.FILE_SIZE_MONITOR_TIM= E)) { - logProps.setProperty(FileLimitSizeLogWriter.FILE_SIZE_MONITOR_TIME,conf= igProps.getProperty(FileLimitSizeLogWriter.FILE_SIZE_MONITOR_TIME)); - } - - FileLimitSizeLogWriter flw =3D new FileLimitSizeLogWriter(tmpFile,logPro= ps, false); - return flw; - } - = - = } --===============1380852554293286492==-- From teiid-commits at lists.jboss.org Mon Feb 23 14:51:45 2009 Content-Type: multipart/mixed; boundary="===============0436538437390037675==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r483 - in trunk/server/src/main/java/com/metamatrix: server and 1 other directory. Date: Mon, 23 Feb 2009 14:51:45 -0500 Message-ID: --===============0436538437390037675== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-23 14:51:45 -0500 (Mon, 23 Feb 2009) New Revision: 483 Modified: trunk/server/src/main/java/com/metamatrix/common/log/DbLogListener.java trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProvi= der.java Log: TEIID-361 Modified: trunk/server/src/main/java/com/metamatrix/common/log/DbLogListene= r.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/log/DbLogListener.java= 2009-02-23 19:46:08 UTC (rev 482) +++ trunk/server/src/main/java/com/metamatrix/common/log/DbLogListener.java= 2009-02-23 19:51:45 UTC (rev 483) @@ -25,7 +25,6 @@ import java.util.Properties; = import com.metamatrix.common.CommonPlugin; -import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.core.log.LogListener; import com.metamatrix.core.log.LogMessage; = @@ -34,27 +33,23 @@ */ public class DbLogListener implements LogListener { = - public static final String LOG_DB_ENABLED =3D "metamatrix.log.jdbcData= base.enabled"; //$NON-NLS-1$ - private DbLogWriter writer =3D null; private boolean enabled =3D true; = /** * Listen for log messages and write them to a database. */ - public DbLogListener(Properties prop){ + public DbLogListener(Properties prop, boolean enable){ if (prop =3D=3D null) { final String msg =3D CommonPlugin.Util.getString("DbLogListener.The_Pro= perties_reference_may_not_be_null"); //$NON-NLS-1$ throw new IllegalArgumentException(msg); } writer =3D new DbLogWriter(prop); writer.initialize(); - enabled =3D PropertiesUtils.getBooleanProperty(prop, LOG_DB_ENABLE= D, true); + this.enabled =3D enable; } = - public void logMessage(LogMessage msg) { - = if (enabled) { writer.logMessage(msg); } @@ -63,15 +58,8 @@ public void shutdown() { writer.shutdown(); } - = - public void determineIfEnabled(Properties props) { - boolean isenabled =3D PropertiesUtils.getBooleanProperty(props, LO= G_DB_ENABLED, true); - enableDBLogging(isenabled); = - } - = - void enableDBLogging(boolean enable) { + public void enableDBLogging(boolean enable) { enabled =3D enable; } - } Modified: trunk/server/src/main/java/com/metamatrix/server/ServerLogListern= erProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProv= ider.java 2009-02-23 19:46:08 UTC (rev 482) +++ trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProv= ider.java 2009-02-23 19:51:45 UTC (rev 483) @@ -96,7 +96,8 @@ private DbLogListener buildDBLogger() { Properties currentProps =3D CurrentConfiguration.getInstance().getProper= ties(); Properties resultsProps =3D PropertiesUtils.clone(currentProps, null, tr= ue, false); - return new DbLogListener(resultsProps); + boolean enabled =3D PropertiesUtils.getBooleanProperty(resultsProps, LOG= _DB_ENABLED, true); + return new DbLogListener(resultsProps, enabled); } = } --===============0436538437390037675==-- From teiid-commits at lists.jboss.org Mon Feb 23 16:51:25 2009 Content-Type: multipart/mixed; boundary="===============7075811928519921621==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r484 - trunk. Date: Mon, 23 Feb 2009 16:51:25 -0500 Message-ID: --===============7075811928519921621== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vhalbert(a)redhat.com Date: 2009-02-23 16:51:25 -0500 (Mon, 23 Feb 2009) New Revision: 484 Added: trunk/salesforce-api/ Log: --===============7075811928519921621==-- From teiid-commits at lists.jboss.org Mon Feb 23 16:51:59 2009 Content-Type: multipart/mixed; boundary="===============1181903890690022478==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r485 - trunk. Date: Mon, 23 Feb 2009 16:51:59 -0500 Message-ID: --===============1181903890690022478== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vhalbert(a)redhat.com Date: 2009-02-23 16:51:59 -0500 (Mon, 23 Feb 2009) New Revision: 485 Added: trunk/sandbox/ Log: --===============1181903890690022478==-- From teiid-commits at lists.jboss.org Tue Feb 24 09:21:50 2009 Content-Type: multipart/mixed; boundary="===============7265418038358670729==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r486 - in trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc: postgresql and 1 other directories. Date: Tue, 24 Feb 2009 09:21:50 -0500 Message-ID: --===============7265418038358670729== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-24 09:21:49 -0500 (Tue, 24 Feb 2009) New Revision: 486 Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/Translator.java Log: TEIID-379 adding a session level set of ansi mode Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/mysql/MySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLTranslator.java 2009-02-23 21:51:59 UTC (rev 485) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) @@ -22,7 +22,10 @@ = package com.metamatrix.connector.jdbc.mysql; = +import java.sql.Connection; import java.sql.Date; +import java.sql.SQLException; +import java.sql.Statement; import java.sql.Time; import java.sql.Timestamp; = @@ -64,8 +67,29 @@ } = @Override - public int getTimestampNanoSecondPrecision() { + public int getTimestampNanoPrecision() { return 6; } = + @Override + public void afterConnectionCreation(Connection connection) { + super.afterConnectionCreation(connection); + = + Statement stmt =3D null; + try { + stmt =3D connection.createStatement(); + stmt.execute("set SESSION sql-mode =3D 'ANSI'"); //$NON-NLS-1$ + } catch (SQLException e) { + getEnvironment().getLogger().logError("Error setting ANSI mode", e); //= $NON-NLS-1$ + } finally { + if (stmt !=3D null) { + try { + stmt.close(); + } catch (SQLException e) { + getEnvironment().getLogger().logDetail("Error closing statement", e);= //$NON-NLS-1$ + } + } + } + } + = } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/postgresql/PostgreSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLTranslator.java 2009-02-23 21:51:59 UTC (rev 485) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) @@ -102,7 +102,7 @@ } = @Override - public int getTimestampNanoSecondPrecision() { + public int getTimestampNanoPrecision() { return 6; } = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/translator/Translator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/Translator.java 2009-02-23 21:51:59 UTC (rev 485) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/Translator.java 2009-02-24 14:21:49 UTC (rev 486) @@ -264,11 +264,11 @@ * @return Formatted string */ public String formatDateValue(java.util.Date dateObject) { - if (dateObject instanceof Timestamp && getTimestampNanoSecondPreci= sion() < 9) { + if (dateObject instanceof Timestamp && getTimestampNanoPrecision()= < 9) { Timestamp ts =3D (Timestamp)dateObject; Timestamp newTs =3D new Timestamp(ts.getTime()); - if (getTimestampNanoSecondPrecision() > 0) { - int mask =3D 10^(9-getTimestampNanoSecondPrecision()); + if (getTimestampNanoPrecision() > 0) { + int mask =3D 10^(9-getTimestampNanoPrecision()); newTs.setNanos(ts.getNanos()/mask*mask); } dateObject =3D newTs; @@ -330,7 +330,7 @@ return null; } = - public int getTimestampNanoSecondPrecision() { + public int getTimestampNanoPrecision() { return 9; } = --===============7265418038358670729==-- From teiid-commits at lists.jboss.org Tue Feb 24 09:33:28 2009 Content-Type: multipart/mixed; boundary="===============2557067956398223631==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r487 - trunk. Date: Tue, 24 Feb 2009 09:33:28 -0500 Message-ID: --===============2557067956398223631== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-24 09:33:28 -0500 (Tue, 24 Feb 2009) New Revision: 487 Removed: trunk/salesforce-api/ trunk/sandbox/ Log: removing empty folders --===============2557067956398223631==-- From teiid-commits at lists.jboss.org Tue Feb 24 11:16:44 2009 Content-Type: multipart/mixed; boundary="===============6982499572702538070==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r488 - in trunk: connector-api/src/main/java/com/metamatrix/connector/basic and 61 other directories. Date: Tue, 24 Feb 2009 11:16:43 -0500 Message-ID: --===============6982499572702538070== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-24 11:16:42 -0500 (Tue, 24 Feb 2009) New Revision: 488 Added: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connector= Identity.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/MappedUse= rIdentity.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/SingleIde= ntity.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /TestPerUserPool.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestMetadataObject.java Removed: trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/MetadataID.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/FakeRuntimeMetadata.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/MockCachingConnector.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/cache/MockDocumentCache.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/FakeRuntimeMetadata.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= MetadataFactory.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= MetadataIDImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ParameterIDImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ProcedureIDImpl.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestMetadataID.java Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connectio= n.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connector= .java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connector= Annotations.java trunk/connector-api/src/main/java/com/metamatrix/connector/api/Execution= Context.java trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicCo= nnection.java trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicCo= nnector.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IBul= kInsert.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICom= poundCriteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IEle= ment.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFro= m.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFun= ction.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IGro= up.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IGro= upBy.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IInC= riteria.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IIns= ert.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IJoi= n.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILan= guageFactory.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IMet= adataReference.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IOrd= erBy.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPar= ameter.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPro= cedure.java trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISel= ect.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/Element.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/Group.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/MetadataObject.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/Parameter.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/Procedure.java trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/RuntimeMetadata.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/= SQLStringVisitor.java trunk/connector-api/src/main/resources/com/metamatrix/data/i18n.properti= es trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /adapter/ObjectConnector.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /internal/ObjectProcedure.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /internal/ObjectQuery.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/TestObjectQueryProcessor.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUtil= ity.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCBaseExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCConnector.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCProcedureExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCSourceConnection.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2ConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/DB2SQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/DerbyConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/MySQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/ConcatFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/DayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/ExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/LeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/LocateFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/Log10FunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/MonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/OracleSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/DatePartFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/ModifiedDatePartFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/PostgreSQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/ModFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/SybaseConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/BasicFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/DropFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/SQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/SubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/util/FunctionReplacementVisitor.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/db2/TestDB2ConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/derby/TestDerbyConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/extension/impl/TestDropFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/extension/impl/TestEscapeSyntaxModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestDayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestLeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestLocateFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestLog10FunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestMonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestOracleConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/TestSubstringFunctionModifier.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/IQueryToLdapSearchParser.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPConnector.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPUpdateExecution.java trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/l= dap/TestIQueryToLdapSearchParser.java trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connect= or/loopback/LoopbackConnection.java trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connect= or/loopback/LoopbackConnector.java trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connect= or/loopback/TestLoopbackExecution.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/Connector.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/UpdateExecutionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/CriteriaVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/InsertVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/SelectVisitor.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextConnector.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextSynchExecution.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/CriteriaDesc.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/LoggingConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/ParameterDescriptor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/QueryAnalyzer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLSourceConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/file/FileExecution.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/soap/SoapExecution.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestCriteriaDesc.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestOutputXPathDesc.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestParameterDescriptor.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/cache/TestRequestRecord.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/file/TestFileExecutor.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/file/TestFileExecution.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/soap/TestSoapExecution.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecConnection.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecConnector.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecVisitor.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectConnector.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/SourceConnectionFactory.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/command/ObjectCommand.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/command/ProcedureCommand.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/source/BaseSourceConnectionFactory.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/util/ObjectConnectorUtil.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.java trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/YahooConnector.java trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/YahooExecution.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorManager.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorWorkItem.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorWrapper.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Exec= utionContextImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Proc= edureBatchHandler.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ElementImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= FunctionImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= GroupImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LanguageBridgeFactory.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LanguageFactoryImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ParameterImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ProcedureImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ElementImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= GroupImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= MetadataObjectImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ParameterImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ProcedureImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= RuntimeMetadataImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= TypeModelImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector= /ConnectionPool.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector= /ConnectionWrapper.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fake= Connector.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestElementImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestFunctionImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TstLanguageBridgeFactory.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/metadata/= TestMetadataFactory.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /FakeSourceConnectionFactory.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /FakeUserIdentityConnectionFactory.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /TestConnectionPool.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /TestConnectionWrapper.java trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataIn= terfaceBuilder.java trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslat= ionUtility.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exten= sion/TestSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracl= e/TestOracleSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/MockConnector.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestElement.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestGroup.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestParams.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestProcedure.java trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/Te= stCollectorVisitor.java trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/Te= stSQLStringVisitor.java Log: TEIID-164 TEIID-374 refactored connector metadata, removed collection sette= rs from connector api, moved pooling and identity knowlege onto base connec= tor api Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Co= nnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecti= on.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecti= on.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,7 +22,6 @@ = package com.metamatrix.connector.api; = -import com.metamatrix.connector.identity.PoolAwareConnection; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = @@ -63,6 +62,20 @@ * @return true if open, false if there is a source error. */ = boolean isAlive(); - + = + /** + * Called by the pool when an existing connection is leased so that the u= nderlying + * Connection may have it's identity switched to a different user. + * @param identity + * @throws ConnectorException + */ + void setConnectorIdentity(ConnectorIdentity context) + throws ConnectorException; + = + /** + * Called by the pool to indicate that the connection was returned to = the pool. + * The actual close call will be made when the pool wants to purge thi= s connection. + */ + void closeCalled(); } = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Co= nnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= r.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= r.java 2009-02-24 16:16:42 UTC (rev 488) @@ -68,5 +68,21 @@ * @return ConnectorCapabilities, may return null if the Connector pro= vides User scoped capabilities {@link Connection#getCapabilities()} */ ConnectorCapabilities getCapabilities(); + = + /** + * Create an identity object based on a security context. + * = + * If single identity is not supported then an exception should be thrown= when a + * null context is supplied. + * = + * Implementors of this class may use a different implementation of the = + * {@link ConnectorIdentity} interface to similarly affect pooling. + * = + * @param context The context provided by the Connector Manager + * @return The associated connector identity + * @throws ConnectorException If a null context is not accepted or an err= or occurs while creating the identity. + */ + ConnectorIdentity createIdentity(ExecutionContext context) + throws ConnectorException; = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Co= nnectorAnnotations.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rAnnotations.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rAnnotations.java 2009-02-24 16:16:42 UTC (rev 488) @@ -27,7 +27,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; = -import com.metamatrix.connector.identity.ConnectorIdentityFactory; import com.metamatrix.connector.internal.ConnectorPropertyNames; = public class ConnectorAnnotations { @@ -51,5 +50,13 @@ public @interface SynchronousWorkers { boolean enabled() default true; } + = + @Retention(RetentionPolicy.RUNTIME) + @Target({ElementType.TYPE}) + public @interface ConnectorConfiguration { + boolean userIdentityCapable() default false; + boolean useSynchronousWorkers() default true; + boolean useConnectionPooling() default true; + } = } Copied: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Conn= ectorIdentity.java (from rev 481, trunk/connector-api/src/main/java/com/met= amatrix/connector/identity/ConnectorIdentity.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rIdentity.java (rev 0) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rIdentity.java 2009-02-24 16:16:42 UTC (rev 488) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.connector.api; + + +/** + * Represents the identity of a connection in the pool. Identities are = + * used to determine whether two connections can be put in the same pool. + * Implementors must supply appropriate {@link java.lang.Object#equals(jav= a.lang.Object)} and + * {@link java.lang.Object#hashCode()} methods. = + */ +public interface ConnectorIdentity { + = +} Property changes on: trunk/connector-api/src/main/java/com/metamatrix/conne= ctor/api/ConnectorIdentity.java ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Ex= ecutionContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Executio= nContext.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/Executio= nContext.java 2009-02-24 16:16:42 UTC (rev 488) @@ -24,9 +24,6 @@ = import java.io.Serializable; = -import com.metamatrix.connector.identity.ConnectorIdentity; -import com.metamatrix.connector.identity.ConnectorIdentityFactory; -import com.metamatrix.connector.identity.SingleIdentity; = /** * The security context provides information about the user context in whi= ch Copied: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Mapp= edUserIdentity.java (from rev 481, trunk/connector-api/src/main/java/com/me= tamatrix/connector/identity/UserIdentity.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/MappedUs= erIdentity.java (rev 0) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/MappedUs= erIdentity.java 2009-02-24 16:16:42 UTC (rev 488) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.connector.api; + + +/** + * This class represents a ConnectorIdentity keyed on a username with + * a mapped identity + */ +public class MappedUserIdentity implements ConnectorIdentity { + private String username; + private String mappedUser; + private String password; + = + /** + * Construct with a security context + * @param context The context + */ + public MappedUserIdentity(String username, String mappedUser, String p= assword){ + this.username =3D username; + this.mappedUser =3D mappedUser; + this.password =3D password; + } = + = + /** + * Implement equals based on the case-insensitive user name. + * @param obj Other identity object + * @return True if other object is a UserIdentity with the same user n= ame + */ + public boolean equals(Object obj){ + if (this =3D=3D obj) { + return true; + } + + if (obj instanceof MappedUserIdentity) { + MappedUserIdentity that =3D (MappedUserIdentity)obj; + return username.equals(that.username); + } + = + return false; = + } + = + /** + * Get hash code, based on user name + */ + public int hashCode(){ + return username.hashCode(); + } = + = + public String toString(){ + return "UserIdentity " + username; //$NON-NLS-1$ + } = + = + public String getMappedUser() { + return mappedUser; + } + = + public String getPassword() { + return password; + } +} Property changes on: trunk/connector-api/src/main/java/com/metamatrix/conne= ctor/api/MappedUserIdentity.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Sing= leIdentity.java (from rev 481, trunk/connector-api/src/main/java/com/metama= trix/connector/identity/SingleIdentity.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/SingleId= entity.java (rev 0) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/SingleId= entity.java 2009-02-24 16:16:42 UTC (rev 488) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.connector.api; + + +/** + * This class represents a single ConnectorIdentity. All the connections a= re treated the same. + */ +public class SingleIdentity implements ConnectorIdentity { + + public SingleIdentity(){ + } + = + /** + * Return true for everything - all identities are identical. + */ + public boolean equals(Object obj){ + return obj instanceof SingleIdentity; + } + = + public String toString(){ + return "SingleIdentity"; //$NON-NLS-1$ + } = + = + public int hashCode(){ + return 0; = + } +} Property changes on: trunk/connector-api/src/main/java/com/metamatrix/conne= ctor/api/SingleIdentity.java ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/basic/= BasicConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnection.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnection.java 2009-02-24 16:16:42 UTC (rev 488) @@ -25,12 +25,12 @@ import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorIdentity; import com.metamatrix.connector.api.Execution; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.identity.ConnectorIdentity; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IQueryCommand; @@ -81,20 +81,12 @@ return null; } = - /** - * Called by the pool to indicate that the connection was returned to = the pool. - * The actual close call will be made when the pool wants to purge thi= s connection. - */ = + @Override public void closeCalled() { = } = - /** - * Called by the pool when an existing connection is leased so that th= e underlying - * Connection may have it's identity switched to a different user. - * @param identity - * @throws ConnectorException - */ + @Override public void setConnectorIdentity(ConnectorIdentity context) throws ConnectorException { = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/basic/= BasicConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -1,7 +1,61 @@ package com.metamatrix.connector.basic; = +import com.metamatrix.connector.DataPlugin; import com.metamatrix.connector.api.Connector; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorIdentity; +import com.metamatrix.connector.api.CredentialMap; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.SingleIdentity; +import com.metamatrix.connector.api.MappedUserIdentity; = public abstract class BasicConnector implements Connector { = + private boolean useCredentialMap; + private boolean adminConnectionsAllowed =3D true; + private String connectorName; + = + /* (non-Javadoc) + * @see com.metamatrix.connector.api.Connector#createIdentity(com.metamat= rix.connector.api.ExecutionContext) + */ + public ConnectorIdentity createIdentity(ExecutionContext context) + throws ConnectorException { + if (context =3D=3D null) { + if (adminConnectionsAllowed) { + return new SingleIdentity(); + } + throw new ConnectorException(DataPlugin.Util.getString("UserIdentityFac= tory.single_identity_not_supported")); //$NON-NLS-1$ + } + Object payload =3D context.getTrustedPayload(); + if (!(payload instanceof CredentialMap)) { + if (useCredentialMap) { + throw new ConnectorException(DataPlugin.Util.getString("UserIdentityFa= ctory.extraction_error")); //$NON-NLS-1$ + } + return new SingleIdentity(); + } + CredentialMap credMap =3D (CredentialMap)payload; + String user =3D credMap.getUser(connectorName); + String password =3D credMap.getPassword(connectorName); + if (user =3D=3D null || password =3D=3D null) { + throw new ConnectorException("Payload missing credentials for " + conne= ctorName); //$NON-NLS-1$ + } + return new MappedUserIdentity(context.getUser(), user, password); + } + = + public void setConnectorName(String connectorName) { + this.connectorName =3D connectorName; + } + = + public void setUseCredentialMap(boolean useCredentialMap) { + this.useCredentialMap =3D useCredentialMap; + } + = + public boolean areAdminConnectionsAllowed() { + return adminConnectionsAllowed; + } + = + public void setAdminConnectionsAllowed(boolean adminConnectionsAllowed) { + this.adminConnectionsAllowed =3D adminConnectionsAllowed; + } + = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IBulkInsert.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IBu= lkInsert.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IBu= lkInsert.java 2009-02-24 16:16:42 UTC (rev 488) @@ -36,9 +36,4 @@ */ List> getRows(); = - /** - * Set the list of row values for this bulk insert = - * @return list; never null - */ - void setRows(List> rows); = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/ICompoundCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICo= mpoundCriteria.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICo= mpoundCriteria.java 2009-02-24 16:16:42 UTC (rev 488) @@ -56,10 +56,4 @@ */ List getCriteria(); = - /** - * Set list of ICriteria combined by this compound criteria. - * @param criteria List of ICriteria - */ - void setCriteria(List criteria); - = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IElement.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IEl= ement.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IEl= ement.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,11 +22,13 @@ = package com.metamatrix.connector.language; = +import com.metamatrix.connector.metadata.runtime.Element; + /** * Represents an element in the language. An example of an element = * would be a column reference in a SELECT clause. = */ -public interface IElement extends IMetadataReference, IExpression { +public interface IElement extends IMetadataReference, IExpression= { = /** * Gets the name of the element. Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IFrom.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFr= om.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFr= om.java 2009-02-24 16:16:42 UTC (rev 488) @@ -35,10 +35,4 @@ */ List getItems(); = - /** - * Set a List of IFromItem in this FROM clause. - * @param items List of IFromItem - */ - void setItems(List items); - = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IFunction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFu= nction.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFu= nction.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,6 +22,8 @@ = package com.metamatrix.connector.language; = +import java.util.List; + /** * Represents a function in the language. A function has a name and 0..n = * Expressions that are parameters. = @@ -38,7 +40,7 @@ * Get the parameters used in this function. * @return Array of IExpressions defining the parameters */ - IExpression[] getParameters(); + List getParameters(); = /** * Set name of the function @@ -46,10 +48,4 @@ */ void setName(String name); = - /** - * Set the parameters used in this function. - * @param parameters Array of IExpressions defining the parameters - */ - void setParameters(IExpression[] parameters); - = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IGroup.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IGr= oup.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IGr= oup.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,12 +22,14 @@ = package com.metamatrix.connector.language; = +import com.metamatrix.connector.metadata.runtime.Group; + /** * Represents a group in the language objects. An example of a group woul= d = * be a table reference in the FROM clause. An IGroup may have a context = name * used in references to this group. = */ -public interface IGroup extends IMetadataReference, IFromItem, ILanguageOb= ject { +public interface IGroup extends IMetadataReference, IFromItem, ILan= guageObject { = /** * Get the name of the group as defined in the VDB. This is null if th= e = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IGroupBy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IGr= oupBy.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IGr= oupBy.java 2009-02-24 16:16:42 UTC (rev 488) @@ -35,10 +35,4 @@ */ List getElements(); = - /** - * Set list of IExpression that the GROUP BY should be grouped on. - * @param elements List of IExpression - */ - void setElements(List elements); - } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IInCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IIn= Criteria.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IIn= Criteria.java 2009-02-24 16:16:42 UTC (rev 488) @@ -35,10 +35,4 @@ */ List getRightExpressions(); = - /** - * Set List of IExpression in the set on the right side of the criteri= a. - * @param expressions List of IExpression - */ - void setRightExpressions(List expressions); - } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IInsert.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IIn= sert.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IIn= sert.java 2009-02-24 16:16:42 UTC (rev 488) @@ -53,16 +53,4 @@ */ void setGroup(IGroup group); = - /** - * Set list of elements being inserted into - * @param elements List of IElement - */ - void setElements(List elements); - = - /** - * Set list of values being inserted - * @param values List of IExpression - */ - void setValues(List values); - = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IJoin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IJo= in.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IJo= in.java 2009-02-24 16:16:42 UTC (rev 488) @@ -90,9 +90,4 @@ */ void setJoinType(JoinType type); = - /** - * Set List of CompareCriteria specifying join criteria. - * @param criteria List of Criteria - */ - void setCriteria(List criteria); = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/ILanguageFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILa= nguageFactory.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILa= nguageFactory.java 2009-02-24 16:16:42 UTC (rev 488) @@ -26,7 +26,10 @@ = import com.metamatrix.connector.language.ICompoundCriteria.Operator; import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.metadata.runtime.Element; +import com.metamatrix.connector.metadata.runtime.Group; +import com.metamatrix.connector.metadata.runtime.Parameter; +import com.metamatrix.connector.metadata.runtime.Procedure; = /** * Factory for the construction of language objects that implement the lan= guage interfaces. @@ -61,7 +64,7 @@ * @param innerCriteria List of ICriteria, typically containing two cr= iteria * @return New ICompoundCriteria */ - ICompoundCriteria createCompoundCriteria(ICompoundCriteria.Operator op= erator, List innerCriteria); + ICompoundCriteria createCompoundCriteria(ICompoundCriteria.Operator op= erator, List innerCriteria); = /** * Create a new IDelete. @@ -79,7 +82,7 @@ * @param type Data type * @return New IElement */ - IElement createElement(String name, IGroup group, MetadataID metadataR= eference, Class type); + IElement createElement(String name, IGroup group, Element metadataRefe= rence, Class type); = /** * Create new exists criteria. @@ -93,7 +96,16 @@ * @param items List of IFromItem * @return New IFrom */ - IFrom createFrom(List items); + IFrom createFrom(List items); + + /** + * Create new function + * @param functionName Name of the function + * @param args Arguments, should never be null + * @param type Data type returned + * @return New IFunction + */ + IFunction createFunction(String functionName, IExpression[] args, Clas= s type); = /** * Create new function @@ -102,7 +114,7 @@ * @param type Data type returned * @return New IFunction */ - IFunction createFunction(String functionName, IExpression[] args, Clas= s type); + IFunction createFunction(String functionName, List args, Class type); = /** * Create new group. @@ -111,14 +123,14 @@ * @param metadataReference Reference to metadata identifier * @return New IGroup */ = - IGroup createGroup(String context, String definition, MetadataID metad= ataReference); + IGroup createGroup(String context, String definition, Group metadataRe= ference); = /** * Create new group by. * @param items List of IGroupByItem * @return New IGroupBy */ - IGroupBy createGroupBy(List items); + IGroupBy createGroupBy(List items); = /** * Create new IN criteria @@ -127,7 +139,7 @@ * @param isNegated True if NOT IN, false for IN * @return New IInCriteria */ - IInCriteria createInCriteria(IExpression leftExpression, List rightExpressions, boolean isNegated); + IInCriteria createInCriteria(IExpression leftExpression, List rightExpressions, boolean isNegated); = /** * Create new inline view @@ -144,7 +156,7 @@ * @param values List of IExpression (usually ILiteral) * @return New IInsert */ - IInsert createInsert(IGroup group, List columns, List values); + IInsert createInsert(IGroup group, List columns, List values); = /** * Create new bulk insert command @@ -153,7 +165,7 @@ * @param List of Lists containing the actual values * @return New IBulkInsert */ - IBulkInsert createBulkInsert(IGroup group, List columns, Lis= t> rows); + IBulkInsert createBulkInsert(IGroup group, List co= lumns, List> rows); = /** * Create new IS NULL criteria @@ -171,7 +183,7 @@ * @param criteria List of ICriteria (considered to be AND'ed together) * @return New IJoin */ - IJoin createJoin(IJoin.JoinType joinType, IFromItem leftItem, IFromIte= m rightItem, List criteria); + IJoin createJoin(IJoin.JoinType joinType, IFromItem leftItem, IFromIte= m rightItem, List criteria); = /** * Create new LIKE criteria @@ -203,7 +215,7 @@ * @param items List of IOrderByItem * @return New IOrderBy */ - IOrderBy createOrderBy(List items); + IOrderBy createOrderBy(List items); = /** * Create new ORDER BY item @@ -223,7 +235,7 @@ * @param metadataReference Metadata identifier reference * @return New IParameter */ - IParameter createParameter(int index, Direction direction, Object valu= e, Class type, MetadataID metadataReference); + IParameter createParameter(int index, Direction direction, Object valu= e, Class type, Parameter metadataReference); = /** * Create new procedure @@ -232,7 +244,7 @@ * @param metadataReference Metadata identifier reference * @return New IProcedure */ - IProcedure createProcedure(String name, List parameters, M= etadataID metadataReference); + IProcedure createProcedure(String name, List par= ameters, Procedure metadataReference); = /** * Create new query @@ -263,7 +275,7 @@ * @param type Data type * @return New ICaseExpression */ = - ISearchedCaseExpression createSearchedCaseExpression(List= whenExpressions, List thenExpressions, IExpression elseExpres= sion, Class type); + ISearchedCaseExpression createSearchedCaseExpression(List whenExpressions, List thenExpressions, IExp= ression elseExpression, Class type); = /** * Create new SELECT clause @@ -271,7 +283,7 @@ * @param selectSymbols List of ISelectSymbol * @return New ISelect */ - ISelect createSelect(boolean isDistinct, List selectSym= bols); + ISelect createSelect(boolean isDistinct, List= selectSymbols); = /** * Create new select symbol Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IMetadataReference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IMe= tadataReference.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IMe= tadataReference.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,23 +22,14 @@ = package com.metamatrix.connector.language; = -import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.metadata.runtime.MetadataObject; = /** * This interface is used to mark language objects as having a = * reference to a MetadataID. = */ -public interface IMetadataReference { +public interface IMetadataReference { = - /** - * Return the MetadataID that is being referred to. - * @return MetadataID - */ - MetadataID getMetadataID(); + T getMetadataObject(); = - /** - * Set the MetadataID that is being referred to. - * @param metadataID MetadataID - */ - void setMetadataID(MetadataID metadataID); = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IOrderBy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IOr= derBy.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IOr= derBy.java 2009-02-24 16:16:42 UTC (rev 488) @@ -40,10 +40,4 @@ */ List getItems(); = - /** - * Set list of {@link IOrderByItem}s specifying the ordering of the re= sults. - * @param items List of IOrderByItem - */ - void setItems(List items); - = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IParameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPa= rameter.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPa= rameter.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,10 +22,12 @@ = package com.metamatrix.connector.language; = +import com.metamatrix.connector.metadata.runtime.Parameter; + /** * Represents an execution parameter. */ -public interface IParameter extends ILanguageObject, IMetadataReference { +public interface IParameter extends ILanguageObject, IMetadataReference { = public enum Direction { IN, Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/IProcedure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPr= ocedure.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPr= ocedure.java 2009-02-24 16:16:42 UTC (rev 488) @@ -24,10 +24,12 @@ = import java.util.List; = +import com.metamatrix.connector.metadata.runtime.Procedure; + /** * Represents a procedural execution (such as a stored procedure). = */ -public interface IProcedure extends ICommand, IMetadataReference { +public interface IProcedure extends ICommand, IMetadataReference { = /** * Gets the name of the procedure. @@ -48,11 +50,4 @@ */ void setProcedureName(String name); = - /** - * Sets list of the IParameter objects associated with this execution.= = - * The parameters describe inputs and outputs. - * @param parameters List of IParameter - */ - void setParameters(List parameters); - = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/langua= ge/ISelect.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISe= lect.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISe= lect.java 2009-02-24 16:16:42 UTC (rev 488) @@ -42,12 +42,6 @@ boolean isDistinct(); = /** - * Set List of ISelectSymbol. - * @param symbols List of ISelectSymbol - */ - void setSelectSymbols(List symbols); - = - /** * Set whether the DISTINCT flag is used in this SELECT. * @param distinct True if SELECT DISTINCT, false if SELECT ALL */ Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/Element.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Element.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Element.java 2009-02-24 16:16:42 UTC (rev 488) @@ -98,5 +98,12 @@ * @return * @throws ConnectorException */ - String getFormat() throws ConnectorException; = + String getFormat() throws ConnectorException; = + = + /** + * Get the parent + * @return Parent + */ + Group getParent() throws ConnectorException; + } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/Group.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Group.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Group.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,8 +22,15 @@ = package com.metamatrix.connector.metadata.runtime; = +import java.util.List; + +import com.metamatrix.connector.api.ConnectorException; + /** * Represents a group, such as a table, in the runtime metadata. */ public interface Group extends MetadataObject { + = + List getChildren() throws ConnectorException; + = } Deleted: trunk/connector-api/src/main/java/com/metamatrix/connector/metadat= a/runtime/MetadataID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/MetadataID.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/MetadataID.java 2009-02-24 16:16:42 UTC (rev 488) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.metadata.runtime; - -import java.util.List; - -import com.metamatrix.connector.api.ConnectorException; - -/** - * Represents a runtime metadata identifier. - */ -public interface MetadataID { - - public enum Type { - TYPE_ELEMENT, - TYPE_GROUP, - TYPE_PARAMETER, - TYPE_PROCEDURE - } - /** - * Get the type of metadataID - * @return ID type - * @see #TYPE_ELEMENT - * @see #TYPE_GROUP - * @see #TYPE_PROCEDURE - * @see #TYPE_PARAMETER - */ - Type getType(); - - /** - * Get a list of child IDs from this ID. A group metadata ID will - * return child element IDs. An element ID will return no child IDs. - * A procedure ID will return the IDs of it's parameters. - * @return List of MetadataID, which may be empty but never null - */ - List getChildIDs() throws ConnectorException; - - /** - * Get the parent ID if one exists - * @return Parent ID or null if none exists - */ - MetadataID getParentID() throws ConnectorException; - = - /** - * Get the short name from the metadataID - * @return String shortName - */ - String getName(); - = - /** - * Get the full name from the metadataID - * @return String fullName - */ - String getFullName(); - = - /** - * Get the {@link MetadataObject} for this id - * @return - */ - MetadataObject getMetadataObject() throws ConnectorException; -} Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/MetadataObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/MetadataObject.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/MetadataObject.java 2009-02-24 16:16:42 UTC (rev 488) @@ -32,12 +32,6 @@ public interface MetadataObject { = /** - * Get the identifier for this object. - * @return Unique identifier for the object - */ - MetadataID getMetadataID(); - - /** * Get name in source for this object, as provided in the model * @return Name in source * @throws ConnectorException If an error occurs retrieving the data @@ -53,4 +47,16 @@ * from runtime metadata */ Properties getProperties() throws ConnectorException; + = + /** + * Get the short name from the metadataID + * @return String shortName + */ + String getName(); + = + /** + * Get the full name from the metadataID + * @return String fullName + */ + String getFullName(); } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/Parameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Parameter.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Parameter.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,6 +22,8 @@ = package com.metamatrix.connector.metadata.runtime; = +import java.util.List; + import com.metamatrix.connector.api.ConnectorException; = /** @@ -53,5 +55,12 @@ */ int getDirection() throws ConnectorException; = + /** + * Get the parent + * @return Parent + */ + Procedure getParent() throws ConnectorException; = + List getChildren() throws ConnectorException; + = } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/Procedure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Procedure.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Procedure.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,9 +22,12 @@ = package com.metamatrix.connector.metadata.runtime; = +import java.util.List; + /** * Represents a procedure construct (such as a Stored Procedure). */ public interface Procedure extends MetadataObject{ = + List getChildren(); } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/metada= ta/runtime/RuntimeMetadata.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/RuntimeMetadata.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/RuntimeMetadata.java 2009-02-24 16:16:42 UTC (rev 488) @@ -31,10 +31,24 @@ = /** * Look up an object by identifier - * @param id The identifier + * @param fullName * @return The object */ - MetadataObject getObject(MetadataID id) throws ConnectorException; + Group getGroup(String fullName) throws ConnectorException; + + /** + * Look up an object by identifier + * @param fullName + * @return The object + */ + Element getElement(String fullName) throws ConnectorException; + + /** + * Look up an object by identifier + * @param fullName + * @return The object + */ + Procedure getProcedure(String fullName) throws ConnectorException; = /** * Gets the contents of a VDB resource in binary form. Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/util/SQLStringVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /SQLStringVisitor.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /SQLStringVisitor.java 2009-02-24 16:16:42 UTC (rev 488) @@ -70,7 +70,6 @@ import com.metamatrix.connector.language.ISubqueryInCriteria; import com.metamatrix.connector.language.IUpdate; import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.connector.visitor.framework.AbstractLanguageVisitor; import com.metamatrix.core.util.StringUtil; @@ -93,19 +92,15 @@ * @param id the id of the group or element * @return the name of that element or group as defined in the source */ - protected String getName(MetadataID id) { + protected String getName(MetadataObject object) { try { - MetadataObject obj =3D id.getMetadataObject(); - if (obj =3D=3D null) { - return id.getName(); - } - String nameInSource =3D obj.getNameInSource(); + String nameInSource =3D object.getNameInSource(); if(nameInSource !=3D null && nameInSource.length() > 0) { return nameInSource; } - return id.getName(); + return object.getName(); } catch(ConnectorException e) { - return id.getName(); + return object.getName(); } } = @@ -291,7 +286,7 @@ if(group.getDefinition() !=3D null) { = groupName =3D group.getContext(); } else { = - MetadataID groupID =3D group.getMetadataID(); + MetadataObject groupID =3D group.getMetadataObject(); if(groupID !=3D null) { = groupName =3D getName(groupID); } else { @@ -301,7 +296,7 @@ } = String elemShortName =3D null; = - MetadataID elementID =3D obj.getMetadataID(); + MetadataObject elementID =3D obj.getMetadataObject(); if(elementID !=3D null) { elemShortName =3D getName(elementID); = } else { @@ -345,8 +340,8 @@ buffer.append(EXEC) .append(SPACE); = - if(obj.getMetadataID() !=3D null) { - buffer.append(getName(obj.getMetadataID())); = = + if(obj.getMetadataObject() !=3D null) { + buffer.append(getName(obj.getMetadataObject())); = = } else { buffer.append(obj.getProcedureName()); } @@ -399,15 +394,15 @@ public void visit(IFunction obj) { = String name =3D obj.getName(); - IExpression[] args =3D obj.getParameters(); + List args =3D obj.getParameters(); if(name.equalsIgnoreCase(CONVERT) || name.equalsIgnoreCase(CAST)) = { = = - Object typeValue =3D ((ILiteral)args[1]).getValue(); + Object typeValue =3D ((ILiteral)args.get(1)).getValue(); = buffer.append(name); buffer.append(LPAREN); = = - append(args[0]); + append(args.get(0)); = if(name.equalsIgnoreCase(CONVERT)) { = buffer.append(COMMA); = @@ -423,9 +418,9 @@ buffer.append(LPAREN); = = if(args !=3D null) { - for(int i=3D0; i 0) { - buffer.append(((ILiteral)args[0]).getValue()); + if(args !=3D null && args.size() > 0) { + buffer.append(((ILiteral)args.get(0)).getValue()); = - for(int i=3D1; i columnMetadata =3D resultSetParameter.getMetadataObj= ect().getChildren(); int size =3D columnMetadata.size(); columnNames =3D new String[size]; columnNamesInSource =3D new String[size]; columnTypes =3D new Class[size]; for(int i =3D0; i expressions =3D function.getParameters(); + element =3D (IElement)expressions.get(0); } else if(expression instanceof IElement) { element =3D (IElement)expression; } IMetadataReference reference =3D element; - MetadataID id =3D reference.getMetadataID(); - MetadataObject obj =3D metadata.getObject(id); + MetadataObject obj =3D reference.getMetadataObject(); if (obj !=3D null && obj.getNameInSource() !=3D null) { Element elementMetadata =3D (Element) obj; columnTypes.add( elementMetadata.getJavaType() ); columnNamesInSource.add(obj.getNameInSource()); - columnNames.add(obj.getMetadataID().getFullName()); + columnNames.add(obj.getFullName()); if(functionName =3D=3D null) { caseTypes.add(NO_CASE); } else if(functionName.equalsIgnoreCase("UPPER") || functionNa= me.equalsIgnoreCase("UCASE")) { //$NON-NLS-1$ //$NON-NLS-2$ @@ -194,8 +192,7 @@ = private String getMetadataObjectName(Object element) throws ConnectorE= xception { IMetadataReference reference =3D (IMetadataReference) element; - MetadataID id =3D reference.getMetadataID(); - MetadataObject obj =3D metadata.getObject(id); + MetadataObject obj =3D reference.getMetadataObject(); if (obj !=3D null && obj.getNameInSource() !=3D null) { return obj.getNameInSource(); } @@ -228,8 +225,8 @@ String functionName =3D null; if(expression instanceof IFunction) { IFunction function =3D (IFunction) expression; - IExpression[] expressions =3D function.getParameters(); - literal =3D (ILiteral)expressions[0]; + List expressions =3D function.getParameters(); + literal =3D (ILiteral)expressions.get(0); functionName =3D function.getName(); } else if(expression instanceof ILiteral) { literal =3D (ILiteral) expression; @@ -249,8 +246,8 @@ IElement element =3D null; if(expression instanceof IFunction) { IFunction function =3D (IFunction) expression; - IExpression[] expressions =3D function.getParameters(); - element =3D (IElement)expressions[0]; + List expressions =3D function.getParameters(); + element =3D (IElement)expressions.get(0); } else if(expression instanceof IElement) { element =3D (IElement)expression; } = Deleted: trunk/connector-metadata/src/test/java/com/metamatrix/connector/me= tadata/internal/FakeRuntimeMetadata.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/FakeRuntimeMetadata.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/FakeRuntimeMetadata.java 2009-02-24 16:16:42 UTC (rev 488) @@ -1,59 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.metadata.internal; - -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.MetadataID; -import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; - -/** - */ -public class FakeRuntimeMetadata implements RuntimeMetadata { - - /** - * = - */ - public FakeRuntimeMetadata() { - super(); - } - - /* = - * @see com.metamatrix.data.metadata.runtime.RuntimeMetadata#getObject= (com.metamatrix.data.metadata.runtime.MetadataID) - */ - public MetadataObject getObject(MetadataID id) { - return null; - } - - public byte[] getBinaryVDBResource(String resourcePath) throws Connect= orException { - return null; - } - - public String getCharacterVDBResource(String resourcePath) throws Conn= ectorException { - return null; - } - - public String[] getVDBResourcePaths() throws ConnectorException { - return null; - } -} Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/internal/TestObjectQueryProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestObjectQueryProcessor.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestObjectQueryProcessor.java 2009-02-24 16:16:42 UTC (rev 488) @@ -36,7 +36,6 @@ import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.util.StringUtil; import com.metamatrix.core.util.UnitTestUtil; -import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.metadata.runtime.FakeMetadataService; import com.metamatrix.metadata.runtime.FakeQueryMetadata; @@ -73,7 +72,7 @@ } = public static RuntimeMetadata getRuntimeMetadata() { - return new RuntimeMetadataImpl(new MetadataFactory(FakeQueryMetada= ta.getQueryMetadata())); + return new RuntimeMetadataImpl(FakeQueryMetadata.getQueryMetadata(= )); } = private void checkResults(String expected, String actual) { Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/Translat= ionUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUti= lity.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUti= lity.java 2009-02-24 16:16:42 UTC (rev 488) @@ -28,7 +28,6 @@ import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.metadata.runtime.VDBMetadataFactory; import com.metamatrix.query.metadata.QueryMetadataInterface; @@ -89,6 +88,6 @@ * @return RuntimeMetadata for testing */ public RuntimeMetadata createRuntimeMetadata() { - return new RuntimeMetadataImpl(new MetadataFactory(metadata)); + return new RuntimeMetadataImpl(metadata); } } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCBaseExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCBaseExecution.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCBaseExecution.java 2009-02-24 16:16:42 UTC (rev 488) @@ -34,10 +34,10 @@ = import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorIdentity; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.identity.ConnectorIdentity; import com.metamatrix.connector.jdbc.translator.TranslatedCommand; import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ICommand; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCConnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCConnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -37,19 +37,16 @@ import javax.sql.XADataSource; = import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.connector.DataPlugin; import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.SingleIdentity; +import com.metamatrix.connector.api.MappedUserIdentity; import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.identity.ConnectorIdentity; -import com.metamatrix.connector.identity.ConnectorIdentityFactory; -import com.metamatrix.connector.identity.SingleIdentity; -import com.metamatrix.connector.identity.UserIdentity; +import com.metamatrix.connector.basic.BasicConnector; import com.metamatrix.connector.internal.ConnectorPropertyNames; import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.jdbc.xa.JDBCSourceXAConnection; @@ -64,7 +61,7 @@ * JDBC implementation of Connector interface. */ @ConnectionPooling -public class JDBCConnector implements XAConnector, ConnectorIdentityFactor= y { +public class JDBCConnector extends BasicConnector implements XAConnector { = public static final String INVALID_AUTHORIZATION_SPECIFICATION_NO_SUBC= LASS =3D "28000"; //$NON-NLS-1$ = @@ -95,48 +92,7 @@ private DataSource ds; private XADataSource xaDs; private int transIsoLevel =3D NO_ISOLATION_LEVEL_SET; - = - private boolean useCredentialMap; - private boolean adminConnectionsAllowed =3D true; - private String connectorName; - = - @Override - public ConnectorIdentity createIdentity(ExecutionContext context) - throws ConnectorException { - if (context =3D=3D null) { - if (adminConnectionsAllowed) { - return new SingleIdentity(); - } - throw new ConnectorException(DataPlugin.Util.getString("UserIdentityFac= tory.single_identity_not_supported")); //$NON-NLS-1$ - } - Object payload =3D context.getTrustedPayload(); - if (!(payload instanceof CredentialMap)) { - if (useCredentialMap) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCUserIdenti= tyConnectionFactory.Unable_to_get_credentials")); //$NON-NLS-1$ - } - return new SingleIdentity(); - } - CredentialMap credMap =3D (CredentialMap)payload; - String user =3D credMap.getUser(connectorName); - String password =3D credMap.getPassword(connectorName); - if (user =3D=3D null || password =3D=3D null) { - throw new ConnectorException("Payload missing credentials for " + conne= ctorName); //$NON-NLS-1$ - } - return new UserIdentity(context.getUser(), user, password); - } - = - public void setConnectorName(String connectorName) { - this.connectorName =3D connectorName; - } - = - public void setUseCredentialMap(boolean useCredentialMap) { - this.useCredentialMap =3D useCredentialMap; - } - = - public void setAdminConnectionsAllowed(boolean adminConnectionsAllowed) { - this.adminConnectionsAllowed =3D adminConnectionsAllowed; - } - = + = @Override public void start(ConnectorEnvironment environment) throws ConnectorException { @@ -172,7 +128,7 @@ } sqlTranslator.initialize(environment); = - if (this.adminConnectionsAllowed) { + if (areAdminConnectionsAllowed()) { testConnection(); } = @@ -235,8 +191,8 @@ try { = if (context =3D=3D null || context.getConnectorIdentity() instanceof Si= ngleIdentity) { conn =3D dataSource.getConnection(); - } else if (context.getConnectorIdentity() instanceof UserIdentity) { - UserIdentity id =3D (UserIdentity)context.getConnectorIdentity(); + } else if (context.getConnectorIdentity() instanceof MappedUserIdentity= ) { + MappedUserIdentity id =3D (MappedUserIdentity)context.getConnectorIden= tity(); conn =3D dataSource.getConnection(id.getMappedUser(), id.getPassword()= ); } setDefaultTransactionIsolationLevel(conn); @@ -258,8 +214,8 @@ try { if (context =3D=3D null || context.getConnectorIdentity() instanceof Si= ngleIdentity) { conn =3D xaDataSource.getXAConnection(); - } else if (context.getConnectorIdentity() instanceof UserIdentity) { - UserIdentity id =3D (UserIdentity)context.getConnectorIdentity(); + } else if (context.getConnectorIdentity() instanceof MappedUserIdentity= ) { + MappedUserIdentity id =3D (MappedUserIdentity)context.getConnectorIden= tity(); conn =3D xaDataSource.getXAConnection(id.getMappedUser(), id.getPasswo= rd()); } java.sql.Connection c =3D conn.getConnection(); Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/JDBCProcedureExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCProcedureExecution.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCProcedureExecution.java 2009-02-24 16:16:42 UTC (rev 488) @@ -46,7 +46,6 @@ import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** @@ -124,15 +123,12 @@ } = if(resultSet !=3D null){ - List columnMetadata =3D null; - columnMetadata =3D resultSet.getMetadataID().getChildIDs(); + List columnMetadata =3D resultSet.getMetadataObje= ct().getChildren(); = int size =3D columnMetadata.size(); Class[] coulmnDTs =3D new Class[size]; for(int i =3D0; i args =3D function.getParameters(); + Class sourceType =3D args.get(0).getType(); + String targetTypeString =3D getTargetType(args.get(1)); Class targetType =3D TypeFacility.getDataTypeClass(targetTypeStrin= g); IExpression returnExpr =3D null; = @@ -55,40 +56,40 @@ = // targetType is always lower-case due to getTargetType implem= entation if(targetType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { = - returnExpr =3D convertToString(args[0], sourceType); + returnExpr =3D convertToString(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.TIMESTA= MP)) { = - returnExpr =3D convertToTimestamp(args[0], sourceType); + returnExpr =3D convertToTimestamp(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.DATE)) = { = - returnExpr =3D convertToDate(args[0], sourceType); + returnExpr =3D convertToDate(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.TIME)) = { = - returnExpr =3D convertToTime(args[0], sourceType); + returnExpr =3D convertToTime(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN= ) || = targetType.equals(TypeFacility.RUNTIME_TYPES.B= YTE) || = targetType.equals(TypeFacility.RUNTIME_TYPES.S= HORT)) { = - returnExpr =3D convertToSmallInt(args[0], sourceType, targ= etType); + returnExpr =3D convertToSmallInt(args.get(0), sourceType, = targetType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.INTEGER= )) { = - returnExpr =3D convertToInteger(args[0], sourceType); + returnExpr =3D convertToInteger(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.LONG) |= | = targetType.equals(TypeFacility.RUNTIME_TYPES.B= IG_INTEGER)) { = - returnExpr =3D convertToBigInt(args[0], sourceType); + returnExpr =3D convertToBigInt(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.FLOAT))= { = - returnExpr =3D convertToReal(args[0], sourceType); + returnExpr =3D convertToReal(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.DOUBLE)= ) { = - returnExpr =3D convertToDouble(args[0], sourceType); + returnExpr =3D convertToDouble(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.BIG_DEC= IMAL)) { = - returnExpr =3D convertToBigDecimal(args[0], sourceType); + returnExpr =3D convertToBigDecimal(args.get(0), sourceType= ); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.CHAR)) = { = - returnExpr =3D convertToChar(args[0], sourceType); + returnExpr =3D convertToChar(args.get(0), sourceType); } = = if(returnExpr !=3D null) { @@ -155,7 +156,7 @@ Class sourceType) { if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { ILiteral literalOne =3D this.langFactory.createLiteral(new Int= eger(1), TypeFacility.RUNTIME_TYPES.INTEGER); - return this.langFactory.createFunction("char", new IExpression= [] { expression, literalOne }, TypeFacility.RUNTIME_TYPES.CHAR); //$NON-NLS= -1$ + return this.langFactory.createFunction("char", Arrays.asList(e= xpression, literalOne), TypeFacility.RUNTIME_TYPES.CHAR); //$NON-NLS-1$ } = = return null; @@ -302,13 +303,13 @@ // BEFORE: convert(EXPR, timestamp) // AFTER: timestamp(EXPR, '00:00:00') ILiteral timeString =3D this.langFactory.createLiteral("00:00:= 00", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - return this.langFactory.createFunction("timestamp", new IExpre= ssion[] {expression, timeString}, TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ + return this.langFactory.createFunction("timestamp", Arrays.asL= ist(expression, timeString), TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ = } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.TIME)) { // BEFORE: convert(EXPR, timestamp) // AFTER: timestamp('1970-01-01', EXPR) ILiteral dateString =3D this.langFactory.createLiteral("1970-0= 1-01", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - return this.langFactory.createFunction("timestamp", new IExpre= ssion[] {dateString, expression}, TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ + return this.langFactory.createFunction("timestamp", Arrays.asL= ist(dateString, expression), TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ } = return null; @@ -325,7 +326,7 @@ String functionName, Class outputType) { return langFactory.createFunction(functionName, = - new IExpression[] { expression }, + Arrays.asList(expression), outputType); } = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/db2/DB2SQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLTranslator.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLTranslator.java 2009-02-24 16:16:42 UTC (rev 488) @@ -24,8 +24,6 @@ */ package com.metamatrix.connector.jdbc.db2; = -import java.util.Arrays; - import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; @@ -70,7 +68,7 @@ return; } ILiteral one =3D getLanguageFactory().createLiteral(1, TypeFacility.RU= NTIME_TYPES.INTEGER); - obj.setCriteria(Arrays.asList(getLanguageFactory().createCompareCriter= ia(Operator.EQ, one, one))); + obj.getCriteria().add(getLanguageFactory().createCompareCriteria(Opera= tor.EQ, one, one)); obj.setJoinType(JoinType.INNER_JOIN); } }; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/derby/DerbyConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyConvertModifier.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyConvertModifier.java 2009-02-24 16:16:42 UTC (rev 488) @@ -23,6 +23,7 @@ package com.metamatrix.connector.jdbc.derby; = import java.util.ArrayList; +import java.util.Arrays; import java.util.List; = import com.metamatrix.connector.api.TypeFacility; @@ -54,9 +55,9 @@ = List parts =3D new ArrayList(); parts.add("cast("); //$NON-NLS-1$ - parts.add(function.getParameters()[0]); + parts.add(function.getParameters().get(0)); parts.add(" as "); //$NON-NLS-1$ - ILiteral type =3D (ILiteral) function.getParameters()[1]; = + ILiteral type =3D (ILiteral) function.getParameters().get(1); = = parts.add(type.getValue()); parts.add(")"); //$NON-NLS-1$ = @@ -64,9 +65,9 @@ } = public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - Class sourceType =3D args[0].getType(); - String targetTypeString =3D getTargetType(args[1]); + List args =3D function.getParameters(); + Class sourceType =3D args.get(0).getType(); + String targetTypeString =3D getTargetType(args.get(1)); Class targetType =3D TypeFacility.getDataTypeClass(targetTypeStrin= g); IExpression returnExpr =3D null; = @@ -74,40 +75,40 @@ = // targetType is always lower-case due to getTargetType implem= entation if(targetType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { = - returnExpr =3D convertToString(args[0], sourceType); + returnExpr =3D convertToString(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.TIMESTA= MP)) { = - returnExpr =3D convertToTimestamp(args[0], sourceType); + returnExpr =3D convertToTimestamp(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.DATE)) = { = - returnExpr =3D convertToDate(args[0], sourceType); + returnExpr =3D convertToDate(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.TIME)) = { = - returnExpr =3D convertToTime(args[0], sourceType); + returnExpr =3D convertToTime(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN= ) || = targetType.equals(TypeFacility.RUNTIME_TYPES.B= YTE) || = targetType.equals(TypeFacility.RUNTIME_TYPES.S= HORT)) { = - returnExpr =3D convertToSmallInt(args[0], sourceType, targ= etType); + returnExpr =3D convertToSmallInt(args.get(0), sourceType, = targetType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.INTEGER= )) { = - returnExpr =3D convertToInteger(args[0], sourceType); + returnExpr =3D convertToInteger(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.LONG) |= | = targetType.equals(TypeFacility.RUNTIME_TYPES.B= IG_INTEGER)) { = - returnExpr =3D convertToBigInt(args[0], sourceType); + returnExpr =3D convertToBigInt(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.FLOAT))= { = - returnExpr =3D convertToFloat(args[0], sourceType); + returnExpr =3D convertToFloat(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.DOUBLE)= ) { = - returnExpr =3D convertToDouble(args[0], sourceType); + returnExpr =3D convertToDouble(args.get(0), sourceType); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.BIG_DEC= IMAL)) { = - returnExpr =3D convertToBigDecimal(args[0], sourceType); + returnExpr =3D convertToBigDecimal(args.get(0), sourceType= ); = } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.CHAR)) = { = - returnExpr =3D convertToChar(args[0], sourceType); + returnExpr =3D convertToChar(args.get(0), sourceType); } = = if(returnExpr !=3D null) { @@ -174,7 +175,7 @@ Class sourceType) { if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { ILiteral literalOne =3D this.langFactory.createLiteral(new Int= eger(1), TypeFacility.RUNTIME_TYPES.INTEGER); - return this.langFactory.createFunction("char", new IExpression= [] { expression, literalOne }, TypeFacility.RUNTIME_TYPES.CHAR); //$NON-NLS= -1$ + return this.langFactory.createFunction("char", Arrays.asList( = expression, literalOne ), TypeFacility.RUNTIME_TYPES.CHAR); //$NON-NLS-1$ } = = return null; @@ -251,11 +252,11 @@ // BEFORE: convert(string_expr, float) // AFTER: cast(cast(string_expr as decimal) as float) IFunction inner =3D langFactory.createFunction("convert", //$= NON-NLS-1$ - new IExpression[] { expression, langFactory.createLiteral(= "decimal", TypeFacility.RUNTIME_TYPES.STRING) }, //$NON-NLS-1$ + Arrays.asList( expression, langFactory.createLiteral("deci= mal", TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); = IFunction outer =3D langFactory.createFunction("convert", //$= NON-NLS-1$ - new IExpression[] { inner, langFactory.createLiteral("floa= t", TypeFacility.RUNTIME_TYPES.STRING) }, //$NON-NLS-1$ + Arrays.asList( inner, langFactory.createLiteral("float", T= ypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ TypeFacility.RUNTIME_TYPES.FLOAT); = return outer; = @@ -266,7 +267,7 @@ // BEFORE: convert(num_expr, float) // AFTER: cast(num_expr as float) return langFactory.createFunction("convert", //$NON-NLS-1$ - new IExpression[] { expression, langFactory.createLiteral(= "float", TypeFacility.RUNTIME_TYPES.STRING) }, //$NON-NLS-1$ + Arrays.asList( expression, langFactory.createLiteral("floa= t", TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ TypeFacility.RUNTIME_TYPES.FLOAT); } = @@ -280,11 +281,11 @@ // BEFORE: convert(string_expr, double) // AFTER: cast(cast(string_expr as decimal) as double) IFunction inner =3D langFactory.createFunction("convert", //$= NON-NLS-1$ - new IExpression[] { expression, langFactory.createLiteral(= "decimal", TypeFacility.RUNTIME_TYPES.STRING) }, //$NON-NLS-1$ + Arrays.asList( expression, langFactory.createLiteral("deci= mal", TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); = return langFactory.createFunction("convert", //$NON-NLS-1$ - new IExpression[] { inner, langFactory.createLiteral("doub= le", TypeFacility.RUNTIME_TYPES.STRING) }, //$NON-NLS-1$ + Arrays.asList( inner, langFactory.createLiteral("double", = TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ TypeFacility.RUNTIME_TYPES.DOUBLE); } = @@ -298,7 +299,7 @@ // BEFORE: convert(string_expr, bigdecimal) // AFTER: cast(string_expr as decimal) return langFactory.createFunction("convert", //$NON-NLS-1$ - new IExpression[] { expression, langFactory.createLiteral(= "decimal", TypeFacility.RUNTIME_TYPES.STRING) }, //$NON-NLS-1$ + Arrays.asList( expression, langFactory.createLiteral("deci= mal", TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); } = @@ -340,13 +341,13 @@ // BEFORE: convert(EXPR, timestamp) // AFTER: timestamp(EXPR, '00:00:00') ILiteral timeString =3D this.langFactory.createLiteral("00:00:= 00", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - return this.langFactory.createFunction("timestamp", new IExpre= ssion[] {expression, timeString}, TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ + return this.langFactory.createFunction("timestamp", Arrays.asL= ist(expression, timeString), TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ = } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.TIME)) { // BEFORE: convert(EXPR, timestamp) // AFTER: timestamp(EXPR, '1970-01-01', EXPR) ILiteral dateString =3D this.langFactory.createLiteral("1970-0= 1-01", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - return this.langFactory.createFunction("timestamp", new IExpre= ssion[] {dateString, expression}, TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ + return this.langFactory.createFunction("timestamp", Arrays.asL= ist(dateString, expression), TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ } = return null; @@ -363,7 +364,7 @@ String functionName, Class outputType) { return langFactory.createFunction(functionName, = - new IExpression[] { expression }, + Arrays.asList( expression ), outputType); } = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/mysql/MySQLConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLConvertModifier.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLConvertModifier.java 2009-02-24 16:16:42 UTC (rev 488) @@ -27,6 +27,8 @@ = import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; +import com.metamatrix.connector.language.ICompareCriteria; +import com.metamatrix.connector.language.ICriteria; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; @@ -52,17 +54,17 @@ } = public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); = - if (args[0] !=3D null && args[0] instanceof ILiteral && ((ILiteral= )args[0]).getValue() =3D=3D null ) { - if (args[1] !=3D null && args[1] instanceof ILiteral) { + if (args.get(0) !=3D null && args.get(0) instanceof ILiteral && ((= ILiteral)args.get(0)).getValue() =3D=3D null ) { + if (args.get(1) !=3D null && args.get(1) instanceof ILiteral) { // This is a convert(null, ...) or cast(null as ...) return DROP_MODIFIER.modify(function); } } = = - if (args[1] !=3D null && args[1] instanceof ILiteral) { - String target =3D ((String)((ILiteral)args[1]).getValue()).toL= owerCase(); + if (args.get(1) !=3D null && args.get(1) instanceof ILiteral) { + String target =3D ((String)((ILiteral)args.get(1)).getValue())= .toLowerCase(); if (target.equals("string")) { //$NON-NLS-1$ = return convertToString(function); } else if (target.equals("byte") || //$NON-NLS-1$ @@ -77,11 +79,11 @@ target.equals("bigdecimal")) { //$NON-NLS-1$ = return convertToNumeric(function); = } else if (target.equals("date")) { //$NON-NLS-1$ = - return convertToDateTime("DATE", args[0], java.sql.Date.cl= ass); //$NON-NLS-1$ + return convertToDateTime("DATE", args.get(0), java.sql.Dat= e.class); //$NON-NLS-1$ } else if (target.equals("time")) { //$NON-NLS-1$ = - return convertToDateTime("TIME", args[0], java.sql.Time.cl= ass); //$NON-NLS-1$ + return convertToDateTime("TIME", args.get(0), java.sql.Tim= e.class); //$NON-NLS-1$ } else if (target.equals("timestamp")) { //$NON-NLS-1$ = - return convertToDateTime("TIMESTAMP", args[0], java.sql.Ti= mestamp.class); //$NON-NLS-1$ + return convertToDateTime("TIMESTAMP", args.get(0), java.sq= l.Timestamp.class); //$NON-NLS-1$ } else if (target.equals("char")) { //$NON-NLS-1$ = return convertToNativeType(function, "CHAR (1)"); //$NON-N= LS-1$ } else if (target.equals("boolean")) { //$NON-NLS-1$ = @@ -96,8 +98,8 @@ switch(srcCode) { case BOOLEAN: // convert(booleanSrc, string) --> CASE WHEN booleanSrc TH= EN '1' ELSE '0' END - List when =3D Arrays.asList(langFactory.createCompareCrite= ria(Operator.EQ, function.getParameters()[0], langFactory.createLiteral(Boo= lean.TRUE, Boolean.class))); - List then =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral("1", String.class)}); //$NON-NLS-1$ + List when =3D Arrays.asList(langFactory.= createCompareCriteria(Operator.EQ, function.getParameters().get(0), langFac= tory.createLiteral(Boolean.TRUE, Boolean.class))); + List then =3D Arrays.asList(langFactory.createLi= teral("1", String.class)); //$NON-NLS-1$ IExpression elseExpr =3D langFactory.createLiteral("0", St= ring.class); //$NON-NLS-1$ return langFactory.createSearchedCaseExpression(when, then= , elseExpr, String.class); case BYTE: @@ -125,10 +127,9 @@ } = private IExpression convertToNativeType(IFunction function, String tar= getType) { - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); function.setName("convert"); //$NON-NLS-1$ - args[1] =3D langFactory.createLiteral(targetType, String.class); - function.setParameters(args); + args.set(1, langFactory.createLiteral(targetType, String.class)); return function; } = @@ -141,14 +142,14 @@ private IExpression convertToNumeric(IFunction function) { // convert(x, float/double/bigdecimal) --> (x + 0.0) return langFactory.createFunction("+", //$NON-NLS-1$ - new IExpression[] {function.getP= arameters()[0], - langFactory.c= reateLiteral(new Double(0.0), Double.class)}, + Arrays.asList(function.getParame= ters().get(0), + langFactory.c= reateLiteral(new Double(0.0), Double.class)), Double.class); } = private IExpression convertToDateTime(String functionName, IExpression= value, Class targetType) { return langFactory.createFunction(functionName, - new IExpression[] {value}, + Arrays.asList(value), targetType); } = @@ -158,8 +159,8 @@ case STRING: // convert(src, boolean) --> CASE src WHEN 'true' THEN 1 E= LSE 0 END // convert(booleanSrc, string) --> CASE WHEN booleanSrc TH= EN '1' ELSE '0' END - List when =3D Arrays.asList(langFactory.createCompareCrite= ria(Operator.EQ, function.getParameters()[0], langFactory.createLiteral("tr= ue", String.class))); - List then =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral(Integer.valueOf(1), Integer.class)}); //$NON-NLS-1$ + List when =3D Arrays.asList(langFactory.= createCompareCriteria(Operator.EQ, function.getParameters().get(0), langFac= tory.createLiteral("true", String.class))); + List then =3D Arrays.asList(langFactory.createLi= teral(Integer.valueOf(1), Integer.class)); //$NON-NLS-1$ IExpression elseExpr =3D langFactory.createLiteral(Integer= .valueOf(0), Integer.class); //$NON-NLS-1$ return langFactory.createSearchedCaseExpression(when, then= , elseExpr, String.class); default: @@ -169,16 +170,15 @@ = private IFunction convertDateTimeToString(IFunction function, String f= ormat) { // convert (date, string) --> date_format(date, format) - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); function.setName("date_format"); //$NON-NLS-1$ - args[1] =3D langFactory.createLiteral(format, String.class); = - function.setParameters(args); + args.set(1, langFactory.createLiteral(format, String.class)); = return function; } = private int getSrcCode(IFunction function) { - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); return ((Integer) typeMap.get(srcType)).intValue(); } = } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/ConcatFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ConcatFunctionModifier.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ConcatFunctionModifier.java 2009-02-24 16:16:42 UTC (rev 488) @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.List; = +import com.metamatrix.connector.api.SourceSystemFunctions; import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; import com.metamatrix.connector.language.ICriteria; @@ -58,8 +59,8 @@ */ public IExpression modify(IFunction function) { List when =3D new ArrayList(); - IExpression a =3D function.getParameters()[0]; - IExpression b =3D function.getParameters()[1]; + IExpression a =3D function.getParameters().get(0); + IExpression b =3D function.getParameters().get(1); List crits =3D new ArrayList(); = ILiteral nullValue =3D langFactory.createLiteral(null, TypeFacilit= y.RUNTIME_TYPES.STRING); @@ -95,8 +96,8 @@ } if (expr instanceof IFunction) { IFunction function =3D (IFunction)expr; - if (function.getName().equalsIgnoreCase("NVL") || function.getName()= .equalsIgnoreCase("IFNULL")) { //$NON-NLS-1$ //$NON-NLS-2$ - return isNotNull(function.getParameters()[1]); + if (function.getName().equalsIgnoreCase("NVL") || function.getName()= .equalsIgnoreCase(SourceSystemFunctions.IFNULL)) { //$NON-NLS-1$ + return isNotNull(function.getParameters().get(0)); } } return false; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/DayWeekQuarterFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/DayWeekQuarterFunctionModifier.java 2009-02-24 14:33:28 UTC (re= v 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/DayWeekQuarterFunctionModifier.java 2009-02-24 16:16:42 UTC (re= v 488) @@ -22,6 +22,9 @@ = package com.metamatrix.connector.jdbc.oracle; = +import java.util.Arrays; +import java.util.List; + import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.*; @@ -47,16 +50,16 @@ * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) */ public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); = IFunction inner =3D langFactory.createFunction("TO_CHAR", //$NON-= NLS-1$ - new IExpression[] { = - args[0], = - langFactory.createLiteral(format, String.class)}, = + Arrays.asList( = + args.get(0), = + langFactory.createLiteral(format, String.class)), = String.class); = IFunction outer =3D langFactory.createFunction("TO_NUMBER", //$NO= N-NLS-1$ - new IExpression[] {inner}, = + Arrays.asList(inner), = Integer.class); = return outer; = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/ExtractFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ExtractFunctionModifier.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ExtractFunctionModifier.java 2009-02-24 16:16:42 UTC (rev 488) @@ -45,7 +45,7 @@ = public List translate(IFunction function) { StringBuffer buffer =3D new StringBuffer(); - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); = List objs =3D new ArrayList(); buffer.append("EXTRACT("); //$NON-NLS-1$ @@ -54,7 +54,7 @@ buffer.append("FROM"); //$NON-NLS-1$ = buffer.append(SPACE); = - buffer.append(args[0]); + buffer.append(args.get(0)); buffer.append(")"); //$NON-NLS-1$ objs.add(buffer.toString()); return objs; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/LeftOrRightFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LeftOrRightFunctionModifier.java 2009-02-24 14:33:28 UTC (rev 4= 87) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LeftOrRightFunctionModifier.java 2009-02-24 16:16:42 UTC (rev 4= 88) @@ -22,6 +22,9 @@ = package com.metamatrix.connector.jdbc.oracle; = +import java.util.Arrays; +import java.util.List; + import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; import com.metamatrix.connector.jdbc.translator.FunctionModifier; @@ -42,25 +45,25 @@ * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) */ public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); IFunction func =3D null; = if (function.getName().equalsIgnoreCase("left")) { //$NON-NLS-1$ func =3D langFactory.createFunction("SUBSTR", //$NON-NLS-1$ - new IExpression[] { - args[0], = + Arrays.asList( + args.get(0), = langFactory.createLiteral(Integer.valueOf(1), TypeFaci= lity.RUNTIME_TYPES.INTEGER), - args[1]}, + args.get(1)), String.class); = } else if (function.getName().equalsIgnoreCase("right")) { //$NON-= NLS-1$ IFunction negIndex =3D langFactory.createFunction("*", //$NON= -NLS-1$ - new IExpression[] {langFactory.createLiteral(Integer.value= Of(-1), TypeFacility.RUNTIME_TYPES.INTEGER), args[1]}, + Arrays.asList(langFactory.createLiteral(Integer.valueOf(-1= ), TypeFacility.RUNTIME_TYPES.INTEGER), args.get(1)), Integer.class); = func =3D langFactory.createFunction("SUBSTR", //$NON-NLS-1$ - new IExpression[] { - args[0], = - negIndex}, + Arrays.asList( + args.get(0), = + negIndex), String.class); = } = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/LocateFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LocateFunctionModifier.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LocateFunctionModifier.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,9 +22,15 @@ = package com.metamatrix.connector.jdbc.oracle; = +import java.util.Arrays; +import java.util.List; + import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.*; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILiteral; = /** * Modify the locate function to use the Oracle instr function. @@ -45,33 +51,28 @@ * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) */ public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); = - IExpression[] instrArgs =3D new IExpression[args.length]; - instrArgs[0] =3D args[1]; - instrArgs[1] =3D args[0]; - = - if(args.length =3D=3D 3) { - if(args[2] instanceof ILiteral) { - ILiteral indexConst =3D (ILiteral)args[2]; - if(indexConst.getValue() =3D=3D null) { - instrArgs[2] =3D args[2]; - } else { + function.setName("instr"); //$NON-NLS-1$ + List args =3D function.getParameters(); = + IExpression expr =3D args.get(0); + args.set(0, args.get(1)); + args.set(1, expr); + if(args.size() =3D=3D 3) { + if(args.get(2) instanceof ILiteral) { + ILiteral indexConst =3D (ILiteral)args.get(2); + if(indexConst.getValue() !=3D null) { // Just modify the constant - Integer index =3D (Integer) ((ILiteral)args[2]).getVal= ue(); - instrArgs[2] =3D langFactory.createLiteral(new Integer= (index.intValue()+1), Integer.class); + Integer index =3D (Integer) indexConst.getValue(); + args.set(2, langFactory.createLiteral(new Integer(inde= x.intValue()+1), Integer.class)); } } else { // Make plus function since this involves an element or fu= nction IFunction plusFunction =3D langFactory.createFunction("+",= //$NON-NLS-1$ - new IExpression[] { args[2], langFactory.createLiteral= (new Integer(1), Integer.class) }, + Arrays.asList( args.get(2), langFactory.createLiteral(= new Integer(1), Integer.class) ), Integer.class); - instrArgs[2] =3D plusFunction; + args.set(2, plusFunction); } = - } - = - IFunction instrFunction =3D langFactory.createFunction("instr", in= strArgs, Integer.class); //$NON-NLS-1$ - = - return instrFunction; = + } = + return function; = } = } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/Log10FunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/Log10FunctionModifier.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/Log10FunctionModifier.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,6 +22,8 @@ = package com.metamatrix.connector.jdbc.oracle; = +import java.util.List; + import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; import com.metamatrix.connector.jdbc.translator.FunctionModifier; import com.metamatrix.connector.language.*; @@ -37,12 +39,9 @@ public IExpression modify(IFunction function) { function.setName("log"); //$NON-NLS-1$ = - IExpression[] args =3D function.getParameters(); - IExpression[] newArgs =3D new IExpression[args.length+1]; - newArgs[1] =3D args[0]; - newArgs[0] =3D languageFactory.createLiteral(new Integer(10), Inte= ger.class); - function.setParameters(newArgs); = - = + List args =3D function.getParameters(); + args.add(args.get(0)); + args.set(0, languageFactory.createLiteral(new Integer(10), Integer= .class)); return function; } = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/MonthOrDayNameFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/MonthOrDayNameFunctionModifier.java 2009-02-24 14:33:28 UTC (re= v 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/MonthOrDayNameFunctionModifier.java 2009-02-24 16:16:42 UTC (re= v 488) @@ -22,9 +22,14 @@ = package com.metamatrix.connector.jdbc.oracle; = +import java.util.Arrays; +import java.util.List; + import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.*; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; = /** * Convert the MONTHNAME etc. function into an equivalent Oracle function.= = @@ -43,17 +48,17 @@ * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) */ public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); = IFunction func =3D langFactory.createFunction("TO_CHAR", //$NON-N= LS-1$ - new IExpression[] { = - args[0], = - langFactory.createLiteral(format, String.class)}, = + Arrays.asList( = + args.get(0), = + langFactory.createLiteral(format, String.class)), = String.class); = // For some reason, these values have trailing spaces IFunction trimFunc =3D langFactory.createFunction("RTRIM", //$NON= -NLS-1$ - new IExpression[] { func }, String.class); + Arrays.asList( func ), String.class); = return trimFunc; = } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/OracleConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleConvertModifier.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleConvertModifier.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,6 +22,7 @@ = package com.metamatrix.connector.jdbc.oracle; = +import java.util.Arrays; import java.util.List; = import com.metamatrix.connector.api.ConnectorLogger; @@ -53,10 +54,10 @@ } = = public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); IExpression modified =3D null; = - String target =3D ((String)((ILiteral)args[1]).getValue()).toLower= Case(); + String target =3D ((String)((ILiteral)args.get(1)).getValue()).toL= owerCase(); if (target.equals("string")) { //$NON-NLS-1$ = modified =3D convertToString(function); } else if (target.equals("short")) { //$NON-NLS-1$ = @@ -93,20 +94,20 @@ = private IExpression convertToDate(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); int srcCode =3D getSrcCode(srcType); = switch(srcCode) { case STRING: // convert(STRING, date) --> to_date(STRING, format) String format =3D "YYYY-MM-DD"; //$NON-NLS-1$ = - convert =3D dateTypeHelper("to_date", new IExpression[] {a= rgs[0], //$NON-NLS-1$ = - langFactory.createLiteral(format, String.class)}, java= .sql.Date.class); + convert =3D dateTypeHelper("to_date", Arrays.asList(args.g= et(0), //$NON-NLS-1$ = + langFactory.createLiteral(format, String.class)), java= .sql.Date.class); break; case TIMESTAMP: // convert(TSELEMENT, date) --> trunc(TSELEMENT) = - convert =3D dateTypeHelper("trunc", new IExpression[] {arg= s[0]}, java.sql.Date.class); //$NON-NLS-1$ = + convert =3D dateTypeHelper("trunc", Arrays.asList(args.get= (0)), java.sql.Date.class); //$NON-NLS-1$ = break; default: convert =3D DROP_MODIFIER.modify(function); = @@ -123,8 +124,8 @@ */ private IExpression convertToTime(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); String format =3D "YYYY-MM-DD HH24:MI:SS"; //$NON-NLS-1$ = = int srcCode =3D getSrcCode(srcType); @@ -132,20 +133,20 @@ case STRING: //convert(STRING, time) --> to_date('1970-01-01 ' || to_ch= ar(timevalue, 'HH24:MI:SS'), 'YYYY-MM-DD HH24:MI:SS') IFunction inner0 =3D langFactory.createFunction("to_char",= //$NON-NLS-1$ - new IExpression[] { = - args[0], - langFactory.createLiteral("HH24:MI:SS", String.cla= ss)}, //$NON-NLS-1$ + Arrays.asList( = + args.get(0), + langFactory.createLiteral("HH24:MI:SS", String.cla= ss)), //$NON-NLS-1$ String.class); = = IExpression prependedPart0 =3D langFactory.createFunction(= "||", //$NON-NLS-1$ - new IExpression[] { + Arrays.asList( langFactory.createLiteral("1970-01-01 ", String.class)= , //$NON-NLS-1$ - inner0}, + inner0), String.class); = = convert =3D langFactory.createFunction("to_date", //$NON-= NLS-1$ - new IExpression[] {prependedPart0, - langFactory.createLiteral(format, String.class)}, = + Arrays.asList(prependedPart0, + langFactory.createLiteral(format, String.class)), = java.sql.Time.class); = break; = = case TIMESTAMP: @@ -153,20 +154,20 @@ // --> to_date(('1970-01-01 ' || to_char(timestampvalue, '= HH24:MI:SS'))), = // 'YYYY-MM-DD HH24:MI:SS') = IFunction inner =3D langFactory.createFunction("to_char", = //$NON-NLS-1$ - new IExpression[] { = - args[0], - langFactory.createLiteral("HH24:MI:SS", String.cla= ss)}, //$NON-NLS-1$ + Arrays.asList( = + args.get(0), + langFactory.createLiteral("HH24:MI:SS", String.cla= ss)), //$NON-NLS-1$ String.class); = = IExpression prependedPart =3D langFactory.createFunction(= "||", //$NON-NLS-1$ - new IExpression[] { + Arrays.asList( langFactory.createLiteral("1970-01-01 ", String.cl= ass), //$NON-NLS-1$ - inner}, + inner), String.class); = convert =3D langFactory.createFunction("to_date", //$NON-= NLS-1$ - new IExpression[] {prependedPart, - langFactory.createLiteral(format, String.class)}, = + Arrays.asList(prependedPart, + langFactory.createLiteral(format, String.class)), = java.sql.Time.class); = = break; default: @@ -179,20 +180,20 @@ = private IExpression convertToTimestamp(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); int srcCode =3D getSrcCode(srcType); switch(srcCode) { case STRING: // convert(STRING, timestamp) --> to_date(timestampvalue, = 'YYYY-MM-DD HH24:MI:SS.FF'))) = String format =3D "YYYY-MM-DD HH24:MI:SS.FF"; //$NON-NLS-= 1$ - convert =3D dateTypeHelper("to_timestamp", new IExpression= [] {args[0], //$NON-NLS-1$ = - langFactory.createLiteral(format, String.class)}, java= .sql.Timestamp.class); + convert =3D dateTypeHelper("to_timestamp", Arrays.asList(a= rgs.get(0), //$NON-NLS-1$ = + langFactory.createLiteral(format, String.class)), java= .sql.Timestamp.class); break; case TIME: case DATE: - convert =3D dateTypeHelper("cast", new IExpression[] {args[0]= , //$NON-NLS-1$ = - langFactory.createLiteral("timestamp", String.clas= s)}, java.sql.Timestamp.class); //$NON-NLS-1$ + convert =3D dateTypeHelper("cast", Arrays.asList(args.get(0),= //$NON-NLS-1$ = + langFactory.createLiteral("timestamp", String.clas= s)), java.sql.Timestamp.class); //$NON-NLS-1$ break; = default: convert =3D DROP_MODIFIER.modify(function); = @@ -212,18 +213,18 @@ = private IExpression convertToString(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); String format =3D null; = int srcCode =3D getSrcCode(function); switch(srcCode) { // convert(input, string) --> to_char(input) case BOOLEAN: - convert =3D langFactory.createFunction("decode", new IExpr= ession[] //$NON-NLS-1$ - { args[0], + convert =3D langFactory.createFunction("decode", Arrays.as= List( //$NON-NLS-1$ + args.get(0), langFactory.createLiteral(new Integer(0), Integer.= class), langFactory.createLiteral("false", String.class), = //$NON-NLS-1$ langFactory.createLiteral(new Integer(1), Integer.= class), - langFactory.createLiteral("true", String.class) },= //$NON-NLS-1$ + langFactory.createLiteral("true", String.class) ),= //$NON-NLS-1$ String.class); = break; @@ -235,19 +236,19 @@ case FLOAT: case DOUBLE: case BIGDECIMAL: - convert =3D createStringFunction(args[0]); + convert =3D createStringFunction(args.get(0)); break; // convert(input, string) --> to_char(input, format) case DATE: format =3D "YYYY-MM-DD"; //$NON-NLS-1$ - convert =3D createStringFunction(args[0], format); = + convert =3D createStringFunction(args.get(0), format); = break; case TIME: format =3D "HH24:MI:SS"; //$NON-NLS-1$ - convert =3D createStringFunction(args[0], format); = + convert =3D createStringFunction(args.get(0), format); = break; case TIMESTAMP: - convert =3D createStringFunction(args[0], "YYYY-MM-DD HH24= :MI:SS.FF"); //$NON-NLS-1$ = + convert =3D createStringFunction(args.get(0), "YYYY-MM-DD = HH24:MI:SS.FF"); //$NON-NLS-1$ = break; default: convert =3D DROP_MODIFIER.modify(function); @@ -446,7 +447,7 @@ return convert; } = = - private IFunction dateTypeHelper(String functionName, IExpression[] ar= gs, Class target) { + private IFunction dateTypeHelper(String functionName, List args, Class target) { IFunction convert =3D langFactory.createFunction(functionName, = args, target); return convert; = @@ -454,50 +455,48 @@ = private IFunction booleanHelper(IFunction function) { // using decode(value, 'true', 1, 'false', 0) - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); = - IExpression[] modified =3D new IExpression[] { - args[0], - langFactory.createLiteral("true", String.class), //$NON-NLS-1$ = - langFactory.createLiteral(new Byte((byte)1), Byte.class), - langFactory.createLiteral("false", String.class), //$NON-NLS-1= $ = - langFactory.createLiteral(new Byte((byte)0), Byte.class) = = - }; - = return langFactory.createFunction("decode", //$NON-NLS-1$ - modified, java.lang.Boolean.class); = + Arrays.asList( + args.get(0), + langFactory.createLiteral("true", String.class), //$N= ON-NLS-1$ = + langFactory.createLiteral(new Byte((byte)1), Byte.cla= ss), + langFactory.createLiteral("false", String.class), //$= NON-NLS-1$ = + langFactory.createLiteral(new Byte((byte)0), Byte.cla= ss) = + ), java.lang.Boolean.class); = } = private IExpression stringSrcHelper(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); // switch the target type String functionName =3D "to_number"; //$NON-NLS-1$ int targetCode =3D getTargetCode(function.getType()); switch(targetCode) { case BYTE: - convert =3D createFunction(functionName, args[0], Byte.cla= ss); + convert =3D createFunction(functionName, args.get(0), Byte= .class); break; case SHORT: - convert =3D createFunction(functionName, args[0], Short.cl= ass); + convert =3D createFunction(functionName, args.get(0), Shor= t.class); break; = case INTEGER: - convert =3D createFunction(functionName, args[0], Integer.= class); + convert =3D createFunction(functionName, args.get(0), Inte= ger.class); break; case LONG: - convert =3D createFunction(functionName, args[0], Long.cla= ss); + convert =3D createFunction(functionName, args.get(0), Long= .class); break; = case BIGINTEGER: - convert =3D createFunction(functionName, args[0], java.mat= h.BigInteger.class); + convert =3D createFunction(functionName, args.get(0), java= .math.BigInteger.class); break; = case FLOAT: - convert =3D createFunction(functionName, args[0], Float.cl= ass); + convert =3D createFunction(functionName, args.get(0), Floa= t.class); break; case DOUBLE: - convert =3D createFunction(functionName, args[0], Double.c= lass); + convert =3D createFunction(functionName, args.get(0), Doub= le.class); break; case BIGDECIMAL: - convert =3D createFunction(functionName, args[0], java.mat= h.BigDecimal.class); + convert =3D createFunction(functionName, args.get(0), java= .math.BigDecimal.class); break; = default: convert =3D DROP_MODIFIER.modify(function); @@ -508,26 +507,26 @@ = private IFunction createFunction(String functionName, IExpression args= 0, Class targetClass) { IFunction created =3D langFactory.createFunction(functionName, - new IExpression[] {args0}, targetClass); + Arrays.asList(args0), targetClass); return created; = } = private IFunction createStringFunction(IExpression args0, String forma= t) { IFunction created =3D langFactory.createFunction("to_char", //$NON= -NLS-1$ = - new IExpression[] {args0, langFactory.createLiteral(format, St= ring.class)}, = + Arrays.asList(args0, langFactory.createLiteral(format, String.= class)), = String.class); return created; = } = private IFunction createStringFunction(IExpression args) { IFunction created =3D langFactory.createFunction("to_char", //$NON= -NLS-1$ = - new IExpression[] { args }, String.class); = + Arrays.asList( args ), String.class); = return created; } = private int getSrcCode(IFunction function) { - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); return ((Integer) typeMap.get(srcType)).intValue(); } = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/oracle/OracleSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLTranslator.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLTranslator.java 2009-02-24 16:16:42 UTC (rev 488) @@ -46,7 +46,6 @@ import com.metamatrix.connector.language.ILimit; import com.metamatrix.connector.language.ISetQuery.Operation; import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.visitor.util.SQLReservedWords; = /** @@ -99,7 +98,7 @@ * then pull the Sequence name out of the name in source of the co= lumn. */ IInsert insert =3D (IInsert)command; - List allElements =3D insert.getGroup().getMetadataID().ge= tChildIDs(); + List allElements =3D insert.getGroup().getMetadataObject().g= etChildren(); if (allElements.size() =3D=3D insert.getValues().size()) { return command; } @@ -107,8 +106,7 @@ int index =3D 0; List elements =3D insert.getElements(); = - for (MetadataID metadataID : allElements) { - Element element =3D (Element)metadataID.getMetadataObject(); + for (Element element : allElements) { if (!element.isAutoIncremented()) { continue; } @@ -119,7 +117,7 @@ } boolean found =3D false; while (index < elements.size()) { - if (metadataID.equals(elements.get(index).getMetadataID())) { + if (element.equals(elements.get(index).getMetadataObject())) { found =3D true; break; } @@ -140,7 +138,7 @@ = IGroup sequenceGroup =3D this.getLanguageFactory().createGroup= (sequenceGroupName, null, null); IElement sequenceElement =3D this.getLanguageFactory().createE= lement(sequenceElementName, sequenceGroup, null, element.getJavaType()); - insert.getElements().add(index, this.getLanguageFactory().crea= teElement(element.getMetadataID().getName(), insert.getGroup(), metadataID,= element.getJavaType())); + insert.getElements().add(index, this.getLanguageFactory().crea= teElement(element.getName(), insert.getGroup(), element, element.getJavaTyp= e())); insert.getValues().add(index, sequenceElement); } return command; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/postgresql/DatePartFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/DatePartFunctionModifier.java 2009-02-24 14:33:28 UTC (rev = 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/DatePartFunctionModifier.java 2009-02-24 16:16:42 UTC (rev = 488) @@ -22,6 +22,8 @@ = package com.metamatrix.connector.jdbc.postgresql; = +import java.util.Arrays; + import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; @@ -43,7 +45,7 @@ = public IExpression modify(IFunction function) { return factory.createFunction("date_part", //$NON-NLS-1$ - new IExpression[] {factory.createLi= teral(part, String.class), function.getParameters()[0]}, + Arrays.asList(factory.createLiteral= (part, String.class), function.getParameters().get(0)), Integer.class); } } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/postgresql/ModifiedDatePartFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/ModifiedDatePartFunctionModifier.java 2009-02-24 14:33:28 U= TC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/ModifiedDatePartFunctionModifier.java 2009-02-24 16:16:42 U= TC (rev 488) @@ -22,6 +22,8 @@ = package com.metamatrix.connector.jdbc.postgresql; = +import java.util.Arrays; + import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; @@ -44,7 +46,7 @@ public IExpression modify(IFunction function) { IExpression expr =3D super.modify(function); return factory.createFunction(modifier, - new IExpression[] {expr, factory.cr= eateLiteral(arg, arg.getClass())}, + Arrays.asList(expr, factory.createL= iteral(arg, arg.getClass())), arg.getClass()); } = Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/postgresql/PostgreSQLConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLConvertModifier.java 2009-02-24 14:33:28 UTC (rev= 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLConvertModifier.java 2009-02-24 16:16:42 UTC (rev= 488) @@ -51,33 +51,33 @@ } = = public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); = - if (args[0] !=3D null && args[0] instanceof ILiteral && ((ILiteral= )args[0]).getValue() =3D=3D null ) { - if (args[1] !=3D null && args[1] instanceof ILiteral) { + if (args.get(0) !=3D null && args.get(0) instanceof ILiteral && ((= ILiteral)args.get(0)).getValue() =3D=3D null ) { + if (args.get(1) !=3D null && args.get(1) instanceof ILiteral) { // This is a convert(null, ...) or cast(null as ...) return DROP_MODIFIER.modify(function); } } = = - if (args[1] !=3D null && args[1] instanceof ILiteral) { - String target =3D ((String)((ILiteral)args[1]).getValue()).toL= owerCase(); + if (args.get(1) !=3D null && args.get(1) instanceof ILiteral) { + String target =3D ((String)((ILiteral)args.get(1)).getValue())= .toLowerCase(); if (target.equals("string")) { //$NON-NLS-1$ = return convertToString(function); } else if (target.equals("short")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "smallint", Short.class= ); //$NON-NLS-1$ + return createCastFunction(args.get(0), "smallint", Short.c= lass); //$NON-NLS-1$ } else if (target.equals("integer")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "integer", Integer.clas= s); //$NON-NLS-1$ + return createCastFunction(args.get(0), "integer", Integer.= class); //$NON-NLS-1$ } else if (target.equals("long")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "bigint", Long.class); = //$NON-NLS-1$ + return createCastFunction(args.get(0), "bigint", Long.clas= s); //$NON-NLS-1$ } else if (target.equals("biginteger")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "numeric", BigInteger.c= lass); //$NON-NLS-1$ + return createCastFunction(args.get(0), "numeric", BigInteg= er.class); //$NON-NLS-1$ } else if (target.equals("float")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "real", Float.class); /= /$NON-NLS-1$ + return createCastFunction(args.get(0), "real", Float.class= ); //$NON-NLS-1$ } else if (target.equals("double")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "float8", Double.class)= ; //$NON-NLS-1$ + return createCastFunction(args.get(0), "float8", Double.cl= ass); //$NON-NLS-1$ } else if (target.equals("bigdecimal")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "decimal", BigDecimal.c= lass); //$NON-NLS-1$ + return createCastFunction(args.get(0), "decimal", BigDecim= al.class); //$NON-NLS-1$ } else if (target.equals("date")) { //$NON-NLS-1$ = return convertToDate(function); } else if (target.equals("time")) { //$NON-NLS-1$ = @@ -85,44 +85,44 @@ } else if (target.equals("timestamp")) { //$NON-NLS-1$ = return convertToTimestamp(function); } else if (target.equals("char")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "varchar", String.class= ); //$NON-NLS-1$ + return createCastFunction(args.get(0), "varchar", String.c= lass); //$NON-NLS-1$ } else if (target.equals("boolean")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "boolean", Boolean.clas= s); //$NON-NLS-1$ + return createCastFunction(args.get(0), "boolean", Boolean.= class); //$NON-NLS-1$ } else if (target.equals("byte")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "smallint", Byte.class)= ; //$NON-NLS-1$ + return createCastFunction(args.get(0), "smallint", Byte.cl= ass); //$NON-NLS-1$ } } return DROP_MODIFIER.modify(function); = } = private IExpression convertToDate(IFunction function) { - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); int srcCode =3D getSrcCode(function); = switch(srcCode) { case STRING: - return createConversionFunction("to_date", args[0], "YYYY-= MM-DD", java.sql.Date.class); //$NON-NLS-1$//$NON-NLS-2$ + return createConversionFunction("to_date", args.get(0), "Y= YYY-MM-DD", java.sql.Date.class); //$NON-NLS-1$//$NON-NLS-2$ case TIMESTAMP: - return createCastFunction(args[0], "date", java.sql.Date.c= lass); //$NON-NLS-1$ + return createCastFunction(args.get(0), "date", java.sql.Da= te.class); //$NON-NLS-1$ default: return DROP_MODIFIER.modify(function); } } = private IExpression convertToTime(IFunction function) { - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); = int srcCode =3D getSrcCode(function); switch(srcCode) { case STRING: //convert(STRING, time) --> to_timestamp('1970-01-01 ' || = timevalue, 'YYYY-MM-DD HH24:MI:SS') IExpression prependedPart0 =3D langFactory.createFunction(= "||", //$NON-NLS-1$ - = new IExpression[] {langFactory.createLiteral("1970-01-01 ", String.class), = args[0]}, //$NON-NLS-1$ + = Arrays.asList(langFactory.createLiteral("1970-01-01 ", String.class), args.= get(0)), //$NON-NLS-1$ = String.class); = = return createConversionFunction("to_timestamp", prependedP= art0, "YYYY-MM-DD HH24:MI:SS", java.sql.Time.class); //$NON-NLS-1$ //$NON-N= LS-2$ case TIMESTAMP: - return createCastFunction(args[0], "time", java.sql.Time.c= lass); //$NON-NLS-1$ + return createCastFunction(args.get(0), "time", java.sql.Ti= me.class); //$NON-NLS-1$ default: return DROP_MODIFIER.modify(function); } @@ -134,16 +134,16 @@ * @return IFunction */ private IExpression convertToTimestamp(IFunction function) { - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); int srcCode =3D getSrcCode(function); switch(srcCode) { case STRING: // convert(STRING, timestamp) --> to_date(timestampvalue, = 'YYYY-MM-DD HH24:MI:SS'))) from smalla = - return createConversionFunction("to_timestamp", args[0], "= YYYY-MM-DD HH24:MI:SS.UF", java.sql.Timestamp.class); //$NON-NLS-1$ //$NON-= NLS-2$ + return createConversionFunction("to_timestamp", args.get(0= ), "YYYY-MM-DD HH24:MI:SS.UF", java.sql.Timestamp.class); //$NON-NLS-1$ //$= NON-NLS-2$ case TIME: case DATE: // convert(DATE, timestamp) --> to_date(to_char(DATE, 'YYY= Y-MM-DD HH24:MI:SS'), 'YYYY-MM-DD HH24:MI:SS') - IFunction inner =3D createStringFunction(args[0], "YYYY-MM= -DD HH24:MI:SS"); //$NON-NLS-1$ + IFunction inner =3D createStringFunction(args.get(0), "YYY= Y-MM-DD HH24:MI:SS"); //$NON-NLS-1$ = return createConversionFunction("to_timestamp", inner, "YY= YY-MM-DD HH24:MI:SS", java.sql.Timestamp.class); //$NON-NLS-1$ //$NON-NLS-2$ default: @@ -152,14 +152,14 @@ } = private IExpression convertToString(IFunction function) { - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); = int srcCode =3D getSrcCode(function); switch(srcCode) { = case BOOLEAN: // convert(booleanSrc, string) --> CASE WHEN booleanSrc TH= EN '1' ELSE '0' END - List when =3D Arrays.asList(langFactory.createCompareCrite= ria(Operator.EQ, function.getParameters()[0], langFactory.createLiteral(Boo= lean.TRUE, Boolean.class))); - List then =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral("1", String.class)}); //$NON-NLS-1$ + List when =3D Arrays.asList(langFactory.createCompareCrite= ria(Operator.EQ, function.getParameters().get(0), langFactory.createLiteral= (Boolean.TRUE, Boolean.class))); + List then =3D Arrays.asList(langFactory.createLiteral("1",= String.class)); //$NON-NLS-1$ IExpression elseExpr =3D langFactory.createLiteral("0", St= ring.class); //$NON-NLS-1$ return langFactory.createSearchedCaseExpression(when, then= , elseExpr, String.class); case BYTE: @@ -171,14 +171,14 @@ case DOUBLE: case BIGDECIMAL: // convert(src, string) --> cast (src AS varchar) - return createCastFunction(args[0], "varchar", String.class= ); //$NON-NLS-1$ + return createCastFunction(args.get(0), "varchar", String.c= lass); //$NON-NLS-1$ // convert(input, string) --> to_char(input, format) case DATE: - return createStringFunction(args[0], "YYYY-MM-DD"); //$NON= -NLS-1$ + return createStringFunction(args.get(0), "YYYY-MM-DD"); //= $NON-NLS-1$ case TIME: - return createStringFunction(args[0], "HH24:MI:SS"); //$NON= -NLS-1$ + return createStringFunction(args.get(0), "HH24:MI:SS"); //= $NON-NLS-1$ case TIMESTAMP: - return createStringFunction(args[0], "YYYY-MM-DD HH24:MI:S= S.US"); //$NON-NLS-1$ + return createStringFunction(args.get(0), "YYYY-MM-DD HH24:= MI:SS.US"); //$NON-NLS-1$ default: return DROP_MODIFIER.modify(function); } @@ -193,12 +193,12 @@ } = private IFunction createConversionFunction(String functionName, IExpre= ssion value, String target, Class targetClass) { - return langFactory.createFunction(functionName, new IExpression[] = {value, langFactory.createLiteral(target, String.class)}, targetClass); + return langFactory.createFunction(functionName, Arrays.asList(valu= e, langFactory.createLiteral(target, String.class)), targetClass); } = private int getSrcCode(IFunction function) { - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); return ((Integer) typeMap.get(srcType)).intValue(); } } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/sybase/ModFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/ModFunctionModifier.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/ModFunctionModifier.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,6 +22,8 @@ = package com.metamatrix.connector.jdbc.sybase; = +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; = import com.metamatrix.connector.api.TypeFacility.RUNTIME_TYPES; @@ -41,26 +43,21 @@ = @Override public IExpression modify(IFunction function) { - IExpression[] expressions =3D function.getParameters(); - if (RUNTIME_TYPES.INTEGER.equals(expressions[0].getType())) { + List expressions =3D function.getParameters(); + if (RUNTIME_TYPES.INTEGER.equals(expressions.get(0).getType())) { return super.modify(function); } //x % y =3D> x - floor(x / y) * y - IExpression[] divideArgs =3D new IExpression[2]; - System.arraycopy(expressions, 0, divideArgs, 0, 2); - IFunction divide =3D langFactory.createFunction("/", divideArgs, divideA= rgs[0].getType()); //$NON-NLS-1$ + IFunction divide =3D langFactory.createFunction("/", new ArrayList(expressions), expressions.get(0).getType()); //$NON-NLS-1$ = - IFunction floor =3D langFactory.createFunction("floor", new IExpression[= ] {divide}, divide.getType()); //$NON-NLS-1$ + IFunction floor =3D langFactory.createFunction("floor", Arrays.asList(di= vide), divide.getType()); //$NON-NLS-1$ = - IExpression[] multArgs =3D new IExpression[] { - floor, expressions[1] - }; - IFunction mult =3D langFactory.createFunction("*", multArgs, multArgs[1]= .getType()); //$NON-NLS-1$ + List multArgs =3D Arrays.asList(floor, expressions.get(1)); + IFunction mult =3D langFactory.createFunction("*", multArgs, multArgs.ge= t(1).getType()); //$NON-NLS-1$ + + List minusArgs =3D Arrays.asList(expressions.get(0), mult); = - IExpression[] minusArgs =3D new IExpression[] { - expressions[0], mult - }; - return langFactory.createFunction("-", minusArgs, minusArgs[0].getType()= ); //$NON-NLS-1$ + return langFactory.createFunction("-", minusArgs, minusArgs.get(0).getTy= pe()); //$NON-NLS-1$ } = @Override Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/sybase/SybaseConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseConvertModifier.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseConvertModifier.java 2009-02-24 16:16:42 UTC (rev 488) @@ -23,12 +23,16 @@ package com.metamatrix.connector.jdbc.sybase; = import java.util.ArrayList; +import java.util.Arrays; import java.util.List; = import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.*; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILiteral; = /** */ @@ -47,11 +51,11 @@ } = public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); IExpression modified =3D null; = - if (args[1] !=3D null && args[1] instanceof ILiteral) { - String target =3D ((String)((ILiteral)args[1]).getValue()).toL= owerCase(); + if (args.get(1) !=3D null && args.get(1) instanceof ILiteral) { + String target =3D ((String)((ILiteral)args.get(1)).getValue())= .toLowerCase(); if (target.equals("string")) { //$NON-NLS-1$ = modified =3D convertToString(function); } else if (target.equals("short")) { //$NON-NLS-1$ = @@ -96,17 +100,17 @@ List parts =3D new ArrayList(); parts.add("convert("); //$NON-NLS-1$ = - IExpression[] args =3D function.getParameters(); + List args =3D function.getParameters(); = - if(args !=3D null && args.length > 0) { - ILiteral type =3D (ILiteral) args[0]; + if(args !=3D null && args.size() > 0) { + ILiteral type =3D (ILiteral) args.get(0); String typeStr =3D type.getValue().toString(); = parts.add(typeStr); = - for(int i=3D1; i args =3D function.getParameters(); + Class src =3D args.get(0).getType(); int srcCode =3D getSrcCode(src); = switch(srcCode) { @@ -130,7 +134,7 @@ case FLOAT: case DOUBLE: case BIGDECIMAL: - convert =3D createFunction(args[0], "bit", Boolean.class);= //$NON-NLS-1$ = + convert =3D createFunction(args.get(0), "bit", Boolean.cla= ss); //$NON-NLS-1$ = break; = default: convert =3D DROP_MODIFIER.modify(function); @@ -142,8 +146,8 @@ = private IExpression convertToByte(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); int srcCode =3D getSrcCode(src); = switch(srcCode) { @@ -156,7 +160,7 @@ case FLOAT: case DOUBLE: case BIGDECIMAL: - convert =3D createFunction(args[0], "tinyint", String.clas= s); //$NON-NLS-1$ = + convert =3D createFunction(args.get(0), "tinyint", String.= class); //$NON-NLS-1$ = break; = default: convert =3D DROP_MODIFIER.modify(function); = @@ -168,8 +172,8 @@ = private IExpression convertToString(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); int srcCode =3D getSrcCode(src); = switch(srcCode) { = @@ -183,17 +187,17 @@ case FLOAT: case DOUBLE: case BIGDECIMAL: = - convert =3D createFunction(args[0], "varchar", String.clas= s); //$NON-NLS-1$ = + convert =3D createFunction(args.get(0), "varchar", String.= class); //$NON-NLS-1$ = break; = case DATE: // convert(date, string) --> convert(varchar, date,= 112) = //TODO: what is the best format 111/110/101? - convert =3D createFunction(args[0], 101, String.class); + convert =3D createFunction(args.get(0), 101, String.class); break; case TIME: // convert(time, string) --> convert(varchar, time,= 108) - convert =3D createFunction(args[0], 108, String.class); = = + convert =3D createFunction(args.get(0), 108, String.class)= ; = break; case TIMESTAMP: // convert(time, string) --> convert(varchar,= timestamp, 109) = - convert =3D createFunction(args[0], 109, String.class); = = + convert =3D createFunction(args.get(0), 109, String.class)= ; = break; default: convert =3D DROP_MODIFIER.modify(function); @@ -205,8 +209,8 @@ = private IExpression convertToShort(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); int srcCode =3D getSrcCode(src); = switch(srcCode) { @@ -219,7 +223,7 @@ case FLOAT: case DOUBLE: case BIGDECIMAL: - convert =3D createFunction(args[0], "smallint", Short.clas= s); //$NON-NLS-1$ + convert =3D createFunction(args.get(0), "smallint", Short.= class); //$NON-NLS-1$ break; default: convert =3D DROP_MODIFIER.modify(function); = @@ -231,8 +235,8 @@ = private IExpression convertToInteger(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); int srcCode =3D getSrcCode(src); = switch(srcCode) { @@ -245,7 +249,7 @@ case FLOAT: case DOUBLE: case BIGDECIMAL: - convert =3D createFunction(args[0], "int", Integer.class);= //$NON-NLS-1$ + convert =3D createFunction(args.get(0), "int", Integer.cla= ss); //$NON-NLS-1$ break; default: convert =3D DROP_MODIFIER.modify(function); = @@ -257,8 +261,8 @@ = private IExpression convertToLong(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); int srcCode =3D getSrcCode(src); = switch(srcCode) { @@ -271,7 +275,7 @@ case FLOAT: case DOUBLE: case BIGDECIMAL: - convert =3D createFunction(args[0], "numeric", Long.class)= ; //$NON-NLS-1$ + convert =3D createFunction(args.get(0), "numeric", Long.cl= ass); //$NON-NLS-1$ break; default: convert =3D DROP_MODIFIER.modify(function); = @@ -283,8 +287,8 @@ = private IExpression convertToBigInteger(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); int srcCode =3D getSrcCode(src); = switch(srcCode) { @@ -297,7 +301,7 @@ case FLOAT: case DOUBLE: case BIGDECIMAL: - convert =3D createFunction(args[0], "numeric", java.math.B= igInteger.class); //$NON-NLS-1$ + convert =3D createFunction(args.get(0), "numeric", java.ma= th.BigInteger.class); //$NON-NLS-1$ break; default: convert =3D DROP_MODIFIER.modify(function); = @@ -309,8 +313,8 @@ = private IExpression convertToFloat(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); int srcCode =3D getSrcCode(src); = switch(srcCode) { @@ -323,7 +327,7 @@ case BIGINTEGER: = case DOUBLE: = case BIGDECIMAL: - convert =3D createFunction(args[0], "real", Float.class); = //$NON-NLS-1$ + convert =3D createFunction(args.get(0), "real", Float.clas= s); //$NON-NLS-1$ break; default: convert =3D DROP_MODIFIER.modify(function); = @@ -335,8 +339,8 @@ = private IExpression convertToDouble(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); int srcCode =3D getSrcCode(src); = switch(srcCode) { @@ -349,7 +353,7 @@ case BIGINTEGER: = case FLOAT: = case BIGDECIMAL: = - convert =3D createFunction(args[0], "float", Double.class)= ; //$NON-NLS-1$ + convert =3D createFunction(args.get(0), "float", Double.cl= ass); //$NON-NLS-1$ break; default: convert =3D DROP_MODIFIER.modify(function); = @@ -361,8 +365,8 @@ = private IExpression convertToBigDecimal(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); int srcCode =3D getSrcCode(src); = switch(srcCode) { @@ -375,7 +379,7 @@ case BIGINTEGER: = case FLOAT: = case DOUBLE: - convert =3D createFunction(args[0], "float", java.math.Big= Decimal.class); //$NON-NLS-1$ + convert =3D createFunction(args.get(0), "float", java.math= .BigDecimal.class); //$NON-NLS-1$ break; = default: convert =3D DROP_MODIFIER.modify(function); = @@ -386,36 +390,36 @@ } = private IExpression convertToChar(IFunction function) { - IExpression[] args =3D function.getParameters(); - return createFunction(args[0], "char", Character.class); //$NON-NL= S-1$ + List args =3D function.getParameters(); + return createFunction(args.get(0), "char", Character.class); //$NO= N-NLS-1$ } = = private IExpression convertToDate(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); int srcCode =3D getSrcCode(srcType); = switch(srcCode) { case STRING: // convert(STRING, date) --> convert(datetime, STRING) - convert =3D createFunction(args[0], "datetime", java.sql.D= ate.class); //$NON-NLS-1$ + convert =3D createFunction(args.get(0), "datetime", java.s= ql.Date.class); //$NON-NLS-1$ break; case TIMESTAMP: // convert(TIMESTAMP, date) --> convert(datetime, convert(= varchar, TIMESTAMP, 1/101)) // Build inner convert IFunction innerConvert =3D langFactory.createFunction("con= vert", //$NON-NLS-1$ - new IExpression[] { = + Arrays.asList( = langFactory.createLiteral("varchar", String.class)= , //$NON-NLS-1$ - args[0], - langFactory.createLiteral(new Integer(109), Intege= r.class) }, + args.get(0), + langFactory.createLiteral(new Integer(109), Intege= r.class) ), String.class); = // Build outer convert convert =3D langFactory.createFunction("convert", //$NON-= NLS-1$ - new IExpression[] { = + Arrays.asList( = langFactory.createLiteral("datetime", String.class= ), //$NON-NLS-1$ - innerConvert }, + innerConvert ), java.sql.Timestamp.class); = break; @@ -429,30 +433,30 @@ = private IExpression convertToTime(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); = int srcCode =3D getSrcCode(srcType); switch(srcCode) { case STRING: //convert(STRING, time) --> convert(datetime, STRING) - convert =3D createFunction(args[0], "datetime", java.sql.T= ime.class); //$NON-NLS-1$ + convert =3D createFunction(args.get(0), "datetime", java.s= ql.Time.class); //$NON-NLS-1$ break; = = case TIMESTAMP: // convert(TIMESTAMP, time) --> convert(datetime, convert(= varchar, TIMESTAMP, 108/8) = // Build inner convert IFunction innerConvert =3D langFactory.createFunction("con= vert", //$NON-NLS-1$ - new IExpression[] { = + Arrays.asList( = langFactory.createLiteral("varchar", String.class)= , //$NON-NLS-1$ - args[0], - langFactory.createLiteral(new Integer(108), Intege= r.class) }, + args.get(0), + langFactory.createLiteral(new Integer(108), Intege= r.class) ), String.class); = // Build outer convert convert =3D langFactory.createFunction("convert", //$NON-= NLS-1$ - new IExpression[] { = + Arrays.asList( = langFactory.createLiteral("datetime", String.class= ), //$NON-NLS-1$ - innerConvert }, + innerConvert ), java.sql.Time.class); = break; @@ -466,15 +470,15 @@ = private IExpression convertToTimestamp(IFunction function) { IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); int srcCode =3D getSrcCode(srcType); switch(srcCode) { case STRING: case TIME: = case DATE: // convert(DATE/TIME/STRING, timestamp) --> convert(dateti= me, DATE) - convert =3D createFunction(args[0], "datetime", java.sql.T= imestamp.class); //$NON-NLS-1$ = + convert =3D createFunction(args.get(0), "datetime", java.s= ql.Timestamp.class); //$NON-NLS-1$ = break; = default: convert =3D DROP_MODIFIER.modify(function); = @@ -486,18 +490,18 @@ = private IFunction createFunction(IExpression args0, String targetType,= Class targetClass) { IFunction created =3D langFactory.createFunction("convert", //$NON= -NLS-1$ - new IExpression[] { + Arrays.asList( langFactory.createLiteral(targetType, String.class), - args0}, = + args0), = targetClass); return created; = } = private IFunction createFunction(IExpression args0, int formatNumber, = Class targetClass) { IFunction created =3D langFactory.createFunction("convert", //$NO= N-NLS-1$ - new IExpression[] { langFactory.createLiteral("varchar", Strin= g.class), //$NON-NLS-1$ = + Arrays.asList( langFactory.createLiteral("varchar", String.cla= ss), //$NON-NLS-1$ = args0, - langFactory.createLiteral(new Integer(formatNumber), Integ= er.class) }, = + langFactory.createLiteral(new Integer(formatNumber), Integ= er.class) ), = targetClass); return created; = } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/translator/BasicFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/BasicFunctionModifier.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/BasicFunctionModifier.java 2009-02-24 16:16:42 UTC (rev 488) @@ -98,13 +98,13 @@ List objs =3D new ArrayList(); objs.add(function.getName()); objs.add("("); //$NON-NLS-1$ - IExpression[] params =3D function.getParameters(); - if(params.length > 0) { = - objs.add(params[0]); - if(params.length > 1) { - for(int i=3D1; i params =3D function.getParameters(); + if(params.size() > 0) { = + objs.add(params.get(0)); + if(params.size() > 1) { + for(int i=3D1; i args =3D function.getParameters(); + if(args.size() <=3D replaceIndex) { = throw new IllegalArgumentException(JDBCPlugin.Util.getString("= DropFunctionModifier.DropFunctionModifier_can_only_be_used_on_functions_wit= h___1") + function); //$NON-NLS-1$ } = - return args[replaceIndex]; + return args.get(replaceIndex); } } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/translator/SQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/SQLConversionVisitor.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/SQLConversionVisitor.java 2009-02-24 16:16:42 UTC (rev 488) @@ -246,7 +246,7 @@ } = prepareCallBuffer.append(" call ");//$NON-NLS-1$ - prepareCallBuffer.append(exec.getMetadataID() !=3D null ? getName(= exec.getMetadataID()) : exec.getProcedureName()); + prepareCallBuffer.append(exec.getMetadataObject() !=3D null ? getN= ame(exec.getMetadataObject()) : exec.getProcedureName()); prepareCallBuffer.append("("); //$NON-NLS-1$ = int numberOfParameters =3D 0; Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/translator/SubstringFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/SubstringFunctionModifier.java 2009-02-24 14:33:28 UTC (rev= 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/SubstringFunctionModifier.java 2009-02-24 16:16:42 UTC (rev= 488) @@ -22,6 +22,9 @@ = package com.metamatrix.connector.jdbc.translator; = +import java.util.Arrays; +import java.util.List; + import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; @@ -43,20 +46,11 @@ * @see com.metamatrix.connector.jdbc.translator.FunctionModifier#modi= fy(com.metamatrix.query.sql.symbol.Function) */ public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - IExpression[] newArgs =3D new IExpression[3]; - function.setParameters(newArgs); - - newArgs[0] =3D args[0]; - newArgs[1] =3D args[1]; + List args =3D function.getParameters(); = - if(args.length =3D=3D 2) { - newArgs[2] =3D languageFactory.createFunction(length_function,= new IExpression[] { args[0] }, Integer.class); = - } else { - newArgs[2] =3D args[2]; - } - = - function.setParameters(newArgs); + if(args.size() =3D=3D 2) { + args.add(languageFactory.createFunction(length_function, Array= s.asList(args.get(0)), Integer.class)); = + } = = return function; } Modified: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conn= ector/jdbc/util/FunctionReplacementVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/util/FunctionReplacementVisitor.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/util/FunctionReplacementVisitor.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,7 +22,6 @@ = package com.metamatrix.connector.jdbc.util; = -import java.util.ArrayList; import java.util.List; import java.util.Map; = @@ -84,12 +83,10 @@ */ public void visit(IFunction obj) { super.visit(obj); - IExpression[] args =3D obj.getParameters(); - IExpression[] newArgs =3D new IExpression[args.length]; - for(int i=3D0; i args =3D obj.getParameters(); + for(int i=3D0; i expressions =3D obj.getElements(); = for (int i=3D0; i rightExprs =3D obj.getRightExpressions(); = for(int i=3D0; i values =3D obj.getValues(); = for(int i=3D0; i outArgs =3D func.getParameters(); + assertEquals(2, outArgs.size()); + assertEquals(arg, outArgs.get(1)); = - assertTrue(outArgs[1] instanceof ILiteral); - ILiteral newArg =3D (ILiteral) outArgs[0]; + assertTrue(outArgs.get(1) instanceof ILiteral); + ILiteral newArg =3D (ILiteral) outArgs.get(0); assertEquals(Integer.class, newArg.getType()); assertEquals(new Integer(10), newArg.getValue()); = Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestMonthOrDayNameFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-24 14:33:28 UTC= (rev 487) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-24 16:16:42 UTC= (rev 488) @@ -23,6 +23,7 @@ package com.metamatrix.connector.jdbc.oracle; = import java.sql.Timestamp; +import java.util.Arrays; import java.util.Properties; = import junit.framework.TestCase; @@ -52,7 +53,7 @@ = public IExpression helpTestMod(ILiteral c, String format, String expec= tedStr) throws Exception { IFunction func =3D LANG_FACTORY.createFunction(format.toLowerCase(= )+"name", // "monthname" //$NON-NLS-1$ = - new IExpression[] { c }, + Arrays.asList( c ), String.class); = MonthOrDayNameFunctionModifier mod =3D new MonthOrDayNameFunctionM= odifier (LANG_FACTORY, format); Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestOracleConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestOracleConvertModifier.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestOracleConvertModifier.java 2009-02-24 16:16:42 UTC (rev 488) @@ -25,6 +25,7 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Timestamp; +import java.util.Arrays; import java.util.Properties; = import junit.framework.TestCase; @@ -64,9 +65,9 @@ = public void helpTest(IExpression srcExpression, String tgtType, String= expectedExpression) throws Exception { IFunction func =3D LANG_FACTORY.createFunction("convert", //$NON-= NLS-1$ - new IExpression[] { = + Arrays.asList( = srcExpression, - LANG_FACTORY.createLiteral(tgtType, String.class)}, + LANG_FACTORY.createLiteral(tgtType, String.class)), TypeFacility.getDataTypeClass(tgtType)); = OracleConvertModifier mod =3D new OracleConvertModifier(LANG_FACTO= RY, null); Modified: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conn= ector/jdbc/oracle/TestSubstringFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestSubstringFunctionModifier.java 2009-02-24 14:33:28 UTC (rev= 487) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestSubstringFunctionModifier.java 2009-02-24 16:16:42 UTC (rev= 488) @@ -22,6 +22,7 @@ = package com.metamatrix.connector.jdbc.oracle; = +import java.util.Arrays; import java.util.Properties; = import junit.framework.TestCase; @@ -52,7 +53,7 @@ = public IExpression helpTestMod(IExpression[] args, String expectedStr)= throws Exception { IFunction func =3D LANG_FACTORY.createFunction("substring", //$NO= N-NLS-1$ - args, TypeFacility.RUNTIME_TYPES.STRING); + Arrays.asList(args), TypeFacility.RUNTIME_TYPES.STRING); = OracleSQLTranslator trans =3D new OracleSQLTranslator(); trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/IQueryToLdapSearchParser.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/IQueryToLdapSearchParser.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/IQueryToLdapSearchParser.java 2009-02-24 16:16:42 UTC (rev 488) @@ -75,7 +75,6 @@ import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** @@ -240,7 +239,7 @@ // TODO: Re-use the getExpressionString method if possible, rather than = // rewriting the same code twice. if(fromItem instanceof IGroup) { - Group group =3D (Group) rm.getObject(((IGroup)fromItem).getMetadataID()= ); + Group group =3D ((IGroup)fromItem).getMetadataObject(); nameInSource =3D group.getNameInSource(); // if NameInSource is null set it to an empty // string instead so we can safely call split on it @@ -277,13 +276,12 @@ private String getRestrictToNamedClass(IFromItem fromItem) throws Connect= orException { String nameInSource; String namedClass =3D null; - MetadataID mdIDGroup; if(fromItem instanceof IGroup) { // Here we use slightly different logic than in // getContextNameFromFromItem so it is easier to get // the group name later if needed - mdIDGroup =3D ((IGroup)fromItem).getMetadataID(); - nameInSource =3D rm.getObject(mdIDGroup).getNameInSource(); + Group mdIDGroup =3D ((IGroup)fromItem).getMetadataObject(); + nameInSource =3D mdIDGroup.getNameInSource(); // groupName =3D mdIDGroup.getName(); // if NameInSource is null set it to an empty // string instead so we can safely call split on it @@ -319,7 +317,7 @@ // TODO: Re-use the getExpressionString method if possible, rather than = // rewriting the same code twice. if(fromItem instanceof IGroup) { - Group group =3D (Group) rm.getObject(((IGroup)fromItem).getMetadataID()= ); + Group group =3D ((IGroup)fromItem).getMetadataObject(); String nameInSource =3D group.getNameInSource(); // if NameInSource is null set it to an empty // string instead so we can safely call split on it @@ -384,8 +382,8 @@ // GHH 20080326 - changed around the IElement handling here // - the rest of this method is unchanged if(e instanceof IElement) { - MetadataID mdIDElement =3D ((IElement)e).getMetadataID(); - expressionName =3D rm.getObject(mdIDElement).getNameInSource(); + Element mdIDElement =3D ((IElement)e).getMetadataObject(); + expressionName =3D mdIDElement.getNameInSource(); if(expressionName =3D=3D null || expressionName.equals("")) { //$NON-N= LS-1$ expressionName =3D mdIDElement.getName(); } @@ -597,10 +595,9 @@ // code from another custom connector. public String getNameFromElement(Element e) throws ConnectorException { String ldapAttributeName =3D null; - MetadataID mdIDElement =3D e.getMetadataID(); - ldapAttributeName =3D rm.getObject(mdIDElement).getNameInSource(); + ldapAttributeName =3D e.getNameInSource(); if (ldapAttributeName =3D=3D null || ldapAttributeName.equals("")) { //$= NON-NLS-1$ - ldapAttributeName =3D mdIDElement.getName(); + ldapAttributeName =3D e.getName(); // If name in source is not set, then fall back to the column name. } return ldapAttributeName; @@ -653,8 +650,7 @@ */ private Element getElementFromSymbol(ISelectSymbol symbol) throws Conn= ectorException { IElement expr =3D (IElement) symbol.getExpression(); - MetadataID elementID =3D expr.getMetadataID(); - return (Element) rm.getObject(elementID); + return expr.getMetadataObject(); } = = Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -24,18 +24,18 @@ import java.util.Properties; = import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.basic.BasicConnector; = /** = * LDAPConnector. This is responsible for initializing = * a connection factory, and obtaining connections to LDAP. */ -public class LDAPConnector implements Connector { +public class LDAPConnector extends BasicConnector { private ConnectorEnvironment env; private ConnectorLogger logger; private Properties props; @@ -59,7 +59,7 @@ = /** = * (non-Javadoc) - * @see com.metamatrix.connector.api.Connector#initialize(com.metamatrix.= connector.api.ConnectorEnvironment) + * @see com.metamatrix.connector.basic.BasicConnector#initialize(com.meta= matrix.connector.api.ConnectorEnvironment) */ @Override public void start(ConnectorEnvironment env) throws ConnectorException { Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPUpdateExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPUpdateExecution.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPUpdateExecution.java 2009-02-24 16:16:42 UTC (rev 488) @@ -50,7 +50,6 @@ import com.metamatrix.connector.language.ISetClause; import com.metamatrix.connector.language.IUpdate; import com.metamatrix.connector.language.ICompareCriteria.Operator; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = @@ -405,20 +404,13 @@ if (elementNameDirect =3D=3D null) { } else { } - MetadataID mdIDElement =3D e.getMetadataID(); - if (mdIDElement =3D=3D null) { - return ""; //$NON-NLS-1$ - } - if (rm =3D=3D null) { - return ""; //$NON-NLS-1$ - } - MetadataObject mdObject =3D rm.getObject(mdIDElement); + MetadataObject mdObject =3D e.getMetadataObject(); if (mdObject =3D=3D null) { return ""; //$NON-NLS-1$ } ldapAttributeName =3D mdObject.getNameInSource(); if(ldapAttributeName =3D=3D null || ldapAttributeName.equals("")) { /= /$NON-NLS-1$ = - ldapAttributeName =3D mdIDElement.getName(); + ldapAttributeName =3D mdObject.getName(); // If name in source is not set, then fall back to the column name. } return ldapAttributeName; Modified: trunk/connectors/connector-ldap/src/test/java/com/metamatrix/conn= ector/ldap/TestIQueryToLdapSearchParser.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/= ldap/TestIQueryToLdapSearchParser.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/= ldap/TestIQueryToLdapSearchParser.java 2009-02-24 16:16:42 UTC (rev 488) @@ -40,7 +40,7 @@ import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; +import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.unittest.FakeMetadataFacade; import com.metamatrix.query.unittest.FakeMetadataFactory; @@ -203,7 +203,7 @@ private LDAPSearchDetails helpGetSearchDetails(String queryString) throws= ConnectorException { ConnectorLogger logger =3D new SysLogger(false); QueryMetadataInterface metadata =3D exampleLdap(); - RuntimeMetadata rm =3D new MetadataFactory(metadata).getRuntimeMetada= ta(); + RuntimeMetadata rm =3D new RuntimeMetadataImpl(metadata); Properties props =3D new Properties(); = IQueryToLdapSearchParser searchParser =3D new IQueryToLdapSearchParse= r(logger,rm,props); Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/= connector/loopback/LoopbackConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackConnection.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackConnection.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,7 +22,10 @@ = package com.metamatrix.connector.loopback; = -import com.metamatrix.connector.api.*; +import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.Execution; +import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.basic.BasicConnection; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/= connector/loopback/LoopbackConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackConnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackConnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -23,11 +23,12 @@ package com.metamatrix.connector.loopback; = import com.metamatrix.connector.api.*; +import com.metamatrix.connector.basic.BasicConnector; = /** * Starting point for the Loopback connector. */ -public class LoopbackConnector implements Connector { +public class LoopbackConnector extends BasicConnector { = private ConnectorEnvironment env; = Modified: trunk/connectors/connector-loopback/src/test/java/com/metamatrix/= connector/loopback/TestLoopbackExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connec= tor/loopback/TestLoopbackExecution.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connec= tor/loopback/TestLoopbackExecution.java 2009-02-24 16:16:42 UTC (rev 488) @@ -38,7 +38,6 @@ = public TestLoopbackExecution(String name) { super(name); - System.setProperty("metamatrix.config.none", "true"); } = public Properties exampleProperties(int waitTime, int rowCount) { Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/Connector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/Connector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/Connector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -34,19 +34,14 @@ import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.identity.ConnectorIdentity; -import com.metamatrix.connector.identity.ConnectorIdentityFactory; -import com.metamatrix.connector.identity.SingleIdentityFactory; -import com.metamatrix.connector.identity.UserIdentityFactory; import com.metamatrix.connector.salesforce.connection.SalesforceConnection; = @ConnectionPooling -public class Connector implements com.metamatrix.connector.api.Connector, = ConnectorIdentityFactory { +public class Connector extends com.metamatrix.connector.basic.BasicConnect= or { = private ConnectorLogger logger; = private ConnectorEnvironment connectorEnv; - private ConnectorIdentityFactory connectorIdentityFactory; private ConnectorState state; private boolean singleIdentity; private String username; @@ -102,20 +97,18 @@ //validate that both are empty or both have values if(null =3D=3D username && null =3D=3D password) { = - } else if ((null =3D=3D username || username.equals("")) && (null !=3D p= assword || !password.equals("")) || - ((null =3D=3D password || password.equals("")) && (null !=3D username = || !username.equals("")))) { + } else if ((null =3D=3D username || username.equals("")) && (null !=3D p= assword && !password.equals("")) || + ((null =3D=3D password || password.equals("")) && (null !=3D username = && !username.equals("")))) { String msg =3D Messages.getString("SalesforceSourceConnectionFactory.= Invalid.username.password.pair"); env.getLogger().logError(msg); throw new ConnectorException(msg); - } else if(null !=3D username || !username.equals("")) { + } else if(null !=3D username && !username.equals("")) { singleIdentity =3D true; this.password =3D password; this.username =3D username; - } - if (singleIdentity) { - this.connectorIdentityFactory =3D new SingleIdentityFactory(); } else { - this.connectorIdentityFactory =3D new UserIdentityFactory(); + this.setAdminConnectionsAllowed(false); + this.setUseCredentialMap(true); } = String capabilitiesClass =3D env.getProperties().getProperty("ConnectorC= apabilities", SalesforceCapabilities.class.getName()); @@ -167,12 +160,6 @@ public ConnectorState getState() { return state; } - - @Override - public ConnectorIdentity createIdentity(ExecutionContext context) - throws ConnectorException { - return this.connectorIdentityFactory.createIdentity(context); - } = @Override public ConnectorCapabilities getCapabilities() { Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/UpdateExecutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/UpdateExecutionImpl.java 2009-02-24 14:33:28 UTC= (rev 487) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/UpdateExecutionImpl.java 2009-02-24 16:16:42 UTC= (rev 488) @@ -51,8 +51,7 @@ List elements =3D new ArrayList(); for (ISetClause clause : update.getChanges().getClauses()) { IElement element =3D clause.getSymbol(); - Element column =3D (Element) parent.getMetadata().getObject( - element.getMetadataID()); + Element column =3D element.getMetadataObject(); String val =3D ((ILiteral) clause.getValue()) .toString(); MessageElement messageElem =3D new MessageElement(new QName( Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/CriteriaVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/CriteriaVisitor.java 2009-02-24 14:33:2= 8 UTC (rev 487) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/CriteriaVisitor.java 2009-02-24 16:16:4= 2 UTC (rev 488) @@ -40,7 +40,6 @@ import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.salesforce.Messages; import com.metamatrix.connector.salesforce.Util; @@ -158,13 +157,13 @@ } = private void generateMultiSelect(IFunction func, String funcName) throws = ConnectorException { - IExpression[] expressions =3D func.getParameters(); + List expressions =3D func.getParameters(); validateFunction(expressions); - IExpression columnExpression =3D expressions[0]; = - Element column =3D (Element)metadata.getObject(((IElement)columnExpressi= on).getMetadataID()); + IExpression columnExpression =3D expressions.get(0); = + Element column =3D ((IElement)columnExpression).getMetadataObject(); StringBuffer criterion =3D new StringBuffer(); criterion.append(column.getNameInSource()).append(SPACE).append(funcName= ); - addFunctionParams((ILiteral)expressions[1], criterion); + addFunctionParams((ILiteral)expressions.get(1), criterion); criteriaList.add(criterion.toString()); } = @@ -195,15 +194,14 @@ criteriaList.add(result.toString()); } = - private void validateFunction(IExpression[] expressions) throws Connector= Exception { - if(expressions.length !=3D 2) { + private void validateFunction(List expressions) throws Conne= ctorException { + if(expressions.size() !=3D 2) { throw new ConnectorException(Messages.getString("CriteriaVisitor.invali= d.arg.count")); } - IExpression columnExpression =3D expressions[0]; - if(!(expressions[0] instanceof IElement)) { + if(!(expressions.get(0) instanceof IElement)) { throw new ConnectorException(Messages.getString("CriteriaVisitor.functi= on.not.column.arg")); } - if(!(expressions[1] instanceof ILiteral)) { + if(!(expressions.get(1) instanceof ILiteral)) { throw new ConnectorException(Messages.getString("CriteriaVisitor.functi= on.not.literal.arg")); } } @@ -233,7 +231,7 @@ parseFunction((IFunction)lExpr); } else { IElement left =3D (IElement) lExpr; - Element column =3D (Element) metadata.getObject(left.getMetadataID()); + Element column =3D left.getMetadataObject(); String columnName =3D column.getNameInSource(); StringBuffer queryString =3D new StringBuffer(); queryString.append(columnName).append(SPACE); @@ -268,8 +266,7 @@ queryString.append(' '); queryString.append("IN"); queryString.append('('); - Element column =3D (Element) metadata.getObject( - ((IElement)criteria.getLeftExpression()).getMetadataID()); + Element column =3D ((IElement)criteria.getLeftExpression()).getMetadataO= bject(); boolean timeColumn =3D isTimeColumn(column); boolean first =3D true; Iterator iter =3D criteria.getRightExpressions().iterator(); @@ -299,8 +296,7 @@ String result; if (expr instanceof IElement) { IElement element =3D (IElement) expr; - Element element2 =3D (Element) metadata.getObject(element - .getMetadataID()); + Element element2 =3D element.getMetadataObject(); result =3D element2.getNameInSource(); } else if (expr instanceof ILiteral) { ILiteral literal =3D (ILiteral) expr; @@ -314,8 +310,7 @@ } = protected void loadColumnMetadata(IGroup group) throws ConnectorException= { - MetadataID id =3D group.getMetadataID(); - table =3D (Group) metadata.getObject(id); + table =3D group.getMetadataObject(); String supportsQuery =3D (String) table.getProperties().get( "Supports Query"); if (!Util.convertStringToBoolean(supportsQuery)) { @@ -325,13 +320,10 @@ + Messages .getString("CriteriaVisitor.query.not.supported")); } - List columnIds =3D table.getMetadataID().getChildIDs(); - Iterator iter =3D columnIds.iterator(); - while (iter.hasNext()) { - MetadataID columnID =3D (MetadataID) iter.next(); - Element element =3D (Element) metadata.getObject(columnID); - String name =3D columnID.getParentID().getName() + '.' - + columnID.getName(); + List columnIds =3D table.getChildren(); + for (Element element : columnIds) { + String name =3D table.getName() + '.' + + element.getName(); columnElementsByName.put(name, element); } } @@ -340,9 +332,7 @@ throws ConnectorException { boolean result =3D false; if (expression instanceof IElement) { - MetadataID elementID =3D (MetadataID) ((IElement) expression) - .getMetadataID(); - Element element =3D (Element) metadata.getObject(elementID); + Element element =3D ((IElement) expression).getMetadataObject(); String nameInSource =3D element.getNameInSource(); if (nameInSource.equalsIgnoreCase("id")) { result =3D true; @@ -355,9 +345,7 @@ throws ConnectorException { boolean result =3D false; if (expression instanceof IElement) { - MetadataID elementID =3D (MetadataID) ((IElement) expression) - .getMetadataID(); - Element element =3D (Element) metadata.getObject(elementID); + Element element =3D ((IElement) expression).getMetadataObject(); String nativeType =3D element.getNativeType(); if (nativeType.equalsIgnoreCase("multipicklist") || = nativeType.equalsIgnoreCase("restrictedmultiselectpicklist")) { Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/InsertVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/InsertVisitor.java 2009-02-24 14:33:28 = UTC (rev 487) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/InsertVisitor.java 2009-02-24 16:16:42 = UTC (rev 488) @@ -59,7 +59,7 @@ = for(int i =3D 0; i < columns.size(); i++) { IElement element =3D columns.get(i); - Element column =3D (Element)metadata.getObject(element.getMetadataID()= ); + Element column =3D element.getMetadataObject(); Object value =3D values.get(i); String val; if(value instanceof ILiteral) { Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/SelectVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/SelectVisitor.java 2009-02-24 14:33:28 = UTC (rev 487) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/SelectVisitor.java 2009-02-24 16:16:42 = UTC (rev 488) @@ -35,7 +35,6 @@ import com.metamatrix.connector.language.ISelect; import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.salesforce.Messages; import com.metamatrix.connector.salesforce.Util; @@ -80,9 +79,7 @@ // get the name in source IExpression expression =3D symbol.getExpression(); if (expression instanceof IElement) { - MetadataID elementID =3D (MetadataID) ((IElement) expression) - .getMetadataID(); - Element element =3D (Element) metadata.getObject(elementID); + Element element =3D ((IElement) expression).getMetadataObject(); selectSymbolIndexToElement.put(index, element); selectSymbolNameToIndex .put(element.getNameInSource(), index); String nameInSource =3D element.getNameInSource(); Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/conn= ector/text/TextConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextConnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextConnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -35,17 +35,17 @@ import java.util.Properties; = import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.basic.BasicConnector; = /** * Implementation of text connector. */ -public class TextConnector implements Connector { +public class TextConnector extends BasicConnector { = private ConnectorLogger logger; private ConnectorEnvironment env; Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/conn= ector/text/TextSynchExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextSynchExecution.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextSynchExecution.java 2009-02-24 16:16:42 UTC (rev 488) @@ -49,11 +49,9 @@ import com.metamatrix.connector.language.IFrom; import com.metamatrix.connector.language.IGroup; import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelect; import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.util.StringUtil; = @@ -399,7 +397,7 @@ * attempt to create the request as we may need = * column names from the header row. */ - String groupName =3D group.getMetadataID().getFullName(); + String groupName =3D group.getMetadataObject().getFullName(); Map metadataMap =3D metadataProps; groupProps =3D (Properties) metadataMap.get(groupName.toUpperC= ase()); = @@ -412,11 +410,11 @@ Object[] params =3D new Object[] { groupName, ex.getMessag= e() }; throw new ConnectorException(ex, TextPlugin.Util.getString= ("TextSynchExecution.Unable_get_Reader", params)); //$NON-NLS-1$ } - List elementIDs =3D group.getMetadataID().getChildIDs(); - numModeledColumns =3D elementIDs.size(); - int[] colWidthArray =3D new int[elementIDs.size()]; + List elements =3D group.getMetadataObject().getChildr= en(); + numModeledColumns =3D elements.size(); + int[] colWidthArray =3D new int[elements.size()]; for (int i =3D 0; i < colWidthArray.length; i++) { - Element element =3D (Element)rm.getObject((MetadataID)elem= entIDs.get(i)); + Element element =3D elements.get(i); colWidthArray[getColumn(element)] =3D element.getLength(); } for (int i =3D 0; i < colWidthArray.length; i++) { @@ -462,12 +460,10 @@ IFrom from =3D ((IQuery) cmd).getFrom(); List groups =3D from.getItems(); IGroup symbol =3D (IGroup) groups.get(0); - Group group =3D (Group) rm.getObject(symbol.getMetadataID()); + Group group =3D symbol.getMetadataObject(); = - = + String groupName =3D group.getFullName(); = - String groupName =3D group.getMetadataID().getFullName(); - Map metadataMap =3D (Map) response; Properties connProps =3D (Properties) metadataMap.get(TextProperty= Names.CONNECTOR_PROPERTIES); = @@ -607,8 +603,7 @@ */ private Element getElementFromSymbol(ISelectSymbol symbol) throws Conn= ectorException { IElement expr =3D (IElement) symbol.getExpression(); - MetadataID elementID =3D expr.getMetadataID(); - return (Element) rm.getObject(elementID); + return expr.getMetadataObject(); } = /** @@ -636,16 +631,16 @@ } catch(NumberFormatException e) { // Name In Source was not numeric, so look for a column with a he= ading matching Name In Source if ( colStr =3D=3D null ) { - colStr =3D elem.getMetadataID().getName(); + colStr =3D elem.getName(); } if ( headerRow =3D=3D null ) getCurrentReader(); if ( headerRow !=3D null ) { for ( int i =3D 0; i < headerRow.size(); i++ ) { if ( colStr.compareToIgnoreCase((String)headerRow.get(i) )=3D= =3D0) return i; } - throw new ConnectorException(TextPlugin.Util.getString("Te= xtSynchExecution.Column_not_found_in_header_row", new Object[] {colStr, ele= m.getMetadataID().getFullName() } )); //$NON-NLS-1$ + throw new ConnectorException(TextPlugin.Util.getString("Te= xtSynchExecution.Column_not_found_in_header_row", new Object[] {colStr, ele= m.getFullName() } )); //$NON-NLS-1$ } - throw new ConnectorException(TextPlugin.Util.getString("TextSy= nchExecution.Invalid_column_number", new Object[] {colStr, elem.getMetadata= ID().getFullName() } ) ); //$NON-NLS-1$ + throw new ConnectorException(TextPlugin.Util.getString("TextSy= nchExecution.Invalid_column_number", new Object[] {colStr, elem.getFullName= () } ) ); //$NON-NLS-1$ } } = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/CriteriaDesc.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/CriteriaDesc.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/CriteriaDesc.java 2009-02-24 16:16:42 UTC (rev 488) @@ -138,7 +138,7 @@ } else if (findIsRequired(element)) { throw new ConnectorException( Messages.getString("CriteriaDesc.value.not.found.for.p= aram") //$NON-NLS-1$ - + element.getMetadataID().getName()); + + element.getName()); } = } = @@ -369,7 +369,7 @@ //Thsi should be much more bulletproof and more easily supported private static ArrayList parseCriteriaToValues(Element element, IQuery= query) throws ConnectorException { = - String fullName =3D element.getMetadataID().getFullName().trim().t= oUpperCase(); + String fullName =3D element.getFullName().trim().toUpperCase(); ArrayList parmPair =3D new ArrayList(); if (element.getSearchability() =3D=3D Element.SEARCHABLE || element.getSearchability() =3D=3D Element.SEARCHABLE_CO= MPARE) { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/LoggingConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LoggingConnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LoggingConnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -25,6 +25,7 @@ import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; +import com.metamatrix.connector.basic.BasicConnector; import com.metamatrix.connector.xml.XMLConnectorState; = /** @@ -33,7 +34,7 @@ * TODO To change the template for this generated type comment go to * Window - Preferences - Java - Code Style - Code Templates */ -public abstract class LoggingConnector implements StatefulConnector { +public abstract class LoggingConnector extends BasicConnector implements S= tatefulConnector { = private static ConnectorLogger m_logger; private ConnectorEnvironment m_environment; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/ParameterDescriptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/ParameterDescriptor.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/ParameterDescriptor.java 2009-02-24 16:16:42 UTC (rev 488) @@ -51,7 +51,7 @@ if(getElement().getNameInSource() !=3D null) { setColumnName(getElement().getNameInSource()); } else { - setColumnName(getElement().getMetadataID().getName().trim()); + setColumnName(getElement().getName().trim()); } String nis =3D getElement().getNameInSource(); if (nis !=3D null) { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/QueryAnalyzer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/QueryAnalyzer.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/QueryAnalyzer.java 2009-02-24 16:16:42 UTC (rev 488) @@ -41,7 +41,6 @@ import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xml.IQueryPreprocessor; = @@ -122,8 +121,7 @@ List fromItems =3D from.getItems(); //better be only one IGroup group =3D (IGroup) fromItems.get(0); - MetadataID id =3D group.getMetadataID(); - m_table =3D (Group) m_metadata.getObject(id); + m_table =3D (Group) group.getMetadataObject(); m_info.setTableXPath(m_table.getNameInSource()); } = @@ -149,9 +147,7 @@ if (expr instanceof ILiteral) { xpath =3D new OutputXPathDesc((ILiteral) expr); } else if (expr instanceof IElement) { - MetadataID elementID =3D (MetadataID) ((IElement) expr) - .getMetadataID(); - Element element =3D (Element) m_metadata.getObject(ele= mentID); + Element element =3D ((IElement)expr).getMetadataObject= (); xpath =3D new OutputXPathDesc(element); } if (xpath !=3D null) { @@ -175,19 +171,13 @@ // containing names, element (metadata), and equivilence value, o= r all // set values = - MetadataID groupID =3D m_table.getMetadataID(); - List elementList =3D groupID.getChildIDs(); - ArrayList params =3D new ArrayList(); ArrayList crits =3D new ArrayList(); ArrayList responses =3D new ArrayList(); ArrayList locations =3D new ArrayList(); = //Iterate through each field in the table - Iterator elementListIterator =3D elementList.iterator(); - while (elementListIterator.hasNext()) { - MetadataID elementID =3D (MetadataID) elementListIterator.next= (); - Element element =3D (Element) m_metadata.getObject(elementID); + for (Element element : m_table.getChildren()) { CriteriaDesc criteria =3D CriteriaDesc.getCriteriaDescForColum= n( element, m_query); if (criteria !=3D null) { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/XMLSourceConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceConnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceConnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -29,13 +29,14 @@ import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; +import com.metamatrix.connector.basic.BasicConnector; = /** * XML Source connector, will give provide a XML document as source to * Metamatrix engine. */ @ConnectionPooling -public class XMLSourceConnector implements Connector { +public class XMLSourceConnector extends BasicConnector { = private ConnectorEnvironment env; private XMLConnectionFacory connFactory; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/file/FileExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/file/FileExecution.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/file/FileExecution.java 2009-02-24 16:16:42 UTC (rev 488) @@ -76,7 +76,7 @@ public void execute() throws ConnectorException { = // look for the name of the file to return in the metadata, "Name = in Source" property - MetadataObject metaObject =3D this.metadata.getObject(procedure.ge= tMetadataID()); + MetadataObject metaObject =3D procedure.getMetadataObject(); String fileName =3D metaObject.getNameInSource(); = // if the source procedure name is not supplied then throw an exce= ption Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/soap/SoapExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/SoapExecution.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/SoapExecution.java 2009-02-24 16:16:42 UTC (rev 488) @@ -74,7 +74,7 @@ ArrayList argsList =3D new ArrayList(); = // look for the name of the Service to return in the metadata, "Na= me in Source" property - MetadataObject metaObject =3D this.metadata.getObject(procedure.ge= tMetadataID()); + MetadataObject metaObject =3D procedure.getMetadataObject(); String sourceProcedureName =3D metaObject.getNameInSource(); = // if the source procedure name is not supplied then throw an exce= ption Deleted: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connec= tor/xml/MockCachingConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/MockCachingConnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/MockCachingConnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -1,95 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - - -package com.metamatrix.connector.xml; - -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.xml.cache.IDocumentCache; -import com.metamatrix.connector.xml.cache.MockDocumentCache; - -public class MockCachingConnector implements CachingConnector { - - IDocumentCache mockCache =3D new MockDocumentCache(); - = - public void createCacheObjectRecord(String requestID, String partID, Stri= ng executionID, String sourceRequestID, String cacheKey) throws ConnectorEx= ception { - // TODO Auto-generated method stub - } - - public void deleteCacheItems(String requestIdentifier, String partIdentif= ier, String executionIdentifier) { - // TODO Auto-generated method stub - } - - public IDocumentCache getCache() { - return mockCache; - } - - public IDocumentCache getStatementCache() { - // TODO Auto-generated method stub - return null; - } - - public ConnectorEnvironment getEnvironment() { - // TODO Auto-generated method stub - return null; - } - - public ConnectorLogger getLogger() { - // TODO Auto-generated method stub - return null; - } - - public XMLConnectorState getState() { - // TODO Auto-generated method stub - return null; - } - - public Connection getConnection(ExecutionContext arg0) throws ConnectorEx= ception { - // TODO Auto-generated method stub - return null; - } - - public void stop() { - // TODO Auto-generated method stub - = - } - = - @Override - public ConnectorCapabilities getCapabilities() { - // TODO Auto-generated method stub - return null; - } - = - @Override - public void start(ConnectorEnvironment environment) - throws ConnectorException { - // TODO Auto-generated method stub - = - } - - -} Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestCriteriaDesc.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestCriteriaDesc.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestCriteriaDesc.java 2009-02-24 16:16:42 UTC (rev 488) @@ -43,7 +43,6 @@ import com.metamatrix.connector.language.LanguageUtil; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** @@ -77,85 +76,56 @@ System.setProperty("metamatrix.config.none", "true"); } = - public void testGetCriteriaDescForColumn() { = + public void testGetCriteriaDescForColumn() throws Exception { = //case 1: values provided - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select RequiredDefaultedParam from CriteriaDesc= Table where RequiredDefaultedParam in ('foo')"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } - = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select RequiredDefaultedParam from CriteriaDescTabl= e where RequiredDefaultedParam in ('foo')"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = - public void testGetCriteriaDescForColumnDefaultedValue() { + public void testGetCriteriaDescForColumnDefaultedValue() throws Except= ion { //case 2: param, required, defaulted - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select RequiredDefaultedParam from CriteriaDesc= Table"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select RequiredDefaultedParam from CriteriaDescTabl= e"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = - public void testGetCriteriaDescForColumnNoCriteria() { + public void testGetCriteriaDescForColumnNoCriteria() throws Exception { //case 3: param, not required, not defaulted, not allowed empty - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select OptionalNotAllowedEmptyParam from Criter= iaDescTable"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNull("CriteriaDesc is not null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select OptionalNotAllowedEmptyParam from CriteriaDe= scTable"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNull("CriteriaDesc is not null", desc); } = - public void testGetCriteriaDescForColumnAllowEmpty() { + public void testGetCriteriaDescForColumnAllowEmpty() throws Exception { //case 4: param, not required, not defaulted, allowed empty - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select OptionalAllowedEmptyParam from CriteriaD= escTable"; - final int colLocation =3D 0; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select OptionalAllowedEmptyParam from CriteriaDescT= able"; + final int colLocation =3D 0; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = public void testGetCriteriaDescForColumnError() { @@ -167,98 +137,66 @@ final int colLocation =3D 0; ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); + Element elem =3D ((IElement) expr).getMetadataObject(); CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); fail("exception not thrown"); } catch (ConnectorException ce) { - assertNotNull(ce); } = } = - public void testGetCriteriaDescForColumnNotParam() { + public void testGetCriteriaDescForColumnNotParam() throws Exception { //case 6: not a param - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select OutputColumn from CriteriaDescTable"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNull("CriteriaDesc is not null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select OutputColumn from CriteriaDescTable"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNull("CriteriaDesc is not null", desc); } = - public void testGetCriteriaDescForColumnCompare() { = + public void testGetCriteriaDescForColumnCompare() throws Exception { = //case 7: compare criteria - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select RequiredDefaultedParam from CriteriaDesc= Table where RequiredDefaultedParam =3D 'foo'"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } - = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select RequiredDefaultedParam from CriteriaDescTabl= e where RequiredDefaultedParam =3D 'foo'"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = = - public void testGetCriteriaDescForColumnMultiElement() { = - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select MultiElementParam from CriteriaDescTable= where MultiElementParam in ('foo','bar')"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - String multiplicityStr =3D elem.getProperties().getProperty( - CriteriaDesc.PARM_HAS_MULTIPLE_VALUES_COLUMN_PROPERTY_NAME); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + public void testGetCriteriaDescForColumnMultiElement() throws Exceptio= n { = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select MultiElementParam from CriteriaDescTable whe= re MultiElementParam in ('foo','bar')"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + String multiplicityStr =3D elem.getProperties().getProperty( + CriteriaDesc.PARM_HAS_MULTIPLE_VALUES_COLUMN_PROPERTY_NAME); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = - public void testGetCriteriaDescForColumnDelimited() { = - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select DelimitedParam from CriteriaDescTable wh= ere DelimitedParam in ('foo','bar')"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - String multiplicityStr =3D elem.getProperties().getProperty( - CriteriaDesc.PARM_HAS_MULTIPLE_VALUES_COLUMN_PROPERTY_NAME); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + public void testGetCriteriaDescForColumnDelimited() throws Exception {= = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select DelimitedParam from CriteriaDescTable where = DelimitedParam in ('foo','bar')"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + String multiplicityStr =3D elem.getProperties().getProperty( + CriteriaDesc.PARM_HAS_MULTIPLE_VALUES_COLUMN_PROPERTY_NAME); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = public void testGetCriteriaDescForColumnLikeSearchable() { = @@ -269,37 +207,26 @@ final int colLocation =3D 0; ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); + Element elem =3D ((IElement) expr).getMetadataObject(); String multiplicityStr =3D elem.getProperties().getProperty( CriteriaDesc.PARM_HAS_MULTIPLE_VALUES_COLUMN_PROPERTY_NAME); CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); fail("should not be able to handle default value"); } catch (ConnectorException ce) { - assertTrue(true); } = } = - public void testGetCriteriaDescForColumnUnlikeSearchable() { = - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select UnlikeSearchableParam from CriteriaDescT= able where UnlikeSearchableParam in ('foo')"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - String multiplicityStr =3D elem.getProperties().getProperty( - CriteriaDesc.PARM_HAS_MULTIPLE_VALUES_COLUMN_PROPERTY_NAME); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("could not create CriteriaDesc", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + public void testGetCriteriaDescForColumnUnlikeSearchable() throws Exce= ption { = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select UnlikeSearchableParam from CriteriaDescTable= where UnlikeSearchableParam in ('foo')"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + String multiplicityStr =3D elem.getProperties().getProperty( + CriteriaDesc.PARM_HAS_MULTIPLE_VALUES_COLUMN_PROPERTY_NAME); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); } = public void testGetCriteriaDescForColumnUnsearchable() { = @@ -310,235 +237,151 @@ final int colLocation =3D 0; ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); + Element elem =3D ((IElement) expr).getMetadataObject(); String multiplicityStr =3D elem.getProperties().getProperty( CriteriaDesc.PARM_HAS_MULTIPLE_VALUES_COLUMN_PROPERTY_NAME); CriteriaDesc.getCriteriaDescForColumn(elem, iquery); fail("should not be able to handle default value"); } catch (ConnectorException ce) { - assertTrue(true); } = } = - public void testGetCriteriaDescForColumnLike() { = + public void testGetCriteriaDescForColumnLike() throws Exception { = //case 1: values provided - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select RequiredDefaultedParam from CriteriaDesc= Table where RequiredDefaultedParam like 'foo'"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } - = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select RequiredDefaultedParam from CriteriaDescTabl= e where RequiredDefaultedParam like 'foo'"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = - public void testGetCriteriaDescForColumnNotEquals() { = + public void testGetCriteriaDescForColumnNotEquals() throws Exception {= = //case 1: values provided - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select RequiredDefaultedParam from CriteriaDesc= Table where RequiredDefaultedParam !=3D 'foo'"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } - = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select RequiredDefaultedParam from CriteriaDescTabl= e where RequiredDefaultedParam !=3D 'foo'"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = - public void testGetCriteriaDescForColumnLiteral() { = - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select RequiredDefaultedParam from CriteriaDesc= Table where concat(RequiredDefaultedParam, 'bar') in('foo')"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } - = + public void testGetCriteriaDescForColumnLiteral() throws Exception { = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select RequiredDefaultedParam from CriteriaDescTabl= e where concat(RequiredDefaultedParam, 'bar') in('foo')"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = - public void testGetCriteriaDescForColumnNameMatchFailure() { = - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select RequiredDefaultedParam from CriteriaDesc= Table where AttributeParam in('foo')"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } - = + public void testGetCriteriaDescForColumnNameMatchFailure() throws Exce= ption { = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select RequiredDefaultedParam from CriteriaDescTabl= e where AttributeParam in('foo')"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = = - public void testGetCriteriaDescForColumnLeftLiteral() { = - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select RequiredDefaultedParam from CriteriaDesc= Table " = - + "where concat('bar', 'foo') =3D concat('bar', RequiredDefault= edParam)"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + public void testGetCriteriaDescForColumnLeftLiteral() throws Exception= { = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select RequiredDefaultedParam from CriteriaDescTabl= e " = + + "where concat('bar', 'foo') =3D concat('bar', RequiredDefaultedPa= ram)"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = - public void testGetCriteriaDescForColumnTwoElements() { = - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select RequiredDefaultedParam from CriteriaDesc= Table where OutputColumn =3D RequiredDefaultedParam"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + public void testGetCriteriaDescForColumnTwoElements() throws Exception= { = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select RequiredDefaultedParam from CriteriaDescTabl= e where OutputColumn =3D RequiredDefaultedParam"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = - public void testGetCriteriaDescForColumnLeftElementEqualsLiteral() { = - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select RequiredDefaultedParam from CriteriaDesc= Table where AttributeParam =3D 'foo'"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + public void testGetCriteriaDescForColumnLeftElementEqualsLiteral() thr= ows Exception { = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select RequiredDefaultedParam from CriteriaDescTabl= e where AttributeParam =3D 'foo'"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = - public void testGetCriteriaDescForColumnLeftElementEqualsNonLiteral() = { = - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select RequiredDefaultedParam from CriteriaDesc= Table where" = - + " RequiredDefaultedParam =3D concat('foo', OutputColumn)"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertNotNull("CriteriaDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + public void testGetCriteriaDescForColumnLeftElementEqualsNonLiteral() = throws Exception { = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select RequiredDefaultedParam from CriteriaDescTabl= e where" = + + " RequiredDefaultedParam =3D concat('foo', OutputColumn)"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertNotNull("CriteriaDesc is null", desc); } = - public void testGetInputXPathNoXpath() { = - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select BadNoInputXpath from CriteriaDescTable w= here BadNoInputXpath in ('foo')"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertEquals(desc.getColumnName(), desc.getInputXpath()); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + public void testGetInputXPathNoXpath() throws Exception { = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select BadNoInputXpath from CriteriaDescTable where= BadNoInputXpath in ('foo')"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertEquals(desc.getColumnName(), desc.getInputXpath()); } = = - public void testGetInputXPathEmptyXpath() { = - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select BadEmptyInputXPath from CriteriaDescTabl= e where BadEmptyInputXPath in ('foo')"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertEquals(desc.getColumnName(), desc.getInputXpath()); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + public void testGetInputXPathEmptyXpath() throws Exception { = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select BadEmptyInputXPath from CriteriaDescTable wh= ere BadEmptyInputXPath in ('foo')"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertEquals(desc.getColumnName(), desc.getInputXpath()); } = = - public void testGetDataAttributeNameEmptyName() { = - try { - assertNotNull("vdb path is null", vdbPath); - String query =3D "select BadNoDataAttributeName from CriteriaDesc= Table where BadNoDataAttributeName in ('foo')"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(el= em, iquery); - assertEquals("", desc.getDataAttributeName()); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + public void testGetDataAttributeNameEmptyName() throws Exception { = + assertNotNull("vdb path is null", vdbPath); + String query =3D "select BadNoDataAttributeName from CriteriaDescTabl= e where BadNoDataAttributeName in ('foo')"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertEquals("", desc.getDataAttributeName()); } = = = @@ -697,98 +540,65 @@ } } = - public void testGetCurrentIndexValueEnumerated() { + public void testGetCurrentIndexValueEnumerated() throws Exception { String query =3D "select DelimitedParam from CriteriaDescTable where = DelimitedParam in ('foo', 'bar')"; IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); final int colLocation =3D 0; - try { - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelec= tSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeMet= adata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem,= iquery); - assertEquals("There should be two values" , 2, desc.getNumberOfVa= lues()); - assertEquals("foo", desc.getCurrentIndexValue()); - desc.incrementIndex(); - assertEquals("bar", desc.getCurrentIndexValue()); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertEquals("There should be two values" , 2, desc.getNumberOfVal= ues()); + assertEquals("foo", desc.getCurrentIndexValue()); + desc.incrementIndex(); + assertEquals("bar", desc.getCurrentIndexValue()); } = - public void testIncrementIndexEnumerated() { + public void testIncrementIndexEnumerated() throws Exception { String query =3D "select DelimitedParam from CriteriaDescTable where = DelimitedParam in ('foo', 'bar')"; IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); final int colLocation =3D 0; - try { - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelec= tSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeMet= adata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem,= iquery); - assertTrue("We should be able to increment this CriteriaDesc", de= sc.incrementIndex()); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeMeta= data(vdbPath); + Element elem =3D ((IElement) expr).getMetadataObject(); + CriteriaDesc desc =3D CriteriaDesc.getCriteriaDescForColumn(elem, = iquery); + assertTrue("We should be able to increment this CriteriaDesc", des= c.incrementIndex()); } = - public void testGetCurrentIndexValueNoValue() { - try { - final String query =3D "select OptionalAllowedEmptyParam from Cri= teriaDescTable"; - Element elem =3D getElement(query); - ArrayList list =3D new ArrayList(); - CriteriaDesc desc =3D new CriteriaDesc(elem, list); - assertEquals("", desc.getCurrentIndexValue()); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + public void testGetCurrentIndexValueNoValue() throws Exception { + final String query =3D "select OptionalAllowedEmptyParam from Criteri= aDescTable"; + Element elem =3D getElement(query); + ArrayList list =3D new ArrayList(); + CriteriaDesc desc =3D new CriteriaDesc(elem, list); + assertEquals("", desc.getCurrentIndexValue()); } = - public void testGetCurrentIndexValueNoValueNotEmpty() { - try { - final String query =3D "select OptionalNotAllowedEmptyParam from = CriteriaDescTable"; - Element elem =3D getElement(query); - ArrayList list =3D new ArrayList(); - CriteriaDesc desc =3D new CriteriaDesc(elem, list); - assertNull(desc.getCurrentIndexValue()); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + public void testGetCurrentIndexValueNoValueNotEmpty() throws Exception= { + final String query =3D "select OptionalNotAllowedEmptyParam from Crit= eriaDescTable"; + Element elem =3D getElement(query); + ArrayList list =3D new ArrayList(); + CriteriaDesc desc =3D new CriteriaDesc(elem, list); + assertNull(desc.getCurrentIndexValue()); } = - public void testIncrementIndex() { - try { - final String value2 =3D "value2"; - String query =3D "select MultiCol from MultiTable where MultiC= ol in ('" + VALUE + "', '" + value2 + "')"; - Element elem =3D getElement(query); - ArrayList list =3D new ArrayList(); - list.add(VALUE); - list.add(value2); = - CriteriaDesc desc =3D new CriteriaDesc(elem, list); - assertEquals(VALUE, desc.getCurrentIndexValue()); - assertTrue("index increment failed", desc.incrementIndex()); - assertEquals(value2, desc.getCurrentIndexValue()); - assertFalse("index went beyond number of values", desc.increme= ntIndex()); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } + public void testIncrementIndex() throws Exception { + final String value2 =3D "value2"; + String query =3D "select MultiCol from MultiTable where MultiCol i= n ('" + VALUE + "', '" + value2 + "')"; + Element elem =3D getElement(query); + ArrayList list =3D new ArrayList(); + list.add(VALUE); + list.add(value2); = + CriteriaDesc desc =3D new CriteriaDesc(elem, list); + assertEquals(VALUE, desc.getCurrentIndexValue()); + assertTrue("index increment failed", desc.incrementIndex()); + assertEquals(value2, desc.getCurrentIndexValue()); + assertFalse("index went beyond number of values", desc.incrementIn= dex()); } = - public void testResetIndex() { - try { - CriteriaDesc desc =3D createCriteriaDesc(QUERY); - desc.resetIndex(); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } + public void testResetIndex() throws Exception { + CriteriaDesc desc =3D createCriteriaDesc(QUERY); + desc.resetIndex(); } = public void testNameMatch() { @@ -882,26 +692,11 @@ = private Element getElement(String query, int colLocation) throws ConnectorException { - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeM= etadata(vdbPath); IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, que= ry); ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); IExpression expr =3D symbol.getExpression(); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); + Element elem =3D ((IElement) expr).getMetadataObject(); return elem; = } = - private Group getTable(String query) throws ConnectorException { - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeM= etadata(vdbPath); - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, que= ry); - ISelect select =3D iquery.getSelect(); - List elems =3D select.getSelectSymbols(); - IFrom from =3D iquery.getFrom(); - List fromItems =3D from.getItems(); - //better be only one - IGroup group =3D (IGroup) fromItems.get(0); - MetadataID id =3D group.getMetadataID(); - return (Group) metadata.getObject(id); - } - = } Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestOutputXPathDesc.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestOutputXPathDesc.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestOutputXPathDesc.java 2009-02-24 16:16:42 UTC (rev 488) @@ -37,8 +37,6 @@ import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.connector.language.LanguageUtil; import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** * created by JChoate on Jun 27, 2005 @@ -74,71 +72,50 @@ /* * Class under test for void OutputXPathDesc(Element) */ - public void testOutputXPathDescElement() { - = + public void testOutputXPathDescElement() throws Exception { IQuery query =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, QUER= Y); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeM= etadata(vdbPath); ISelect select =3D query.getSelect(); List symbols =3D select.getSelectSymbols(); ISelectSymbol selectSymbol =3D (ISelectSymbol) symbols.get(0); IExpression expr =3D selectSymbol.getExpression(); - Element element =3D null; - try { - if (expr instanceof IElement) { - MetadataID elementID =3D ((IElement) expr).getMetadataID()= ; = - element =3D (Element) metadata.getObject(elementID); = - } else { - fail("select symbols is not an element"); - } = - OutputXPathDesc desc =3D new OutputXPathDesc(element); - assertNull(desc.getCurrentValue()); - assertNotNull(desc.getDataType());; - } catch (ConnectorException ex) { - ex.printStackTrace(); - fail(ex.getMessage()); - } - = + assertTrue(expr instanceof IElement); + Element element =3D ((IElement) expr).getMetadataObject(); = + OutputXPathDesc desc =3D new OutputXPathDesc(element); + assertNull(desc.getCurrentValue()); + assertNotNull(desc.getDataType());; } = - public void testOutputXPathDescParam() { - try { - String query =3D "select RequiredDefaultedParam from CriteriaDesc= Table where RequiredDefaultedParam in ('foo')"; - IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); - final int colLocation =3D 0; - ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); - IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - OutputXPathDesc desc =3D new OutputXPathDesc(elem); - assertNotNull("OutputXPathDesc is null", desc); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } + public void testOutputXPathDescParam() throws Exception { + String query =3D "select RequiredDefaultedParam from CriteriaDescTabl= e where RequiredDefaultedParam in ('foo')"; + IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, query); + final int colLocation =3D 0; + ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); + IExpression expr =3D symbol.getExpression(); + assertTrue(expr instanceof IElement); + Element element =3D ((IElement) expr).getMetadataObject(); = + OutputXPathDesc desc =3D new OutputXPathDesc(element); + assertNotNull("OutputXPathDesc is null", desc); } = = - public void testOutputXPathDescNoXPath() { + public void testOutputXPathDescNoXPath() throws Exception { try { String query =3D "select OutputColumnNoXPath from CriteriaDescTab= le"; IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, qu= ery); final int colLocation =3D 0; ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSe= lectSymbols().get(colLocation); IExpression expr =3D symbol.getExpression(); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntime= Metadata(vdbPath); - MetadataID elementID =3D ((IElement) expr).getMetadataID(); - Element elem =3D (Element) metadata.getObject(elementID); - OutputXPathDesc desc =3D new OutputXPathDesc(elem); + assertTrue(expr instanceof IElement); + Element element =3D ((IElement) expr).getMetadataObject(); = + OutputXPathDesc desc =3D new OutputXPathDesc(element); fail("should not be able to create OuputXPathDesc with no XPat= h"); } catch (ConnectorException ce) { - assertNotNull(ce); } } /* * Class under test for void OutputXPathDesc(ILiteral) */ - public void testOutputXPathDescILiteral() { = + public void testOutputXPathDescILiteral() throws Exception { = String strLiteral =3D "MetaMatrix"; String strQuery =3D "Select Company_id from Company where Company_id = =3D '" + strLiteral + "'"; IQuery query =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, strQuer= y); @@ -146,18 +123,13 @@ List criteriaList =3D LanguageUtil.separateCriteriaByAnd(crits); ICompareCriteria compCriteria =3D (ICompareCriteria) criteriaList.= get(0); = ILiteral literal =3D (ILiteral) compCriteria.getRightExpression(); - try { - OutputXPathDesc desc =3D new OutputXPathDesc(literal); - assertNotNull(desc); - assertEquals(strLiteral, desc.getCurrentValue().toString()); - assertEquals(strLiteral.getClass(), desc.getDataType()); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } + OutputXPathDesc desc =3D new OutputXPathDesc(literal); + assertNotNull(desc); + assertEquals(strLiteral, desc.getCurrentValue().toString()); + assertEquals(strLiteral.getClass(), desc.getDataType()); } = - public void testOutputXPathDescILiteralNullValue() { = + public void testOutputXPathDescILiteralNullValue() throws Exception { = String strLiteral =3D "MetaMatrix"; String strQuery =3D "Select Company_id from Company where Company_id = =3D '" + strLiteral + "'"; IQuery query =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, strQuer= y); @@ -166,64 +138,37 @@ ICompareCriteria compCriteria =3D (ICompareCriteria) criteriaList.= get(0); = ILiteral literal =3D (ILiteral) compCriteria.getRightExpression(); literal.setValue(null); - try { - OutputXPathDesc desc =3D new OutputXPathDesc(literal); - assertNotNull(desc); - assertNull(desc.getCurrentValue()); - assertEquals(strLiteral.getClass(), desc.getDataType()); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } + OutputXPathDesc desc =3D new OutputXPathDesc(literal); + assertNotNull(desc); + assertNull(desc.getCurrentValue()); + assertEquals(strLiteral.getClass(), desc.getDataType()); } = - public void testSetAndGetCurrentValue() { + public void testSetAndGetCurrentValue() throws Exception { IQuery query =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, QUER= Y); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeM= etadata(vdbPath); ISelect select =3D query.getSelect(); List symbols =3D select.getSelectSymbols(); ISelectSymbol selectSymbol =3D (ISelectSymbol) symbols.get(0); IExpression expr =3D selectSymbol.getExpression(); - Element element =3D null; - try { - if (expr instanceof IElement) { - MetadataID elementID =3D ((IElement) expr).getMetadataID()= ; = - element =3D (Element) metadata.getObject(elementID); = - } else { - fail("select symbols is not an element"); - } = - OutputXPathDesc desc =3D new OutputXPathDesc(element); - String myVal =3D "myValue"; - desc.setCurrentValue(myVal); - assertEquals(myVal, desc.getCurrentValue()); - } catch (ConnectorException ex) { - ex.printStackTrace(); - fail(ex.getMessage()); - } = + assertTrue(expr instanceof IElement); + Element element =3D ((IElement) expr).getMetadataObject(); = + OutputXPathDesc desc =3D new OutputXPathDesc(element); + String myVal =3D "myValue"; + desc.setCurrentValue(myVal); + assertEquals(myVal, desc.getCurrentValue()); } = - public void testGetDataType() { + public void testGetDataType() throws Exception { IQuery query =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, QUER= Y); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeM= etadata(vdbPath); ISelect select =3D query.getSelect(); List symbols =3D select.getSelectSymbols(); ISelectSymbol selectSymbol =3D (ISelectSymbol) symbols.get(0); IExpression expr =3D selectSymbol.getExpression(); - Element element =3D null; - try { - if (expr instanceof IElement) { - MetadataID elementID =3D ((IElement) expr).getMetadataID()= ; = - element =3D (Element) metadata.getObject(elementID); = - } else { - fail("select symbols is not an element"); - } = - OutputXPathDesc desc =3D new OutputXPathDesc(element); = - assertNotNull(desc.getDataType()); - assertEquals(String.class, desc.getDataType()); - } catch (ConnectorException ex) { - ex.printStackTrace(); - fail(ex.getMessage()); - } = + assertTrue(expr instanceof IElement); + Element element =3D ((IElement) expr).getMetadataObject(); = + OutputXPathDesc desc =3D new OutputXPathDesc(element); = + assertNotNull(desc.getDataType()); + assertEquals(String.class, desc.getDataType()); } = } Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestParameterDescriptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestParameterDescriptor.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestParameterDescriptor.java 2009-02-24 16:16:42 UTC (rev 488) @@ -33,8 +33,6 @@ import com.metamatrix.connector.language.ISelect; import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** * created by JChoate on Jun 27, 2005 @@ -70,76 +68,43 @@ /* * Class under test for void ParameterDescriptor(Element) */ - public void testParameterDescriptorElement() { + public void testParameterDescriptorElement() throws Exception { IQuery query =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, QUER= Y); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeM= etadata(vdbPath); ISelect select =3D query.getSelect(); List symbols =3D select.getSelectSymbols(); ISelectSymbol selectSymbol =3D (ISelectSymbol) symbols.get(0); IExpression expr =3D selectSymbol.getExpression(); - Element element =3D null; - try { - if (expr instanceof IElement) { - MetadataID elementID =3D ((IElement) expr).getMetadataID()= ; = - element =3D (Element) metadata.getObject(elementID); = - } else { - fail("select symbols is not an element"); - } = - ParameterDescriptor desc =3D new ParameterDescriptorImpl(eleme= nt); - assertNotNull(desc); - } catch (ConnectorException ex) { - ex.printStackTrace(); - fail(ex.getMessage()); - } + assertTrue(expr instanceof IElement); + Element element =3D ((IElement) expr).getMetadataObject(); = + ParameterDescriptor desc =3D new ParameterDescriptorImpl(element); + assertNotNull(desc); } = = - public void testParameterDescriptorElementParameter() { + public void testParameterDescriptorElementParameter() throws Exception= { IQuery query =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, "sel= ect RequiredDefaultedParam from CriteriaDescTable"); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeM= etadata(vdbPath); ISelect select =3D query.getSelect(); List symbols =3D select.getSelectSymbols(); ISelectSymbol selectSymbol =3D (ISelectSymbol) symbols.get(0); IExpression expr =3D selectSymbol.getExpression(); - Element element =3D null; - try { - if (expr instanceof IElement) { - MetadataID elementID =3D ((IElement) expr).getMetadataID()= ; = - element =3D (Element) metadata.getObject(elementID); = - } else { - fail("select symbols is not an element"); - } = - ParameterDescriptor desc =3D new ParameterDescriptorImpl(eleme= nt); - assertNotNull(desc); - } catch (ConnectorException ex) { - ex.printStackTrace(); - fail(ex.getMessage()); - } + assertTrue(expr instanceof IElement); + Element element =3D ((IElement) expr).getMetadataObject(); = + ParameterDescriptor desc =3D new ParameterDescriptorImpl(element); + assertNotNull(desc); } = = = - public void testParameterDescriptorElementSpaceXPath() { + public void testParameterDescriptorElementSpaceXPath() throws Exceptio= n { IQuery query =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, "sel= ect OutputColumnSpaceXPath from CriteriaDescTable"); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeM= etadata(vdbPath); ISelect select =3D query.getSelect(); List symbols =3D select.getSelectSymbols(); ISelectSymbol selectSymbol =3D (ISelectSymbol) symbols.get(0); IExpression expr =3D selectSymbol.getExpression(); - Element element =3D null; - try { - if (expr instanceof IElement) { - MetadataID elementID =3D ((IElement) expr).getMetadataID()= ; = - element =3D (Element) metadata.getObject(elementID); = - } else { - fail("select symbols is not an element"); - } = - ParameterDescriptor desc =3D new ParameterDescriptorImpl(eleme= nt); - assertNotNull(desc); - } catch (ConnectorException ex) { - ex.printStackTrace(); - fail(ex.getMessage()); - } + assertTrue(expr instanceof IElement); + Element element =3D ((IElement) expr).getMetadataObject(); = + ParameterDescriptor desc =3D new ParameterDescriptorImpl(element); + assertNotNull(desc); } = /* @@ -153,116 +118,80 @@ assertNull(desc.getColumnName()); } = - public void testSetGetXPath() { + public void testSetGetXPath() throws Exception { ParameterDescriptor desc =3D getParameterDescriptor(); String xpath =3D "/foo"; desc.setXPath(xpath); assertEquals(xpath, desc.getXPath()); } = - public void testSetIsParameter() { + public void testSetIsParameter() throws Exception { ParameterDescriptor desc =3D getParameterDescriptor(); boolean is =3D !desc.isParameter(); desc.setIsParameter(is); assertEquals(is, desc.isParameter()); } = - public void testSetGetColumnName() { + public void testSetGetColumnName() throws Exception { ParameterDescriptor desc =3D getParameterDescriptor(); String name =3D "myColumn"; desc.setColumnName(name); assertEquals(name, desc.getColumnName()); } = - public void testSetGetColumnNumber() { + public void testSetGetColumnNumber() throws Exception { ParameterDescriptor desc =3D getParameterDescriptor(); int number =3D desc.getColumnNumber() + 1; desc.setColumnNumber(number); assertEquals(number, desc.getColumnNumber()); } = - public void testGetElement() { + public void testGetElement() throws Exception { IQuery query =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, QUER= Y); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeM= etadata(vdbPath); ISelect select =3D query.getSelect(); List symbols =3D select.getSelectSymbols(); ISelectSymbol selectSymbol =3D (ISelectSymbol) symbols.get(0); IExpression expr =3D selectSymbol.getExpression(); - Element element =3D null; - try { - if (expr instanceof IElement) { - MetadataID elementID =3D ((IElement) expr).getMetadataID()= ; = - element =3D (Element) metadata.getObject(elementID); = - } else { - fail("select symbols is not an element"); - } = - ParameterDescriptor desc =3D new ParameterDescriptorImpl(eleme= nt); - assertEquals(element, desc.getElement()); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } + assertTrue(expr instanceof IElement); + Element element =3D ((IElement) expr).getMetadataObject(); = + ParameterDescriptor desc =3D new ParameterDescriptorImpl(element); + assertEquals(element, desc.getElement()); } = - public void testTestForParam() { + public void testTestForParam() throws Exception { String trueQuery =3D "select EmptyCol from EmptyTable where EmptyCol = =3D 'foo'"; String falseQuery =3D "select Company_id from Company"; - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeMeta= data(vdbPath); = IQuery query =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, trueQue= ry); ISelect select =3D query.getSelect(); List symbols =3D select.getSelectSymbols(); ISelectSymbol selectSymbol =3D (ISelectSymbol) symbols.get(0); IExpression expr =3D selectSymbol.getExpression(); - Element element =3D null; - try { - MetadataID elementID =3D ((IElement) expr).getMetadataID(); = = - element =3D (Element) metadata.getObject(elementID); - assertTrue(ParameterDescriptor.testForParam(element)); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } + assertTrue(expr instanceof IElement); + Element element =3D ((IElement) expr).getMetadataObject(); + assertTrue(ParameterDescriptor.testForParam(element)); = query =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, falseQuery); select =3D query.getSelect(); symbols =3D select.getSelectSymbols(); selectSymbol =3D (ISelectSymbol) symbols.get(0); expr =3D selectSymbol.getExpression(); - element =3D null; - try { - MetadataID elementID =3D ((IElement) expr).getMetadataID(); = = - element =3D (Element) metadata.getObject(elementID); - assertFalse(ParameterDescriptor.testForParam(element)); - } catch (ConnectorException ce) { - ce.printStackTrace(); - fail(ce.getMessage()); - } = + assertTrue(expr instanceof IElement); + element =3D ((IElement) expr).getMetadataObject(); + assertFalse(ParameterDescriptor.testForParam(element)); } = - private ParameterDescriptor getParameterDescriptor() { + private ParameterDescriptor getParameterDescriptor() throws Exception { IQuery query =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, QUER= Y); - RuntimeMetadata metadata =3D ProxyObjectFactory.getDefaultRuntimeM= etadata(vdbPath); ISelect select =3D query.getSelect(); List symbols =3D select.getSelectSymbols(); ISelectSymbol selectSymbol =3D (ISelectSymbol) symbols.get(0); IExpression expr =3D selectSymbol.getExpression(); - Element element =3D null; - try { - if (expr instanceof IElement) { - MetadataID elementID =3D ((IElement) expr).getMetadataID()= ; = - element =3D (Element) metadata.getObject(elementID); = - } else { - fail("select symbols is not an element"); - } = - ParameterDescriptor desc =3D new ParameterDescriptorImpl(eleme= nt); - assertNotNull(desc); - return desc; - } catch (ConnectorException ex) { - ex.printStackTrace(); - fail(ex.getMessage()); - return null; - } + assertTrue(expr instanceof IElement); + Element element =3D ((IElement) expr).getMetadataObject(); = + ParameterDescriptor desc =3D new ParameterDescriptorImpl(element); + assertNotNull(desc); + return desc; } = private class ParameterDescriptorImpl extends ParameterDescriptor { Deleted: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connec= tor/xml/cache/MockDocumentCache.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/cache/MockDocumentCache.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/cache/MockDocumentCache.java 2009-02-24 16:16:42 UTC (rev 488) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - - -package com.metamatrix.connector.xml.cache; - -public class MockDocumentCache implements IDocumentCache { - - public void addToCache(String cacheKey, Object obj, int size, String id) { - // TODO Auto-generated method stub - - } - - public void clearCache() { - // TODO Auto-generated method stub - - } - - public Object fetchObject(String id, String requestID) { - // TODO Auto-generated method stub - return null; - } - - public void release(String cacheKey, String id) { - // TODO Auto-generated method stub - - } - - public void shutdownCleaner() { - // TODO Auto-generated method stub - - } - -} Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/cache/TestRequestRecord.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/cache/TestRequestRecord.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/cache/TestRequestRecord.java 2009-02-24 16:16:42 UTC (rev 488) @@ -24,24 +24,21 @@ = import junit.framework.TestCase; = +import org.mockito.Mockito; + import com.metamatrix.cdk.api.SysLogger; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.xml.CachingConnector; -import com.metamatrix.connector.xml.MockCachingConnector; = public class TestRequestRecord extends TestCase { = ConnectorLogger logger =3D new SysLogger(false); - CachingConnector mockConnector =3D new MockCachingConnector(); + CachingConnector mockConnector =3D Mockito.mock(CachingConnector.class); = - protected void setUp() throws Exception { - super.setUp(); + public TestRequestRecord() { + Mockito.stub(mockConnector.getCache()).toReturn(Mockito.mock(IDocumentCa= che.class)); } - - protected void tearDown() throws Exception { - super.tearDown(); - } - + = public void testRequestRecord() { RequestRecord testRecord; try { Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/file/TestFileExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/file/TestFileExecutor.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/file/TestFileExecutor.java 2009-02-24 16:16:42 UTC (rev 488) @@ -38,7 +38,6 @@ import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xml.MockXMLExecution; import com.metamatrix.connector.xml.base.ExecutionInfo; @@ -300,8 +299,7 @@ IQuery iquery =3D ProxyObjectFactory.getDefaultIQuery(vdbPath, que= ry); ISelectSymbol symbol =3D (ISelectSymbol) iquery.getSelect().getSelect= Symbols().get(colLocation); IExpression expr =3D symbol.getExpression(); - MetadataID elementID =3D (MetadataID) ((IElement) expr).getMetadataID= (); - Element elem =3D (Element) metadata.getObject(elementID); + Element elem =3D ((IElement) expr).getMetadataObject(); return elem; = } = Deleted: trunk/connectors/connector-xml/src/test/java/com/metamatrix/connec= tor/xmlsource/FakeRuntimeMetadata.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/FakeRuntimeMetadata.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/FakeRuntimeMetadata.java 2009-02-24 16:16:42 UTC (rev 488) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.xmlsource; - -import java.util.Properties; - -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.MetadataID; -import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; - -public class FakeRuntimeMetadata implements RuntimeMetadata { - String fileName; - = - public FakeRuntimeMetadata(String fileName) { - this.fileName =3D fileName; = - } - = - public MetadataObject getObject(MetadataID id) throws ConnectorExcepti= on { - return new MetadataObject() { - public MetadataID getMetadataID() { - return null; - } - public String getNameInSource() throws ConnectorException { - return fileName; = - } - public Properties getProperties() throws ConnectorException { - return null; - } = - }; - } - public byte[] getBinaryVDBResource(String resourcePath) throws Connect= orException { - return null; - } - public String getCharacterVDBResource(String resourcePath) throws Conn= ectorException { - return null; - } - public String[] getVDBResourcePaths() throws ConnectorException { - return null; - } = -} \ No newline at end of file Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xmlsource/file/TestFileExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/file/TestFileExecution.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/file/TestFileExecution.java 2009-02-24 16:16:42 UTC (rev 488) @@ -30,6 +30,8 @@ = import junit.framework.TestCase; = +import org.mockito.Mockito; + import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; @@ -37,8 +39,8 @@ import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IParameter.Direction; +import com.metamatrix.connector.metadata.runtime.Procedure; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.xmlsource.FakeRuntimeMetadata; import com.metamatrix.core.util.UnitTestUtil; = = @@ -55,10 +57,10 @@ try { FileConnection conn =3D new FileConnection(env); assertTrue(conn.isConnected()); - RuntimeMetadata metadata =3D new FakeRuntimeMetadata("BookColl= ection.xml"); //$NON-NLS-1$ + RuntimeMetadata metadata =3D Mockito.mock(RuntimeMetadata.clas= s); = ILanguageFactory fact =3D env.getLanguageFactory(); - IProcedure procedure =3D fact.createProcedure("GetXMLFile", nu= ll, null); //$NON-NLS-1$ + IProcedure procedure =3D fact.createProcedure("GetXMLFile", nu= ll, createMockProcedureMetadata("BookCollection.xml")); //$NON-NLS-1$ = FileExecution exec =3D (FileExecution)conn.createExecution(pro= cedure, EnvironmentUtility.createExecutionContext("100", "100"), metadata);= //$NON-NLS-1$ //$NON-NLS-2$ = @@ -97,9 +99,9 @@ try { FileConnection conn =3D new FileConnection(env); assertTrue(conn.isConnected()); - RuntimeMetadata metadata =3D new FakeRuntimeMetadata("nofile.x= ml"); //$NON-NLS-1$ + RuntimeMetadata metadata =3D Mockito.mock(RuntimeMetadata.clas= s); ILanguageFactory fact =3D env.getLanguageFactory(); - FileExecution exec =3D (FileExecution)conn.createExecution(fac= t.createProcedure("GetXMLFile", null, null), EnvironmentUtility.createExecu= tionContext("100", "100"), metadata); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NL= S-3$ + FileExecution exec =3D (FileExecution)conn.createExecution(fac= t.createProcedure("GetXMLFile", null, createMockProcedureMetadata("nofile.x= ml")), EnvironmentUtility.createExecutionContext("100", "100"), metadata); = //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ = = exec.execute(); @@ -120,4 +122,14 @@ reader.close(); return fileContents.toString(); } = + = + public static Procedure createMockProcedureMetadata(String nameInSourc= e) { + Procedure rm =3D Mockito.mock(Procedure.class); + try { + Mockito.stub(rm.getNameInSource()).toReturn(nameInSource); + } catch (ConnectorException e) { + throw new RuntimeException(e); + } + return rm; + } } Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xmlsource/soap/TestSoapExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/soap/TestSoapExecution.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/soap/TestSoapExecution.java 2009-02-24 16:16:42 UTC (rev 488) @@ -33,6 +33,8 @@ import junit.framework.TestCase; import junit.framework.TestSuite; = +import org.mockito.Mockito; + import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; import com.metamatrix.connector.api.ConnectorEnvironment; @@ -42,7 +44,7 @@ import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.xmlsource.FakeRuntimeMetadata; +import com.metamatrix.connector.xmlsource.file.TestFileExecution; import com.metamatrix.connector.xmlsource.soap.service.WebServiceServer; import com.metamatrix.core.util.UnitTestUtil; = @@ -542,7 +544,7 @@ ConnectorEnvironment env =3D EnvironmentUtility.createEnvironment(= props, new SysLogger(false)); = = SoapConnection conn =3D new SoapConnection(env); - RuntimeMetadata metadata =3D new FakeRuntimeMetadata(procName); + RuntimeMetadata metadata =3D Mockito.mock(RuntimeMetadata.class); ILanguageFactory fact =3D env.getLanguageFactory(); List parameters =3D new ArrayList(); if (args !=3D null && args.length > 0) { @@ -551,7 +553,7 @@ parameters.add(param); } } - IProcedure procedure =3D fact.createProcedure("AnyNAME", parameter= s, null); //$NON-NLS-1$ + IProcedure procedure =3D fact.createProcedure("AnyNAME", parameter= s, TestFileExecution.createMockProcedureMetadata(procName)); //$NON-NLS-1$ = ProcedureExecution exec =3D (ProcedureExecution)conn.createExecuti= on(procedure, EnvironmentUtility.createExecutionContext("100", "100"), meta= data); //$NON-NLS-1$ //$NON-NLS-2$ exec.execute(); Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamat= rix/connector/exec/ExecConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecConnection.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecConnection.java 2009-02-24 16:16:42 UTC (rev 488) @@ -23,7 +23,6 @@ package com.metamatrix.connector.exec; import java.util.List; = -import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamat= rix/connector/exec/ExecConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecConnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecConnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -32,18 +32,18 @@ import com.metamatrix.common.extensionmodule.ExtensionModuleManager; import com.metamatrix.common.extensionmodule.exception.ExtensionModuleNotF= oundException; import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.basic.BasicConnector; import com.metamatrix.core.util.ObjectConverterUtil; = /** * Implementation of text connector. */ -public class ExecConnector implements Connector { +public class ExecConnector extends BasicConnector { = private ConnectorLogger logger; private ConnectorEnvironment env; Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamat= rix/connector/exec/ExecVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecVisitor.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecVisitor.java 2009-02-24 16:16:42 UTC (rev 488) @@ -82,11 +82,11 @@ = if (whereValue !=3D null) { = - whereClause.put(symbol.getMetadataID().getName(), whereValue); + whereClause.put(symbol.getMetadataObject().getName(), whereVal= ue); // System.out.println("SYMBOL: " + symbol.getMetadataID().getNa= me() + " value: " + whereValue );//$NON-NLS-1$ //$NON-NLS-2$ = } else { - this.exception =3D new ConnectorException(ExecPlugin.Util.getS= tring("SoapVisitor.No_where_value_found", symbol.getMetadataID().getName())= ); //$NON-NLS-1$ + this.exception =3D new ConnectorException(ExecPlugin.Util.getS= tring("SoapVisitor.No_where_value_found", symbol.getMetadataObject().getNam= e())); //$NON-NLS-1$ = } = Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/ObjectConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -23,20 +23,19 @@ package com.metamatrix.connector.object; = import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorIdentity; import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.identity.ConnectorIdentity; -import com.metamatrix.connector.identity.ConnectorIdentityFactory; +import com.metamatrix.connector.basic.BasicConnector; import com.metamatrix.connector.object.util.ObjectConnectorUtil; = /** * Implmentation of the connector interface. */ -public class ObjectConnector implements Connector, ConnectorIdentityFactor= y { +public class ObjectConnector extends BasicConnector { = private ConnectorLogger logger; private ConnectorEnvironment env; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/SourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/SourceConnectionFactory.java 2009-02-24 14:33:28 UTC (rev = 487) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/SourceConnectionFactory.java 2009-02-24 16:16:42 UTC (rev = 488) @@ -3,9 +3,9 @@ import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorIdentity; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.identity.ConnectorIdentity; -import com.metamatrix.connector.identity.SingleIdentity; +import com.metamatrix.connector.api.SingleIdentity; = public interface SourceConnectionFactory { = Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/command/ObjectCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/command/ObjectCommand.java 2009-02-24 14:33:28 U= TC (rev 487) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/command/ObjectCommand.java 2009-02-24 16:16:42 U= TC (rev 488) @@ -25,7 +25,7 @@ import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IMetadataReference; -import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.object.extension.IObjectCommand; import com.metamatrix.connector.object.util.ObjectConnectorUtil; @@ -78,7 +78,7 @@ protected String determineName(IMetadataReference reference) throws Co= nnectorException { = String nis =3D getMetadataObjectNameInSource(reference); if (nis =3D=3D null || nis.length() =3D=3D 0) { - MetadataID id =3D reference.getMetadataID(); + MetadataObject id =3D reference.getMetadataObject(); return id.getName(); } return nis; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/command/ProcedureCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/command/ProcedureCommand.java 2009-02-24 14:33:2= 8 UTC (rev 487) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/command/ProcedureCommand.java 2009-02-24 16:16:4= 2 UTC (rev 488) @@ -34,7 +34,6 @@ import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.object.ObjectPlugin; import com.metamatrix.connector.object.util.ObjectConnectorUtil; @@ -145,7 +144,7 @@ } = public static final String getMethodName(final RuntimeMetadata metadat= a, final IProcedure procedure) throws ConnectorException { - String procName=3Dprocedure.getMetadataID().getName(); + String procName=3Dprocedure.getMetadataObject().getName(); = String procNameInSource =3D ObjectConnectorUtil.getMetadataObject= NameInSource(metadata, procedure, procedure); = @@ -157,7 +156,7 @@ = protected void initParameters() throws ConnectorException { = - this.procName=3Dthis.procedure.getMetadataID().getName(); + this.procName=3Dthis.procedure.getMetadataObject().getName(); = this.procNameInSource =3D getMetadataObjectNameInSource(procedure)= ; = = @@ -187,20 +186,19 @@ * @since 4.2 */ protected void initResultSet() throws ConnectorException { - List columnMetadata =3D resultSetParameter.getMetadataID().getChil= dIDs(); + List columnMetadata =3D resultSetParameter.getMetadataObj= ect().getChildren(); int size =3D columnMetadata.size(); columnNames =3D new String[size]; columnNamesInSource =3D new String[size]; columnTypes =3D new Class[size]; for(int i =3D0; i 0) { columnNamesInSource[i] =3D element.getNameInSource(); } else { columnNamesInSource[i] =3D null; } - columnNames[i] =3D element.getMetadataID().getName(); + columnNames[i] =3D element.getName(); = columnTypes[i] =3D element.getJavaType(); hasResults=3Dtrue; @@ -212,7 +210,7 @@ columnTypes =3D new Class[1]; columnNamesInSource =3D new String[1]; = - columnNames[0] =3D resultSetParameter.getMetadataID().getName(); + columnNames[0] =3D resultSetParameter.getMetadataObject().getName(= ); columnTypes[0] =3D resultSetParameter.getType(); columnNamesInSource[0] =3D this.getMetadataObjectNameInSource(resu= ltSetParameter); = Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/source/BaseSourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BaseSourceConnectionFactory.java 2009-02-= 24 14:33:28 UTC (rev 487) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BaseSourceConnectionFactory.java 2009-02-= 24 16:16:42 UTC (rev 488) @@ -27,9 +27,9 @@ import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorIdentity; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.identity.ConnectorIdentity; -import com.metamatrix.connector.identity.SingleIdentity; +import com.metamatrix.connector.api.SingleIdentity; import com.metamatrix.connector.object.ObjectConnection; import com.metamatrix.connector.object.SourceConnectionFactory; import com.metamatrix.connector.object.extension.IObjectSource; @@ -60,7 +60,7 @@ = = /** = - * @see com.metamatrix.data.pool.SourceConnectionFactory#createConnect= ion(com.metamatrix.connector.identity.ConnectorIdentity) + * @see com.metamatrix.data.pool.SourceConnectionFactory#createConnect= ion(com.metamatrix.connector.api.ConnectorIdentity) * @since 4.3 */ public final Connection createConnection(ConnectorIdentity id) throws = ConnectorException { Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/util/ObjectConnectorUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/util/ObjectConnectorUtil.java 2009-02-24 14:33:28 UTC (rev= 487) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/util/ObjectConnectorUtil.java 2009-02-24 16:16:42 UTC (rev= 488) @@ -29,7 +29,6 @@ import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IMetadataReference; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.object.ObjectPlugin; @@ -51,8 +50,7 @@ if(reference =3D=3D null) { return null; } - MetadataID id =3D reference.getMetadataID(); - MetadataObject obj =3D metadata.getObject(id); + MetadataObject obj =3D reference.getMetadataObject(); if (obj !=3D null) { if (obj.getNameInSource() !=3D null) { return obj.getNameInSource(); Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java 2009-02-2= 4 14:33:28 UTC (rev 487) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java 2009-02-2= 4 16:16:42 UTC (rev 488) @@ -44,14 +44,14 @@ List objs =3D new ArrayList(); objs.add("SDO_FILTER"); //$NON-NLS-1$ objs.add("("); //$NON-NLS-1$ - IExpression[] params =3D function.getParameters(); - if (params.length =3D=3D 3) { - addParamWithConversion(objs, params[0]); + List params =3D function.getParameters(); + if (params.size() =3D=3D 3) { + addParamWithConversion(objs, params.get(0)); objs.add(", "); //comma between parms //$NON-NLS-1$ = - addParamWithConversion(objs, params[1]); + addParamWithConversion(objs, params.get(1)); objs.add(", "); //$NON-NLS-1$ - objs.add(params[2]); + objs.add(params.get(2)); } else { return super.translate(function); } Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier.java = 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier.java = 2009-02-24 16:16:42 UTC (rev 488) @@ -44,17 +44,17 @@ List objs =3D new ArrayList(); objs.add("SDO_NN"); // recast name from sdoNN to SDO_NN //$NON-NLS= -1$ objs.add("("); //$NON-NLS-1$ - IExpression[] params =3D function.getParameters(); - if (params.length >=3D 3) { - addParamWithConversion(objs, params[0]); + List params =3D function.getParameters(); + if (params.size() >=3D 3) { + addParamWithConversion(objs, params.get(0)); objs.add(", "); //comma between parms //$NON-NLS-1$ = - addParamWithConversion(objs, params[1]); + addParamWithConversion(objs, params.get(1)); objs.add(", "); //$NON-NLS-1$ - objs.add(params[2]); - if (params.length =3D=3D 4) { + objs.add(params.get(2)); + if (params.size() =3D=3D 4) { objs.add(", "); //$NON-NLS-1$ - objs.add(params[3]); + objs.add(params.get(3)); } } else { return super.translate(function); Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java 2009-02-2= 4 14:33:28 UTC (rev 487) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java 2009-02-2= 4 16:16:42 UTC (rev 488) @@ -47,16 +47,16 @@ List objs =3D new ArrayList(); objs.add("SDO_RELATE"); // recast name from sdoRelate to SDO_RELAT= E //$NON-NLS-1$ objs.add("("); //$NON-NLS-1$ - IExpression[] params =3D function.getParameters(); + List params =3D function.getParameters(); //if it doesn't have 3 parms, it is not a version of SDO_RELATE wh= ich // we are prepared to translate - if (params.length =3D=3D 3) { - addParamWithConversion(objs, params[0]); + if (params.size() =3D=3D 3) { + addParamWithConversion(objs, params.get(0)); objs.add(", "); //comma between parms //$NON-NLS-1$ = - addParamWithConversion(objs, params[1]); + addParamWithConversion(objs, params.get(1)); objs.add(", "); //$NON-NLS-1$ - addParamWithConversion(objs, params[2]); + addParamWithConversion(objs, params.get(2)); } else { return super.translate(function); } Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.java 2= 009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.java 2= 009-02-24 16:16:42 UTC (rev 488) @@ -44,16 +44,16 @@ List objs =3D new ArrayList(); objs.add("SDO_WITHIN_DISTANCE"); // recast name from sdoNN to SDO_= NN //$NON-NLS-1$ objs.add("("); //$NON-NLS-1$ - IExpression[] params =3D function.getParameters(); + List params =3D function.getParameters(); //if it doesn't have 3 parms, it is not a version of SDO_RELATE wh= ich // we are prepared to translate - if (params.length =3D=3D 3) { - addParamWithConversion(objs, params[0]); + if (params.size() =3D=3D 3) { + addParamWithConversion(objs, params.get(0)); objs.add(", "); //comma between parms //$NON-NLS-1$ = - addParamWithConversion(objs, params[1]); + addParamWithConversion(objs, params.get(1)); objs.add(", "); //$NON-NLS-1$ - objs.add(params[2]); + objs.add(params.get(2)); } else { return super.translate(function); } Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metama= trix/connector/yahoo/YahooConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooConnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooConnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -23,8 +23,9 @@ package com.metamatrix.connector.yahoo; = import com.metamatrix.connector.api.*; +import com.metamatrix.connector.basic.BasicConnector; = -public class YahooConnector implements Connector { +public class YahooConnector extends BasicConnector { = private ConnectorEnvironment env; = Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metama= trix/connector/yahoo/YahooExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooExecution.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooExecution.java 2009-02-24 16:16:42 UTC (rev 488) @@ -52,7 +52,6 @@ import com.metamatrix.connector.language.ISelect; import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** @@ -255,8 +254,7 @@ ISelectSymbol symbol =3D (ISelectSymbol) iter.next(); IExpression expr =3D symbol.getExpression(); if(expr instanceof IElement) { - MetadataID id =3D ((IElement)expr).getMetadataID(); - Element element =3D (Element) metadata.getObject(id); + Element element =3D ((IElement)expr).getMetadataObject(); cols[i] =3D element.getPosition(); } else { throw new ConnectorException(YahooPlugin.Util.getString("Y= ahooExecution.Invalid_select_symbol", expr)); //$NON-NLS-1$ Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ConnectorManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorManager.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorManager.java 2009-02-24 16:16:42 UTC (rev 488) @@ -89,7 +89,7 @@ import com.metamatrix.query.sql.lang.Command; = /** - * The ConnectorManager manages a {@link com.metamatrix.conne= ctor.api.Connector Connector} + * The ConnectorManager manages a {@link com.metamatrix.conne= ctor.basic.BasicConnector Connector} * and its associated workers' state. */ public class ConnectorManager implements ApplicationService { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ConnectorWorkItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWorkItem.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWorkItem.java 2009-02-24 16:16:42 UTC (rev 488) @@ -48,7 +48,6 @@ import com.metamatrix.core.util.Assertion; import com.metamatrix.dqp.DQPPlugin; import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory; -import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.dqp.internal.process.AbstractWorkItem; import com.metamatrix.dqp.internal.process.DQPWorkContext; @@ -288,7 +287,7 @@ LanguageBridgeFactory factory =3D new LanguageBridgeFactory(queryM= etadata); this.translatedCommand =3D factory.translate(command); = - RuntimeMetadata rmd =3D new RuntimeMetadataImpl(new MetadataFactor= y(queryMetadata)); + RuntimeMetadata rmd =3D new RuntimeMetadataImpl(queryMetadata); = // Create the execution based on mode final Execution exec =3D connection.createExecution(this.translate= dCommand, this.securityContext, rmd); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ConnectorWrapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWrapper.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWrapper.java 2009-02-24 16:16:42 UTC (rev 488) @@ -27,10 +27,8 @@ import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorIdentity; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.identity.ConnectorIdentity; -import com.metamatrix.connector.identity.ConnectorIdentityFactory; -import com.metamatrix.connector.identity.SingleIdentity; import com.metamatrix.connector.xa.api.TransactionContext; import com.metamatrix.connector.xa.api.XAConnection; import com.metamatrix.connector.xa.api.XAConnector; @@ -38,7 +36,7 @@ /** * ConnectorWrapper adds default behavior to the wrapped connector. */ -public class ConnectorWrapper implements XAConnector, ConnectorIdentityFac= tory { +public class ConnectorWrapper implements XAConnector { = private Connector actualConnector; = @@ -113,10 +111,7 @@ @Override public ConnectorIdentity createIdentity(ExecutionContext context) throws ConnectorException { - if (actualConnector instanceof ConnectorIdentityFactory) { - return ((ConnectorIdentityFactory)actualConnector).createIdentity(conte= xt); - } - return new SingleIdentity(); + return actualConnector.createIdentity(context); } = public boolean supportsSingleIdentity() { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ExecutionContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Exe= cutionContextImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Exe= cutionContextImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -28,8 +28,8 @@ import java.util.List; = import com.metamatrix.common.buffer.impl.BufferConfig; +import com.metamatrix.connector.api.ConnectorIdentity; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.identity.ConnectorIdentity; import com.metamatrix.core.util.HashCodeUtil; = /** Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ProcedureBatchHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Pro= cedureBatchHandler.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Pro= cedureBatchHandler.java 2009-02-24 16:16:42 UTC (rev 488) @@ -55,7 +55,7 @@ while(iter.hasNext()){ IParameter param =3D (IParameter)iter.next(); if (param.getDirection() =3D=3D Direction.RESULT_SET) { - resultSetCols =3D param.getMetadataID().getChildIDs().= size(); + resultSetCols =3D param.getMetadataObject().getChildre= n().size(); } else if(param.getDirection() =3D=3D Direction.RETURN || = param.getDirection() =3D=3D Direction.OUT || param.getDirection() =3D=3D Di= rection.INOUT){ paramCols +=3D 1; } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/ElementImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ElementImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ElementImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -24,20 +24,20 @@ = import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; = public class ElementImpl extends BaseLanguageObject implements IElement { = private IGroup group; private String name; - private MetadataID metadataID; + private Element metadataObject; private Class type; = - public ElementImpl(IGroup group, String name, MetadataID metadataID, C= lass type) { + public ElementImpl(IGroup group, String name, Element metadataObject, = Class type) { this.group =3D group; this.name =3D name; - this.metadataID =3D metadataID; + this.metadataObject =3D metadataObject; this.type =3D type; } = @@ -55,17 +55,15 @@ return group; } = - /** - * @see com.metamatrix.connector.language.IMetadataReference#getMetada= taID() - */ - public MetadataID getMetadataID() { - return metadataID; + @Override + public Element getMetadataObject() { + return this.metadataObject; } = - public void setMetadataID(MetadataID id){ - this.metadataID =3D id; - } - + public void setMetadataObject(Element metadataObject) { + this.metadataObject =3D metadataObject; + } + = /** * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) */ Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/FunctionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /FunctionImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /FunctionImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,6 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = +import java.util.ArrayList; +import java.util.List; + import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; @@ -29,12 +32,16 @@ public class FunctionImpl extends BaseLanguageObject implements IFunction { = private String name; - private IExpression[] parameters; + private List parameters; private Class type; = - public FunctionImpl(String name, IExpression[] params, Class type) { + public FunctionImpl(String name, List params, C= lass type) { this.name =3D name; - this.parameters =3D params; + if (params =3D=3D null) { + this.parameters =3D new ArrayList(0); + } else { + this.parameters =3D new ArrayList(params); + } this.type =3D type; } = @@ -48,7 +55,7 @@ /** * @see com.metamatrix.connector.language.IFunction#getParameters() */ - public IExpression[] getParameters() { + public List getParameters() { return parameters; } = @@ -67,13 +74,6 @@ } = /* = - * @see com.metamatrix.data.language.IFunction#setParameters(com.metam= atrix.data.language.IExpression[]) - */ - public void setParameters(IExpression[] parameters) { - this.parameters =3D parameters; - } - - /* = * @see com.metamatrix.data.language.IExpression#getType() */ public Class getType() { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/GroupImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /GroupImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /GroupImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -23,20 +23,21 @@ package com.metamatrix.dqp.internal.datamgr.language; = import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.metadata.runtime.Group; import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; import com.metamatrix.core.util.HashCodeUtil; +import com.metamatrix.metadata.runtime.api.MetadataID; = public class GroupImpl extends BaseLanguageObject implements IGroup { = private String context; private String definition; = - private MetadataID metadataID; + private Group metadataObject; = - public GroupImpl(String context, String definition, MetadataID id) { + public GroupImpl(String context, String definition, Group group) { this.context =3D context; this.definition =3D definition; - this.metadataID =3D id; + this.metadataObject =3D group; } = /** @@ -53,16 +54,14 @@ return this.definition; } = - /** - * @see com.metamatrix.connector.language.IMetadataReference#getMetada= taID() - */ - public MetadataID getMetadataID() { - return metadataID; + @Override + public Group getMetadataObject() { + return this.metadataObject; } - = - public void setMetadataID(MetadataID id){ - this.metadataID =3D id; - } + = + public void setMetadataObject(Group metadataObject) { + this.metadataObject =3D metadataObject; + } = /** * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/LanguageBridgeFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageBridgeFactory.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageBridgeFactory.java 2009-02-24 16:16:42 UTC (rev 488) @@ -27,8 +27,8 @@ import java.util.List; = import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.common.log.LogManager; +import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.IAggregate; import com.metamatrix.connector.language.IBatchedUpdates; import com.metamatrix.connector.language.ICommand; @@ -69,11 +69,10 @@ import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.language.IParameter.Direction; import com.metamatrix.connector.language.ISubqueryCompareCriteria.Quantifi= er; -import com.metamatrix.connector.metadata.runtime.MetadataID; -import com.metamatrix.connector.metadata.runtime.MetadataID.Type; +import com.metamatrix.connector.metadata.runtime.Parameter; +import com.metamatrix.connector.metadata.runtime.Procedure; import com.metamatrix.dqp.DQPPlugin; -import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; -import com.metamatrix.dqp.internal.datamgr.metadata.ProcedureIDImpl; +import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.dqp.message.ParameterInfo; import com.metamatrix.dqp.util.LogConstants; import com.metamatrix.query.metadata.QueryMetadataInterface; @@ -126,11 +125,11 @@ import com.metamatrix.query.sql.symbol.SingleElementSymbol; = public class LanguageBridgeFactory { - private MetadataFactory metadataFactory =3D null; + private RuntimeMetadataImpl metadataFactory =3D null; = public LanguageBridgeFactory(QueryMetadataInterface metadata) { if (metadata !=3D null) { - metadataFactory =3D new MetadataFactory(metadata); + metadataFactory =3D new RuntimeMetadataImpl(metadata); } } = @@ -489,11 +488,10 @@ = IFunction translate(Function function) throws MetaMatrixComponentExcep= tion { Expression [] args =3D function.getArgs(); - IExpression [] params =3D null; + List params =3D new ArrayList(args.lengt= h); if (args !=3D null) { - params =3D new IExpression[args.length]; for (int i =3D 0; i < args.length; i++) { - params[i] =3D translate(args[i]); + params.add(translate(args[i])); } } return new FunctionImpl(function.getName(), params, function.getTy= pe()); @@ -542,19 +540,14 @@ ElementImpl element =3D null; element =3D new ElementImpl(translate(symbol.getGroupSymbol()), sy= mbol.getOutputName(), null, symbol.getType()); = - if (element.getGroup().getMetadataID() =3D=3D null) { + if (element.getGroup().getMetadataObject() =3D=3D null) { return element; } = Object mid =3D symbol.getMetadataID(); = if(! (mid instanceof TempMetadataID)) { = - try { - element.setMetadataID(metadataFactory.createMetadataID(mid= , Type.TYPE_ELEMENT)); - } catch(QueryMetadataException e) { - LogManager.logWarning(LogConstants.CTX_CONNECTOR, e, DQPPl= ugin.Util.getString("LanguageBridgeFactory.Unable_to_set_the_metadata_ID_fo= r_element_{0}._10", symbol.getName())); //$NON-NLS-1$ - throw new MetaMatrixComponentException(e); - } + element.setMetadataObject(metadataFactory.getElement(mid)); } return element; } @@ -627,26 +620,25 @@ = /* Execute */ IProcedure translate(StoredProcedure sp) throws MetaMatrixComponentExc= eption { - ProcedureIDImpl metadataID =3D null; + Procedure proc =3D null; if(sp.getProcedureID() !=3D null) { try { - metadataID =3D (ProcedureIDImpl) metadataFactory.createPro= cedureID(sp.getProcedureID()); - } catch(Exception e) { - LogManager.logWarning(LogConstants.CTX_CONNECTOR, e, DQPPl= ugin.Util.getString("LanguageBridgeFactory.Unable_to_set_the_metadata_ID_fo= r_element_{0}._10", sp.getProcedureName())); //$NON-NLS-1$ + proc =3D this.metadataFactory.getProcedure(sp.getGroup().g= etName()); + } catch(ConnectorException e) { throw new MetaMatrixComponentException(e); } } = List parameters =3D sp.getParameters(); - List translatedParameters =3D new ArrayList(); + List translatedParameters =3D new ArrayList(); for (Iterator i =3D parameters.iterator(); i.hasNext();) { - translatedParameters.add(translate((SPParameter)i.next(), meta= dataID)); + translatedParameters.add(translate((SPParameter)i.next(), proc= )); } = - return new ProcedureImpl(sp.getProcedureName(), translatedParamete= rs, metadataID); + return new ProcedureImpl(sp.getProcedureName(), translatedParamete= rs, proc); } = - IParameter translate(SPParameter param, ProcedureIDImpl procID) throws= MetaMatrixComponentException { + IParameter translate(SPParameter param, Procedure parent) throws MetaM= atrixComponentException { Direction direction =3D Direction.IN; switch(param.getParameterType()) { case ParameterInfo.IN: = @@ -666,19 +658,8 @@ break; } = - try { - MetadataID metadataID =3D null; = - if(direction =3D=3D Direction.RESULT_SET) { - metadataID =3D metadataFactory.createResultSetID(procID, p= aram.getMetadataID(), param.getResultSetIDs()); - return new ParameterImpl(param.getIndex(), direction, para= m.getValue(), param.getClassType(), metadataID); = - = - } = - metadataID =3D metadataFactory.createParameterID(procID, param= .getMetadataID()); - return new ParameterImpl(param.getIndex(), direction, param.ge= tValue(), param.getClassType(), metadataID); = - } catch(QueryMetadataException e) { - throw new MetaMatrixComponentException(e); = - } - = + Parameter metadataParam =3D metadataFactory.getParameter(param, pa= rent); + return new ParameterImpl(param.getIndex(), direction, param.getVal= ue(), param.getClassType(), metadataParam); = } = IGroup translate(GroupSymbol symbol) throws MetaMatrixComponentExcepti= on { @@ -687,7 +668,7 @@ return group; } try { - group.setMetadataID(metadataFactory.createMetadataID(symbol.ge= tMetadataID(), Type.TYPE_GROUP)); + group.setMetadataObject(metadataFactory.getGroup(symbol.getMet= adataID())); } catch(Exception e) { LogManager.logWarning(LogConstants.CTX_CONNECTOR, e, DQPPlugin= .Util.getString("LanguageBridgeFactory.Unable_to_set_the_metadata_ID_for_gr= oup_{0}._11", symbol.getName())); //$NON-NLS-1$ throw new MetaMatrixComponentException(e); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/LanguageFactoryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageFactoryImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageFactoryImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,10 +22,53 @@ = package com.metamatrix.dqp.internal.datamgr.language; = +import java.util.Arrays; import java.util.List; = -import com.metamatrix.connector.language.*; -import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.language.IAggregate; +import com.metamatrix.connector.language.IBulkInsert; +import com.metamatrix.connector.language.ICompareCriteria; +import com.metamatrix.connector.language.ICompoundCriteria; +import com.metamatrix.connector.language.ICriteria; +import com.metamatrix.connector.language.IDelete; +import com.metamatrix.connector.language.IElement; +import com.metamatrix.connector.language.IExistsCriteria; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFrom; +import com.metamatrix.connector.language.IFromItem; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.IGroup; +import com.metamatrix.connector.language.IGroupBy; +import com.metamatrix.connector.language.IInCriteria; +import com.metamatrix.connector.language.IInlineView; +import com.metamatrix.connector.language.IInsert; +import com.metamatrix.connector.language.IIsNullCriteria; +import com.metamatrix.connector.language.IJoin; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILikeCriteria; +import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.INotCriteria; +import com.metamatrix.connector.language.IOrderBy; +import com.metamatrix.connector.language.IOrderByItem; +import com.metamatrix.connector.language.IParameter; +import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IQuery; +import com.metamatrix.connector.language.IQueryCommand; +import com.metamatrix.connector.language.IScalarSubquery; +import com.metamatrix.connector.language.ISearchedCaseExpression; +import com.metamatrix.connector.language.ISelect; +import com.metamatrix.connector.language.ISelectSymbol; +import com.metamatrix.connector.language.ISetClause; +import com.metamatrix.connector.language.ISetClauseList; +import com.metamatrix.connector.language.ISetQuery; +import com.metamatrix.connector.language.ISubqueryCompareCriteria; +import com.metamatrix.connector.language.ISubqueryInCriteria; +import com.metamatrix.connector.language.IUpdate; +import com.metamatrix.connector.metadata.runtime.Element; +import com.metamatrix.connector.metadata.runtime.Group; +import com.metamatrix.connector.metadata.runtime.Parameter; +import com.metamatrix.connector.metadata.runtime.Procedure; = /** */ @@ -72,7 +115,7 @@ /* = * @see com.metamatrix.data.language.ILanguageFactory#createElement(ja= va.lang.String, com.metamatrix.data.language.IGroup, com.metamatrix.data.me= tadata.runtime.MetadataID) */ - public IElement createElement(String name, IGroup group, MetadataID me= tadataReference, Class type) { + public IElement createElement(String name, IGroup group, Element metad= ataReference, Class type) { return new ElementImpl(group, name, metadataReference, type); } = @@ -89,18 +132,24 @@ public IFrom createFrom(List items) { return new FromImpl(items); } + = + @Override + public IFunction createFunction(String functionName, IExpression[] arg= s, + Class type) { + return new FunctionImpl(functionName, Arrays.asList(args), type); + } = /* = * @see com.metamatrix.data.language.ILanguageFactory#createFunction(j= ava.lang.String, com.metamatrix.data.language.IExpression[], java.lang.Clas= s) */ - public IFunction createFunction(String functionName, IExpression[] arg= s, Class type) { + public IFunction createFunction(String functionName, List args, Class type) { return new FunctionImpl(functionName, args, type); } = /* = * @see com.metamatrix.data.language.ILanguageFactory#createGroup(java= .lang.String, java.lang.String, com.metamatrix.data.metadata.runtime.Metada= taID) */ - public IGroup createGroup(String context, String definition, MetadataI= D metadataReference) { + public IGroup createGroup(String context, String definition, Group met= adataReference) { return new GroupImpl(context, definition, metadataReference); } = @@ -188,14 +237,14 @@ /* = * @see com.metamatrix.data.language.ILanguageFactory#createParameter(= int, int, java.lang.Object, java.lang.Class) */ - public IParameter createParameter(int index, IParameter.Direction dire= ction, Object value, Class type, MetadataID metadataReference) { + public IParameter createParameter(int index, IParameter.Direction dire= ction, Object value, Class type, Parameter metadataReference) { return new ParameterImpl(index, direction, value, type, metadataRe= ference); } = /* = * @see com.metamatrix.data.language.ILanguageFactory#createProcedure(= java.lang.String, java.util.List, com.metamatrix.data.metadata.runtime.Meta= dataID) */ - public IProcedure createProcedure(String name, List parameters, Metada= taID metadataReference) { + public IProcedure createProcedure(String name, List parameters, Proced= ure metadataReference) { return new ProcedureImpl(name, parameters, metadataReference); } = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/ParameterImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ParameterImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ParameterImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -23,7 +23,7 @@ package com.metamatrix.dqp.internal.datamgr.language; = import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.metadata.runtime.Parameter; import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; = public class ParameterImpl extends BaseLanguageObject implements IParamete= r { @@ -33,14 +33,14 @@ private Object value; private boolean valueSpecified; private Class type; - private MetadataID metadataID; + private Parameter metadataObject; = - public ParameterImpl(int index, Direction direction, Object value, Cla= ss type, MetadataID metadataID) { + public ParameterImpl(int index, Direction direction, Object value, Cla= ss type, Parameter metadataObject) { setIndex(index); setDirection(direction); setValue(value); setType(type); - setMetadataID(metadataID); + this.metadataObject =3D metadataObject; } = /** @@ -109,16 +109,14 @@ } } = - public MetadataID getMetadataID() { - return this.metadataID; + @Override + public Parameter getMetadataObject() { + return this.metadataObject; } = - /* = - * @see com.metamatrix.data.language.IMetadataReference#setMetadataID(= com.metamatrix.data.metadata.runtime.MetadataID) - */ - public void setMetadataID(MetadataID metadataID) { - this.metadataID =3D metadataID; - } + public void setMetadataObject(Parameter metadataObject) { + this.metadataObject =3D metadataObject; + } = /** = * @see com.metamatrix.connector.language.IParameter#getValueSpecified= () Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/ProcedureImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ProcedureImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ProcedureImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -24,20 +24,21 @@ = import java.util.List; = +import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.metadata.runtime.MetadataID; +import com.metamatrix.connector.metadata.runtime.Procedure; import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; = public class ProcedureImpl extends BaseLanguageObject implements IProcedur= e { = private String name; - private List parameters; - private MetadataID metadataID; + private List parameters; + private Procedure metadataObject; = - public ProcedureImpl(String name, List parameters, MetadataID metadata= ID) { + public ProcedureImpl(String name, List parameters, Procedu= re metadataObject) { this.name =3D name; this.parameters =3D parameters; - this.metadataID =3D metadataID; + this.metadataObject =3D metadataObject; } = /** @@ -50,7 +51,7 @@ /** * @see com.metamatrix.data.language.IExecute#getVariableValues() */ - public List getParameters() { + public List getParameters() { return parameters; } = @@ -71,22 +72,17 @@ /* = * @see com.metamatrix.data.language.IExecute#setParameters(java.util.= List) */ - public void setParameters(List parameters) { + public void setParameters(List parameters) { this.parameters =3D parameters; } = - /* = - * @see com.metamatrix.data.language.IMetadataReference#getMetadataID() - */ - public MetadataID getMetadataID() { - return this.metadataID; + @Override + public Procedure getMetadataObject() { + return this.metadataObject; } = - /* = - * @see com.metamatrix.data.language.IMetadataReference#setMetadataID(= com.metamatrix.data.metadata.runtime.MetadataID) - */ - public void setMetadataID(MetadataID metadataID) { - this.metadataID =3D metadataID; + public void setMetadataObject(Procedure metadataID) { + this.metadataObject =3D metadataID; } = public boolean equals(Object obj) { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/ElementImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ElementImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ElementImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -29,14 +29,15 @@ import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.Element; +import com.metamatrix.connector.metadata.runtime.Group; import com.metamatrix.query.metadata.SupportConstants; = /** */ public class ElementImpl extends TypeModelImpl implements Element { = - ElementImpl(MetadataIDImpl metadataID){ - super(metadataID); + ElementImpl(Object actualID, RuntimeMetadataImpl factory){ + super(actualID, factory); } = public Class getJavaType() throws ConnectorException { @@ -140,5 +141,18 @@ } catch(MetaMatrixComponentException e) { throw new ConnectorException(e); = } + } + + @Override + public Group getParent() throws ConnectorException { + Object groupId; + try { + groupId =3D this.getMetadata().getGroupIDForElementID(getActualID()); + } catch (QueryMetadataException e) { + throw new ConnectorException(e); + } catch (MetaMatrixComponentException e) { + throw new ConnectorException(e); + } + return new GroupImpl(groupId, getFactory()); } = } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/GroupImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /GroupImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /GroupImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -24,12 +24,36 @@ */ package com.metamatrix.dqp.internal.datamgr.metadata; = +import java.util.ArrayList; +import java.util.List; + +import com.metamatrix.api.exception.MetaMatrixComponentException; +import com.metamatrix.api.exception.query.QueryMetadataException; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.Group; = /** */ public class GroupImpl extends MetadataObjectImpl implements Group { - GroupImpl(MetadataIDImpl metadataID){ - super(metadataID); + = + GroupImpl(Object actualID, RuntimeMetadataImpl factory){ + super(actualID, factory); } + = + @Override + public List getChildren() throws ConnectorException { + try { + List elementIds =3D getMetadata().getElementIDsInGroupID(getActualID= ()); + List result =3D new ArrayList(elementIds.size()); + for (Object elementId : elementIds) { + result.add(new ElementImpl(elementId, getFactory())); + } + return result; + } catch (QueryMetadataException e) { + throw new ConnectorException(e); + } catch (MetaMatrixComponentException e) { + throw new ConnectorException(e); + } + } } Deleted: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/met= adata/MetadataFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataFactory.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataFactory.java 2009-02-24 16:16:42 UTC (rev 488) @@ -1,149 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.dqp.internal.datamgr.metadata; - -import java.util.List; - -import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.*; -import com.metamatrix.connector.metadata.runtime.MetadataID.Type; -import com.metamatrix.core.util.ArgCheck; -import com.metamatrix.query.metadata.QueryMetadataInterface; -import com.metamatrix.query.metadata.StoredProcedureInfo; - -/** - */ -public class MetadataFactory { - private QueryMetadataInterface metadata; - private RuntimeMetadataImpl runtimeMetadata; - = - public MetadataFactory (QueryMetadataInterface metadata){ - ArgCheck.isNotNull(metadata); - this.metadata =3D metadata; - this.runtimeMetadata =3D new RuntimeMetadataImpl(this); - } - = - public RuntimeMetadataImpl getRuntimeMetadata(){ - return this.runtimeMetadata; - } - = - /** - * Method for creating group and element MetadataIDs. It will not retu= rn an id for virtual groups. - * @param metadataID Object from QueryMetadataInterface representing g= roup or element identifier - * @param type Either TYPE_ELEMENT or TYPE_GROUP - * @return MetadataID = - * @throws QueryMetadataException - * @throws MetaMatrixComponentException - */ - public MetadataID createMetadataID(Object metadataID, Type type) throw= s QueryMetadataException, MetaMatrixComponentException{ - if (type =3D=3D Type.TYPE_GROUP && metadata.isVirtualGroup(metadataID= )) { - return null; - } - MetadataIDImpl id =3D new MetadataIDImpl(metadataID, getRuntimeMet= adata()); - id.setType(type); - return id; - } - - /** - * Method for creating procedure MetadataIDs. = - * @param procedureID Procedure ID - * @return Parameter ID - * @throws QueryMetadataException - * @throws MetaMatrixComponentException - */ - public MetadataID createProcedureID(Object metadataID) throws QueryMet= adataException, MetaMatrixComponentException{ - String procName =3D metadata.getFullName(metadataID); - StoredProcedureInfo info =3D metadata.getStoredProcedureInfoForPro= cedure(procName); = - MetadataIDImpl id =3D new ProcedureIDImpl(metadataID, info, this); - id.setType(Type.TYPE_PROCEDURE); - return id; - } - = - /** - * Special factory method for creating parameter MetadataIDs based on = a procedure MetadataID. = - * @param procedureID Procedure ID - * @return Parameter ID - * @throws QueryMetadataException - * @throws MetaMatrixComponentException - */ - public MetadataID createParameterID(ProcedureIDImpl procedureID, Objec= t metadataID) throws QueryMetadataException, MetaMatrixComponentException{ - ParameterIDImpl id =3D new ParameterIDImpl(metadataID, procedureID= , getRuntimeMetadata()); - id.setType(Type.TYPE_PARAMETER); - return id; - } - - /** - * Special factory method for creating result set MetadataIDs based on= a procedure MetadataID. = - * @param procedureID Procedure ID - * @return Parameter ID - * @throws QueryMetadataException - * @throws MetaMatrixComponentException - */ - public MetadataID createResultSetID(ProcedureIDImpl procedureID, Objec= t metadataID, List resultSetColumns) throws QueryMetadataException, MetaMat= rixComponentException{ - ParameterIDImpl id =3D new ParameterIDImpl(metadataID, procedureID= , getRuntimeMetadata(), resultSetColumns); - id.setType(Type.TYPE_PARAMETER); - return id; - } - = - public MetadataObject createMetadataObject(MetadataID id) throws Query= MetadataException, MetaMatrixComponentException, ConnectorException { - Type type =3D id.getType(); - MetadataIDImpl idImpl =3D (MetadataIDImpl) id; - MetadataObject mObj =3D null; - if(type =3D=3D Type.TYPE_GROUP){ - mObj =3D new GroupImpl(idImpl); - = - } else if(type =3D=3D Type.TYPE_ELEMENT){ = - mObj =3D new ElementImpl(idImpl); - = - } else if(type =3D=3D Type.TYPE_PROCEDURE){ - mObj =3D new ProcedureImpl(idImpl); - = - } else if(type =3D=3D Type.TYPE_PARAMETER) { - mObj =3D new ParameterImpl(idImpl); = - = - } else{ - //throw exception - } - return mObj; - } - = - public byte[] getBinaryVDBResource(String resourcePath) throws MetaMat= rixComponentException, QueryMetadataException { - return metadata.getBinaryVDBResource(resourcePath); - } - - public String getCharacterVDBResource(String resourcePath) throws Meta= MatrixComponentException, QueryMetadataException { - return metadata.getCharacterVDBResource(resourcePath); - } - - public String[] getVDBResourcePaths() throws MetaMatrixComponentExcept= ion, QueryMetadataException { - return metadata.getVDBResourcePaths(); - } - = - public QueryMetadataInterface getMetadata() { - return metadata; - } -} Deleted: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/met= adata/MetadataIDImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataIDImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataIDImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -1,155 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.dqp.internal.datamgr.metadata; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.MetadataID; -import com.metamatrix.connector.metadata.runtime.MetadataObject; - -/** - */ -public class MetadataIDImpl implements MetadataID { - private Type type; - private Object actualMetadataID; - private String fullName; - private RuntimeMetadataImpl metadata; - = - MetadataIDImpl(Object actualMetadataID, RuntimeMetadataImpl metadata) = throws MetaMatrixComponentException { - this.actualMetadataID =3D actualMetadataID; - this.metadata =3D metadata; - = - if (actualMetadataID !=3D null) { - try { - fullName =3D metadata.getMetadata().getFullName(actualMetadat= aID); - } catch (QueryMetadataException ex) { - throw new MetaMatrixComponentException(ex, ex.getMessage()); - } - } - } - = - RuntimeMetadataImpl getMetadata() { - return this.metadata; - } - = - public Type getType() { - return type; - } - - public List getChildIDs() throws ConnectorException { - if(type =3D=3D Type.TYPE_GROUP && actualMetadataID !=3D null){ - try { - List children =3D metadata.getMetadata().getElementIDsInGr= oupID(actualMetadataID); - List childIDs =3D new ArrayList(children.size()); - Iterator iter =3D children.iterator(); - while(iter.hasNext()){ - MetadataIDImpl id =3D new MetadataIDImpl(iter.next(), = metadata); - id.setType(Type.TYPE_ELEMENT); - childIDs.add(id); - } - return childIDs; - } catch(QueryMetadataException e) { - throw new ConnectorException(e); - } catch(MetaMatrixComponentException e) { - throw new ConnectorException(e); - } - } - return Collections.EMPTY_LIST; - } - = - public MetadataID getParentID() throws ConnectorException { - if(type =3D=3D Type.TYPE_ELEMENT && actualMetadataID !=3D null) { - try { - MetadataIDImpl id =3D new MetadataIDImpl(metadata.getMetad= ata().getGroupIDForElementID(actualMetadataID), metadata); - id.setType(Type.TYPE_GROUP); - return id; - } catch(QueryMetadataException e) { - throw new ConnectorException(e); - } catch(MetaMatrixComponentException e) { - throw new ConnectorException(e); - } = - = - } - return null; - } = - = - public boolean equals(Object obj){ - if (this =3D=3D obj) { - return true; - } - - if (this.getClass().isInstance(obj)) { - MetadataIDImpl that =3D (MetadataIDImpl)obj; - return this.actualMetadataID.equals(that.actualMetadataID); - } - = - return false; = - } - = - public int hashCode(){ - return actualMetadataID.hashCode(); - } = - - void setType(Type type){ - this.type =3D type; - } - = - Object getActualMetadataID(){ - return this.actualMetadataID; - } - - public String getFullName() { - return this.fullName; - } - = - /** - * Get shortName from the metadataID. - * @return string of shortName - */ = - public String getName() { - String shortName =3D null; - String fullName =3D getFullName(); - if (fullName !=3D null && fullName.trim().length() !=3D 0) { - int index =3D fullName.lastIndexOf("."); //$NON-NLS-1$ - if(index !=3D -1){ = - shortName =3D fullName.substring(index + 1); - }else{ - shortName =3D fullName; - } - } - return shortName; - } - = - @Override - public MetadataObject getMetadataObject() throws ConnectorException { - return this.metadata.getObject(this); - } -} Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/MetadataObjectImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataObjectImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataObjectImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -29,30 +29,40 @@ import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.MetadataObject; +import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.query.metadata.QueryMetadataInterface; = /** */ public abstract class MetadataObjectImpl implements MetadataObject { - private MetadataIDImpl metadataID; + private Object actualID; + private RuntimeMetadataImpl factory; + private String fullName; = - MetadataObjectImpl(MetadataIDImpl metadataID){ - this.metadataID =3D metadataID; + MetadataObjectImpl(Object actualID, RuntimeMetadataImpl factory){ + this.actualID =3D actualID; + this.factory =3D factory; + try { + this.fullName =3D getMetadata().getFullName(actualID); + } catch (QueryMetadataException e) { + throw new MetaMatrixRuntimeException(e); + } catch (MetaMatrixComponentException e) { + throw new MetaMatrixRuntimeException(e); + } } = - public MetadataID getMetadataID() { - return metadataID; - } - = Object getActualID() { - return metadataID.getActualMetadataID(); + return actualID; } = QueryMetadataInterface getMetadata() { - return metadataID.getMetadata().getMetadata(); + return factory.getMetadata(); } + = + RuntimeMetadataImpl getFactory() { + return factory; + } = public String getNameInSource() throws ConnectorException { try { @@ -81,14 +91,25 @@ = if (this.getClass().isInstance(obj)) { MetadataObjectImpl that =3D (MetadataObjectImpl)obj; - return this.metadataID.equals(that.metadataID); + return this.actualID.equals(that.actualID); } = return false; = } = public int hashCode(){ - return metadataID.hashCode(); + return actualID.hashCode(); } = + = + @Override + public String getName() { + int index =3D fullName.lastIndexOf("."); //$NON-NLS-1$ + return fullName.substring(index + 1); + } + = + @Override + public String getFullName() { + return fullName; + } = } Deleted: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/met= adata/ParameterIDImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ParameterIDImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ParameterIDImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -1,82 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.dqp.internal.datamgr.metadata; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.MetadataID; - -/** - */ -public class ParameterIDImpl extends MetadataIDImpl { - - private ProcedureIDImpl procID; - private List resultSetColumns; - - public ParameterIDImpl(Object actualMetadataID, ProcedureIDImpl proced= ureID, RuntimeMetadataImpl metadata) - throws MetaMatrixComponentException { - super(actualMetadataID, metadata); - = - this.procID =3D procedureID; - } - - public ParameterIDImpl(Object actualMetadataID, ProcedureIDImpl proced= ureID, RuntimeMetadataImpl metadata, List resultSetColumns) - throws MetaMatrixComponentException { - super(actualMetadataID, metadata); - = - this.procID =3D procedureID; - this.resultSetColumns =3D resultSetColumns; - } - - public MetadataID getParentID() { - return procID; - } - = - public boolean isResultSet() { - return (this.resultSetColumns !=3D null); - } - = - public List getChildIDs() throws ConnectorException { - if(resultSetColumns !=3D null && resultSetColumns.size() > 0) { - try { - List childIDs =3D new ArrayList(resultSetColumns.size()); - Iterator iter =3D resultSetColumns.iterator(); - while(iter.hasNext()){ - Object colID =3D iter.next(); - MetadataIDImpl id =3D new MetadataIDImpl(colID, getMet= adata()); - id.setType(Type.TYPE_ELEMENT); - childIDs.add(id); - } - return childIDs; - } catch(MetaMatrixComponentException e) { - throw new ConnectorException(e); - } - } - return Collections.EMPTY_LIST; - } -} Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/ParameterImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ParameterImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ParameterImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,6 +22,8 @@ = package com.metamatrix.dqp.internal.datamgr.metadata; = +import java.util.ArrayList; +import java.util.Collections; import java.util.List; = import com.metamatrix.api.exception.MetaMatrixComponentException; @@ -29,9 +31,9 @@ import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.metadata.runtime.Parameter; +import com.metamatrix.connector.metadata.runtime.Procedure; import com.metamatrix.dqp.DQPPlugin; import com.metamatrix.dqp.message.ParameterInfo; -import com.metamatrix.query.metadata.StoredProcedureInfo; import com.metamatrix.query.metadata.SupportConstants; import com.metamatrix.query.sql.lang.SPParameter; = @@ -40,27 +42,18 @@ public class ParameterImpl extends TypeModelImpl implements Parameter { = private SPParameter param; + private Procedure parent; = /** * @param metadataID */ - ParameterImpl(MetadataIDImpl metadataID) { - super(metadataID); + ParameterImpl(RuntimeMetadataImpl factory, SPParameter param, Procedur= e parent) { + super(param.getMetadataID(), factory); + this.parent =3D parent; + this.param =3D param; } = private SPParameter getParameterInfo() throws ConnectorException { - if(param =3D=3D null) { - ParameterIDImpl paramID =3D (ParameterIDImpl) getMetadataID(); - StoredProcedureInfo procInfo =3D ((ProcedureIDImpl)paramID.get= ParentID()).getProcedureInfo(); = - List params =3D procInfo.getParameters(); - for(int i=3D0; i getChildren() throws ConnectorException { + if (param.getParameterType() =3D=3D SPParameter.RESULT_SET) { + List result =3D new ArrayList(param.getResultSetID= s().size()); + for (Object elementId : param.getResultSetIDs()) { + result.add(new ElementImpl(elementId, getFactory())); + } + return result; + } + return Collections.emptyList(); + } = + @Override + public Procedure getParent() throws ConnectorException { + return parent; + } = } Deleted: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/met= adata/ProcedureIDImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ProcedureIDImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ProcedureIDImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -1,84 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.dqp.internal.datamgr.metadata; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.dqp.message.ParameterInfo; -import com.metamatrix.query.metadata.StoredProcedureInfo; -import com.metamatrix.query.sql.lang.SPParameter; - -/** - */ -public class ProcedureIDImpl extends MetadataIDImpl { - - private StoredProcedureInfo procInfo; - private MetadataFactory factory; - - /** - * @param actualMetadataID - * @param metadata - * @throws MetaMatrixComponentException - */ - public ProcedureIDImpl(Object actualMetadataID, StoredProcedureInfo pr= ocInfo, MetadataFactory factory) - throws MetaMatrixComponentException { - = - super(actualMetadataID, factory.getRuntimeMetadata()); - this.procInfo =3D procInfo; - this.factory =3D factory; = - } - - StoredProcedureInfo getProcedureInfo() { - return this.procInfo; - } - - /* = - * @see com.metamatrix.data.metadata.runtime.MetadataID#getChildIDs() - */ - public List getChildIDs() throws ConnectorException { - try { - List parameters =3D procInfo.getParameters(); = - List childIDs =3D new ArrayList(parameters.size()); - Iterator iter =3D parameters.iterator(); - while(iter.hasNext()){ - SPParameter param =3D (SPParameter) iter.next(); - if(param.getParameterType() =3D=3D ParameterInfo.RESULT_SE= T) { - childIDs.add(factory.createResultSetID(this, param.get= MetadataID(), param.getResultSetIDs())); = - } else { - childIDs.add(factory.createParameterID(this, param.get= MetadataID())); - } - } - return childIDs; - } catch(QueryMetadataException e) { - throw new ConnectorException(e); - } catch(MetaMatrixComponentException e) { - throw new ConnectorException(e); - } = - } - -} Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/ProcedureImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ProcedureImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ProcedureImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -24,15 +24,32 @@ */ package com.metamatrix.dqp.internal.datamgr.metadata; = +import java.util.ArrayList; +import java.util.List; + +import com.metamatrix.connector.metadata.runtime.Parameter; import com.metamatrix.connector.metadata.runtime.Procedure; +import com.metamatrix.query.metadata.StoredProcedureInfo; +import com.metamatrix.query.sql.lang.SPParameter; = /** */ public class ProcedureImpl extends MetadataObjectImpl implements Procedure= { + = + private StoredProcedureInfo procInfo; = - ProcedureImpl(MetadataIDImpl metadataID){ - super(metadataID); + ProcedureImpl(RuntimeMetadataImpl factory, StoredProcedureInfo procInf= o){ + super(procInfo.getProcedureID(), factory); + this.procInfo =3D procInfo; } = + @Override + public List getChildren() { + List result =3D new ArrayList(procInfo.getParam= eters().size()); + for (SPParameter param : procInfo.getParameters()) { + result.add(new ParameterImpl(getFactory(), param, this)); + } + return result; + } = } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/RuntimeMetadataImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /RuntimeMetadataImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /RuntimeMetadataImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -28,31 +28,79 @@ import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.runtime.*; +import com.metamatrix.core.util.ArgCheck; import com.metamatrix.query.metadata.QueryMetadataInterface; +import com.metamatrix.query.metadata.StoredProcedureInfo; +import com.metamatrix.query.sql.lang.SPParameter; = /** */ public class RuntimeMetadataImpl implements RuntimeMetadata { - private MetadataFactory factory; + private QueryMetadataInterface metadata; = - public RuntimeMetadataImpl(MetadataFactory factory){ - this.factory =3D factory; + public RuntimeMetadataImpl(QueryMetadataInterface metadata){ + ArgCheck.isNotNull(metadata); + this.metadata =3D metadata; } = - public MetadataObject getObject(MetadataID id) throws ConnectorExcepti= on { + @Override + public Element getElement(String fullName) throws ConnectorException { + try { + Object elementId =3D metadata.getElementID(fullName); + return new ElementImpl(elementId, this); + } catch (QueryMetadataException e) { + throw new ConnectorException(e); + } catch (MetaMatrixComponentException e) { + throw new ConnectorException(e); + } + } + = + public ElementImpl getElement(Object elementId) { + return new ElementImpl(elementId, this); + } + = + @Override + public Group getGroup(String fullName) throws ConnectorException { + try { + Object groupId =3D metadata.getGroupID(fullName); + return getGroup(groupId); + } catch (QueryMetadataException e) { + throw new ConnectorException(e); + } catch (MetaMatrixComponentException e) { + throw new ConnectorException(e); + } + } = - try { - return factory.createMetadataObject(id); - } catch (QueryMetadataException e) { - throw new ConnectorException(e); - } catch (MetaMatrixComponentException e) { - throw new ConnectorException(e); - } + public GroupImpl getGroup(Object groupId) throws QueryMetadataException, = MetaMatrixComponentException { + if (!metadata.isVirtualGroup(groupId)) { + return new GroupImpl(groupId, this); + } + return null; + } = + = + @Override + public Procedure getProcedure(String fullName) throws ConnectorExcepti= on { + try { + StoredProcedureInfo sp =3D metadata.getStoredProcedureInfoForProcedure(= fullName); + return getProcedure(sp); + } catch (QueryMetadataException e) { + throw new ConnectorException(e); + } catch (MetaMatrixComponentException e) { + throw new ConnectorException(e); + } } = + public Procedure getProcedure(StoredProcedureInfo sp) { + return new ProcedureImpl(this, sp); + } + = + public Parameter getParameter(SPParameter param, Procedure parent) { + return new ParameterImpl(this, param, parent); + } + = public byte[] getBinaryVDBResource(String resourcePath) throws Connect= orException { try { - return factory.getBinaryVDBResource(resourcePath); + return metadata.getBinaryVDBResource(resourcePath); } catch (QueryMetadataException e) { throw new ConnectorException(e); } catch (MetaMatrixComponentException e) { @@ -62,7 +110,7 @@ = public String getCharacterVDBResource(String resourcePath) throws Conn= ectorException { try { - return factory.getCharacterVDBResource(resourcePath); + return metadata.getCharacterVDBResource(resourcePath); } catch (QueryMetadataException e) { throw new ConnectorException(e); } catch (MetaMatrixComponentException e) { @@ -72,7 +120,7 @@ = public String[] getVDBResourcePaths() throws ConnectorException { try { - return factory.getVDBResourcePaths(); + return metadata.getVDBResourcePaths(); } catch (QueryMetadataException e) { throw new ConnectorException(e); } catch (MetaMatrixComponentException e) { @@ -81,7 +129,7 @@ } = QueryMetadataInterface getMetadata() { - return this.factory.getMetadata(); + return metadata; } = } Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/TypeModelImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /TypeModelImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /TypeModelImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -37,11 +37,10 @@ TypeModel { = /** = - * @param metadataID * @since 4.3 */ - public TypeModelImpl(MetadataIDImpl metadataID) { - super(metadataID); + public TypeModelImpl(Object actualID, RuntimeMetadataImpl factory) { + super(actualID, factory); } = public int getNullability() throws ConnectorException { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/co= nnector/ConnectionPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionPool.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionPool.java 2009-02-24 16:16:42 UTC (rev 488) @@ -42,10 +42,9 @@ import com.metamatrix.connector.DataPlugin; import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorIdentity; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.identity.ConnectorIdentity; -import com.metamatrix.connector.identity.PoolAwareConnection; -import com.metamatrix.connector.identity.SingleIdentity; +import com.metamatrix.connector.api.SingleIdentity; import com.metamatrix.connector.xa.api.TransactionContext; import com.metamatrix.connector.xa.api.XAConnector; import com.metamatrix.core.log.MessageLevel; @@ -455,7 +454,7 @@ } = //for testing purpose - final List getUsedConnections(PoolAwareConnection c= onnection) { + final List getUsedConnections(Connection connection= ) { ConnectorIdentity id =3D null; ConnectionsForId connLists =3D null; synchronized (this.lock) { @@ -471,7 +470,7 @@ } = //for testing purpose - final List getUnusedConnections(PoolAwareConnection= connection) { + final List getUnusedConnections(Connection connecti= on) { ConnectorIdentity id =3D null; ConnectionsForId connLists =3D null; synchronized (this.lock) { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/co= nnector/ConnectionWrapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionWrapper.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionWrapper.java 2009-02-24 16:16:42 UTC (rev 488) @@ -27,15 +27,14 @@ import com.metamatrix.connector.api.Connection; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorIdentity; import com.metamatrix.connector.api.Execution; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.identity.ConnectorIdentity; -import com.metamatrix.connector.identity.PoolAwareConnection; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xa.api.XAConnection; = -public class ConnectionWrapper implements PoolAwareConnection, XAConnectio= n { +public class ConnectionWrapper implements XAConnection { = private Connection connection; private long timeReturnedToPool =3D System.currentTimeMillis(); @@ -128,9 +127,7 @@ = @Override public void closeCalled() { - if (this.connection instanceof PoolAwareConnection) { - ((PoolAwareConnection)this.connection).closeCalled(); - } + this.connection.closeCalled(); } = public void setTestInterval(long testInterval) { @@ -140,9 +137,7 @@ @Override public void setConnectorIdentity(ConnectorIdentity context) throws ConnectorException { - if (this.connection instanceof PoolAwareConnection) { - ((PoolAwareConnection)this.connection).setConnectorIdentity(context); - } + this.connection.setConnectorIdentity(context); } = } Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/im= pl/FakeConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fak= eConnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fak= eConnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -30,7 +30,6 @@ import junit.framework.Assert; = import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; @@ -40,6 +39,7 @@ import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.api.UpdateExecution; import com.metamatrix.connector.basic.BasicConnection; +import com.metamatrix.connector.basic.BasicConnector; import com.metamatrix.connector.basic.BasicConnectorCapabilities; import com.metamatrix.connector.basic.BasicExecution; import com.metamatrix.connector.language.ICommand; @@ -49,7 +49,7 @@ import com.metamatrix.connector.xa.api.XAConnection; import com.metamatrix.connector.xa.api.XAConnector; = -public class FakeConnector implements Connector, XAConnector { +public class FakeConnector extends BasicConnector implements XAConnector { private static final int RESULT_SIZE =3D 5; = private boolean executeBlocks; @@ -73,10 +73,10 @@ @Override public XAConnection getXAConnection(ExecutionContext executionContext, TransactionContext transactionContext) throws ConnectorException { - return new FakeXAConnection(); + return new FakeConnection(); } = - private class FakeConnection extends BasicConnection { + private class FakeConnection extends BasicConnection implements XAConn= ection { public boolean released =3D false; public Execution createExecution(ICommand command, ExecutionContex= t executionContext, RuntimeMetadata metadata) throws ConnectorException { return new FakeBlockingExecution(executionContext); @@ -88,15 +88,6 @@ Assert.assertFalse("The connection should not be released more= than once", released); //$NON-NLS-1$ released =3D true; } - } - = - private final class FakeXAConnection extends FakeConnection implements= XAConnection { - public boolean released =3D false; - - public void close() { - Assert.assertFalse("The connection should not be released more= than once", released); //$NON-NLS-1$ - released =3D true; - } @Override public XAResource getXAResource() throws ConnectorException { return null; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestElementImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestElementImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestElementImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -27,8 +27,7 @@ import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.metadata.runtime.MetadataID; -import com.metamatrix.connector.metadata.runtime.MetadataID.Type; +import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.dqp.internal.datamgr.metadata.TestMetadataFactory; import com.metamatrix.query.sql.symbol.ElementSymbol; import com.metamatrix.query.unittest.FakeMetadataObject; @@ -96,7 +95,7 @@ public void testGetMetadataID() throws Exception { FakeMetadataObject group =3D TestMetadataFactory.createGroup("pm1.= g1", null); //$NON-NLS-1$ FakeMetadataObject metadataID =3D TestMetadataFactory.createElemen= t("e", group, DataTypeManager.DefaultDataTypes.STRING, 0); //$NON-NLS-1$ - assertNotNull(example("pm1.g1", "e", metadataID).getMetadataID());= //$NON-NLS-1$ //$NON-NLS-2$ + assertNotNull(example("pm1.g1", "e", metadataID).getMetadataObject= ()); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testGetType() throws Exception { @@ -107,10 +106,10 @@ public void testSetMetadataID() throws Exception { Object metadataID =3D TstLanguageBridgeFactory.metadata.getElement= ID("pm1.g1.e1"); //$NON-NLS-1$ ElementImpl element =3D example("pm1.g1", "e1", metadataID); //$NO= N-NLS-1$ //$NON-NLS-2$ - MetadataID connID =3D TstLanguageBridgeFactory.metadataFactory.cre= ateMetadataID(metadataID, Type.TYPE_ELEMENT); - element.setMetadataID(connID); - assertNotNull(element.getMetadataID()); - assertEquals(connID, element.getMetadataID()); + Element elem =3D TstLanguageBridgeFactory.metadataFactory.getEleme= nt(metadataID); + element.setMetadataObject(elem); + assertNotNull(element.getMetadataObject()); + assertEquals(elem, element.getMetadataObject()); } = public void helpTestEquals(IElement e1, IElement e2, boolean equal) { Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestFunctionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestFunctionImpl.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestFunctionImpl.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,6 +22,8 @@ = package com.metamatrix.dqp.internal.datamgr.language; = +import java.util.List; + import com.metamatrix.connector.language.IExpression; import com.metamatrix.query.sql.symbol.Constant; import com.metamatrix.query.sql.symbol.Expression; @@ -56,11 +58,11 @@ } = public void testGetParameters() throws Exception { - IExpression[] params =3D example("testFunction").getParameters(); = //$NON-NLS-1$ + List params =3D example("testFunction").getParameters= (); //$NON-NLS-1$ assertNotNull(params); - assertEquals(2, params.length); - for (int i =3D 0; i < params.length; i++) { - assertNotNull(params[i]); + assertEquals(2, params.size()); + for (int i =3D 0; i < params.size(); i++) { + assertNotNull(params.get(i)); } } = Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TstLanguageBridgeFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TstLanguageBridgeFactory.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TstLanguageBridgeFactory.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,14 +22,14 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; +import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.query.unittest.FakeMetadataFacade; import com.metamatrix.query.unittest.FakeMetadataFactory; = public class TstLanguageBridgeFactory { = public static final FakeMetadataFacade metadata =3D FakeMetadataFactor= y.example1(); - public static final MetadataFactory metadataFactory =3D new MetadataFa= ctory(metadata); + public static final RuntimeMetadataImpl metadataFactory =3D new Runtim= eMetadataImpl(metadata); public static final LanguageBridgeFactory factory =3D new LanguageBrid= geFactory(metadata); = } Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/me= tadata/TestMetadataFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/metadata= /TestMetadataFactory.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/metadata= /TestMetadataFactory.java 2009-02-24 16:16:42 UTC (rev 488) @@ -30,14 +30,12 @@ import junit.framework.TestCase; = import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.metadata.runtime.MetadataID.Type; import com.metamatrix.query.unittest.FakeMetadataFacade; import com.metamatrix.query.unittest.FakeMetadataObject; import com.metamatrix.query.unittest.FakeMetadataStore; = public class TestMetadataFactory extends TestCase { - private MetadataFactory metadataFactory; + private RuntimeMetadataImpl metadataFactory; private FakeMetadataObject pm1g1; private FakeMetadataObject pm1g1e1; = @@ -54,7 +52,7 @@ pm1g1e1 =3D (FakeMetadataObject)pm1g1e.get(0); store.addObject(pm1g1); store.addObjects(pm1g1e); - metadataFactory =3D new MetadataFactory(new FakeMetadataFacade(sto= re)); + metadataFactory =3D new RuntimeMetadataImpl(new FakeMetadataFacade= (store)); } = = @@ -105,88 +103,50 @@ = //tests = - public void testCreateMetadataID(){ = - try{ = - //test create MetadataID for Group - MetadataIDImpl gID =3D (MetadataIDImpl)metadataFactory.createM= etadataID(pm1g1, Type.TYPE_GROUP); - assertEquals(gID.getActualMetadataID(), pm1g1); - assertEquals(((MetadataIDImpl)gID.getChildIDs().get(0)).getAct= ualMetadataID(), pm1g1e1); - = - //test create MetadataID for Element - MetadataIDImpl eID =3D (MetadataIDImpl)metadataFactory.createM= etadataID(pm1g1e1, Type.TYPE_ELEMENT); - assertEquals(eID.getActualMetadataID(), pm1g1e1); - assertEquals(((MetadataIDImpl)eID.getParentID()).getActualMeta= dataID(), pm1g1); - }catch(Exception e){ - e.printStackTrace(); - fail(e.getMessage()); - } + public void testCreateMetadataID() throws Exception { = + //test create MetadataID for Group + GroupImpl gID =3D metadataFactory.getGroup(pm1g1); + assertEquals(gID.getActualID(), pm1g1); + assertEquals(((ElementImpl)gID.getChildren().get(0)).getActualID()= , pm1g1e1); + = + //test create MetadataID for Element + ElementImpl eID =3D metadataFactory.getElement(pm1g1e1); + assertEquals(eID.getActualID(), pm1g1e1); + assertEquals(((GroupImpl)eID.getParent()).getActualID(), pm1g1); } = - public void testRuntimeMetadata(){ - try{ - RuntimeMetadata runtimeMetadata =3D metadataFactory.getRuntime= Metadata(); - MetadataIDImpl gID =3D (MetadataIDImpl)metadataFactory.createM= etadataID(pm1g1, Type.TYPE_GROUP); - GroupImpl group =3D (GroupImpl)runtimeMetadata.getObject(gID); - assertEquals(group.getNameInSource(), "g1"); //$NON-NLS-1$ - assertEquals(((MetadataIDImpl)group.getMetadataID()).getActual= MetadataID(), pm1g1); + public void testRuntimeMetadata() throws Exception { + GroupImpl group =3D metadataFactory.getGroup(pm1g1); + assertEquals(group.getNameInSource(), "g1"); //$NON-NLS-1$ + assertEquals(group.getActualID(), pm1g1); = - MetadataIDImpl eID =3D (MetadataIDImpl)metadataFactory.createM= etadataID(pm1g1e1, Type.TYPE_ELEMENT); - ElementImpl element =3D (ElementImpl)runtimeMetadata.getObject= (eID); - assertEquals(element.getLength(), 100); - assertEquals(element.getJavaType(), DataTypeManager.DefaultDat= aClasses.STRING); - assertEquals(element.getNameInSource(), "e1"); //$NON-NLS-1$ - assertEquals(((MetadataIDImpl)element.getMetadataID()).getActu= alMetadataID(), pm1g1e1); - }catch(Exception e){ - e.printStackTrace(); - fail(e.getMessage()); - } + ElementImpl element =3D metadataFactory.getElement(pm1g1e1); + assertEquals(element.getLength(), 100); + assertEquals(element.getJavaType(), DataTypeManager.DefaultDataCla= sses.STRING); + assertEquals(element.getNameInSource(), "e1"); //$NON-NLS-1$ + assertEquals(element.getActualID(), pm1g1e1); } = - public void testGetVDBResourcePaths() { + public void testGetVDBResourcePaths() throws Exception { String[] expectedPaths =3D new String[] {"my/resource/path"}; //$N= ON-NLS-1$ - try { - RuntimeMetadata runtimeMetadata =3D metadataFactory.getRuntime= Metadata(); - String[] mfPaths =3D metadataFactory.getVDBResourcePaths(); - String[] rtmdPaths =3D runtimeMetadata.getVDBResourcePaths(); - assertEquals(expectedPaths.length, mfPaths.length); - assertEquals(expectedPaths.length, rtmdPaths.length); - for (int i =3D 0; i < expectedPaths.length; i++) { - assertEquals(expectedPaths[i], mfPaths[i]); - assertEquals(expectedPaths[i], rtmdPaths[i]); - } - } catch (Exception e) { - e.printStackTrace(); - fail(e.getMessage()); + String[] mfPaths =3D metadataFactory.getVDBResourcePaths(); + assertEquals(expectedPaths.length, mfPaths.length); + for (int i =3D 0; i < expectedPaths.length; i++) { + assertEquals(expectedPaths[i], mfPaths[i]); } } = - public void testGetBinaryVDBResource() { - try { - RuntimeMetadata runtimeMetadata =3D metadataFactory.getRuntime= Metadata(); - byte[] expectedBytes =3D "ResourceContents".getBytes(); //$NON= -NLS-1$ - byte[] mfBytes =3D metadataFactory.getBinaryVDBResource(null); - byte[] rtmdBytes =3D runtimeMetadata.getBinaryVDBResource(null= ); - assertEquals(expectedBytes.length, mfBytes.length); - assertEquals(expectedBytes.length, rtmdBytes.length); - for (int i =3D 0; i < expectedBytes.length; i++) { - assertEquals("Byte at index " + i + " differs from expecte= d content", expectedBytes[i], mfBytes[i]); //$NON-NLS-1$ //$NON-NLS-2$ - assertEquals("Byte at index " + i + " differs from expecte= d content", expectedBytes[i], rtmdBytes[i]); //$NON-NLS-1$ //$NON-NLS-2$ - } - } catch (Exception e) { - e.printStackTrace(); - fail(e.getMessage()); + public void testGetBinaryVDBResource() throws Exception { + byte[] expectedBytes =3D "ResourceContents".getBytes(); //$NON-NLS= -1$ + byte[] mfBytes =3D metadataFactory.getBinaryVDBResource(null); + assertEquals(expectedBytes.length, mfBytes.length); + for (int i =3D 0; i < expectedBytes.length; i++) { + assertEquals("Byte at index " + i + " differs from expected co= ntent", expectedBytes[i], mfBytes[i]); //$NON-NLS-1$ //$NON-NLS-2$ } } = - public void testGetCharacterVDBResource() { - try { - RuntimeMetadata runtimeMetadata =3D metadataFactory.getRuntime= Metadata(); - assertEquals("ResourceContents", metadataFactory.getCharacterV= DBResource(null)); //$NON-NLS-1$ - assertEquals("ResourceContents", runtimeMetadata.getCharacterV= DBResource(null)); //$NON-NLS-1$ - } catch (Exception e) { - e.printStackTrace(); - fail(e.getMessage()); - } + public void testGetCharacterVDBResource() throws Exception { + assertEquals("ResourceContents", metadataFactory.getCharacterVDBRe= source(null)); //$NON-NLS-1$ } = } Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/FakeSourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeSourceConnectionFactory.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeSourceConnectionFactory.java 2009-02-24 16:16:42 UTC (rev 488) @@ -25,19 +25,19 @@ package com.metamatrix.dqp.internal.pooling.connector; = import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.Execution; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.basic.BasicConnection; +import com.metamatrix.connector.basic.BasicConnector; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** */ -public class FakeSourceConnectionFactory implements Connector { +public class FakeSourceConnectionFactory extends BasicConnector { static int connCnt; = static boolean alive =3D true; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/FakeUserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeUserIdentityConnectionFactory.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeUserIdentityConnectionFactory.java 2009-02-24 16:16:42 UTC (rev 488) @@ -25,14 +25,13 @@ package com.metamatrix.dqp.internal.pooling.connector; = import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorIdentity; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.identity.ConnectorIdentity; -import com.metamatrix.connector.identity.ConnectorIdentityFactory; -import com.metamatrix.connector.identity.UserIdentity; +import com.metamatrix.connector.api.MappedUserIdentity; = /** */ -public class FakeUserIdentityConnectionFactory extends FakeSourceConnectio= nFactory implements ConnectorIdentityFactory { +public class FakeUserIdentityConnectionFactory extends FakeSourceConnectio= nFactory { = /* = * @see com.metamatrix.data.pool.SourceConnectionFactory#createIdentit= y(com.metamatrix.data.SecurityContext) @@ -42,7 +41,7 @@ return null; } //use user name for now - return new UserIdentity(context.getUser(), null, null); + return new MappedUserIdentity(context.getUser(), null, null); } = } Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/TestConnectionPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionPool.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionPool.java 2009-02-24 16:16:42 UTC (rev 488) @@ -29,7 +29,7 @@ import junit.framework.TestCase; = import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.identity.UserIdentity; +import com.metamatrix.connector.api.MappedUserIdentity; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorWrapper; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; = @@ -69,7 +69,7 @@ public static ExecutionContext createContext(final String user, boolea= n userIdentity) { ExecutionContextImpl context =3D new ExecutionContextImpl(null, null,= user, null, null, null, null, null, null, null, false); if (userIdentity) { - context.setConnectorIdentity(new UserIdentity(context.getUser(), nul= l, null)); + context.setConnectorIdentity(new MappedUserIdentity(context.getUser(= ), null, null)); } return context; } Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/TestConnectionWrapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionWrapper.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionWrapper.java 2009-02-24 16:16:42 UTC (rev 488) @@ -26,13 +26,12 @@ = import org.mockito.Mockito; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.identity.PoolAwareConnection; +import com.metamatrix.connector.basic.BasicConnection; = public class TestConnectionWrapper extends TestCase { = public void testIdleTime() throws Exception { - ConnectionWrapper wrapper =3D new ConnectionWrapper(Mockito.mock(Connect= ion.class), Mockito.mock(ConnectionPool.class), 1); + ConnectionWrapper wrapper =3D new ConnectionWrapper(Mockito.mock(BasicCo= nnection.class), Mockito.mock(ConnectionPool.class), 1); long time =3D wrapper.getTimeReturnedToPool(); Thread.sleep(5); wrapper.close(); @@ -40,7 +39,7 @@ } = public void testIsAliveTestInterval() throws Exception { - PoolAwareConnection connection =3D Mockito.mock(PoolAwareConnection.clas= s); + BasicConnection connection =3D Mockito.mock(BasicConnection.class); Mockito.stub(connection.isAlive()).toReturn(Boolean.TRUE); ConnectionWrapper wrapper =3D new ConnectionWrapper(connection, Mockito.= mock(ConnectionPool.class), 1); wrapper.setTestInterval(-1); //trigger an actual call. Copied: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/conn= ector/TestPerUserPool.java (from rev 486, trunk/connectors/connector-jdbc/s= rc/test/java/com/metamatrix/connector/jdbc/userpool/TestPerUserPool.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestPerUserPool.java (rev 0) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestPerUserPool.java 2009-02-24 16:16:42 UTC (rev 488) @@ -0,0 +1,141 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.dqp.internal.pooling.connector; + +import java.io.Serializable; +import java.util.Properties; + +import junit.framework.TestCase; + +import org.mockito.Mockito; + +import com.metamatrix.common.application.ApplicationEnvironment; +import com.metamatrix.connector.api.Connection; +import com.metamatrix.connector.api.Connector; +import com.metamatrix.connector.api.ConnectorCapabilities; +import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorLogger; +import com.metamatrix.connector.api.CredentialMap; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.MappedUserIdentity; +import com.metamatrix.connector.basic.BasicConnector; +import com.metamatrix.connector.internal.ConnectorPropertyNames; +import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; +import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; + +/** + */ +public class TestPerUserPool extends TestCase { + = + public TestPerUserPool(String name) { + super(name); + } + = + private Connector getTestConnector(ConnectorEnvironment env) throws Co= nnectorException { + BasicConnector con =3D new BasicConnector() { + + @Override + public ConnectorCapabilities getCapabilities() { + return null; + } + + @Override + public Connection getConnection(ExecutionContext context) + throws ConnectorException { + assertTrue(context.getConnectorIdentity() instanceof MappedUserIdentit= y); + return null; + } + + @Override + public void start(ConnectorEnvironment environment) + throws ConnectorException { + = + } + + @Override + public void stop() { + = + } + = + }; + con.setUseCredentialMap(true); + con.setAdminConnectionsAllowed(false); + con.setConnectorName("oracle system"); + con.start(env); + return con; + } + = + public void testWrongCredentials() throws Exception { + ConnectorEnvironment env =3D initConnectorEnvironment(); + Connector factory =3D getTestConnector(env); + try { + ExecutionContext ctx =3D createSecurityContext("pw1", false, f= actory); //$NON-NLS-1$ + factory.getConnection(ctx); + fail("expected failure"); //$NON-NLS-1$ + } catch (ConnectorException e) { + assertEquals("Unable to extract credentials from command payload or tru= sted session payload for per-user connection.", e.getMessage()); //$NON-NLS= -1$ + } + } + = + private ConnectorEnvironment initConnectorEnvironment() throws Excepti= on { + final Properties connProps =3D new Properties(); + connProps.put(ConnectorPropertyNames.CONNECTOR_BINDING_NAME, "orac= le system"); //$NON-NLS-1$ + return new ConnectorEnvironmentImpl(connProps, Mockito.mock(Connec= torLogger.class), new ApplicationEnvironment()); + } + = + private ExecutionContext createSecurityContext(String credentialsStr, = boolean useMap, Connector factory) throws Exception { + Serializable credentials =3D credentialsStr; + if (useMap) { + credentials =3D CredentialMap.parseCredentials(credentialsStr); + } + = + // session payload + ExecutionContextImpl impl =3D new ExecutionContextImpl(null, null,= null, credentials, null, null, null, null, null, null, false); + impl.setConnectorIdentity(factory.createIdentity(impl)); + return impl; + } + = + public void testCredentialMapInSessionPayload() throws Exception { + ConnectorEnvironment env =3D initConnectorEnvironment(); + Connector factory =3D getTestConnector(env); + ExecutionContext ctx =3D createSecurityContext("(system=3Doracle s= ystem,user=3Dbqt2,password=3Dmm)", true, factory); //$NON-NLS-1$ + factory.getConnection(ctx); + } + = + public void testCredentialMapMissingSystem() throws Exception { + ConnectorEnvironment env =3D initConnectorEnvironment(); + Connector factory =3D getTestConnector(env); + + // Set system to "x" instead of "oracle system" which will cause n= o credentials to be found + try { + ExecutionContext ctx =3D createSecurityContext("(system=3Dx,us= er=3Dbqt2,password=3Dmm)", true, factory); //$NON-NLS-1$ + factory.getConnection(ctx); + fail("Expected exception when creating connection with missing= system credentials"); //$NON-NLS-1$ + } catch(Exception e) { + // expected + assertEquals("Payload missing credentials for oracle system", = e.getMessage()); //$NON-NLS-1$ + } + } + +} Property changes on: trunk/engine/src/test/java/com/metamatrix/dqp/internal= /pooling/connector/TestPerUserPool.java ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMet= adataInterfaceBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataI= nterfaceBuilder.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataI= nterfaceBuilder.java 2009-02-24 16:16:42 UTC (rev 488) @@ -31,7 +31,6 @@ import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.MetaMatrixRuntimeException; -import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.dqp.message.ParameterInfo; import com.metamatrix.query.metadata.QueryMetadataInterface; @@ -172,7 +171,7 @@ } = public RuntimeMetadata getRuntimeMetadata(){ - return new RuntimeMetadataImpl(new MetadataFactory(getQueryMetadat= a())); + return new RuntimeMetadataImpl(getQueryMetadata()); } = private FakeMetadataObject createPhysicalModel(String name) { Modified: trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestT= ranslationUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTransla= tionUtility.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTransla= tionUtility.java 2009-02-24 16:16:42 UTC (rev 488) @@ -27,7 +27,6 @@ import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IGroup; import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.util.UnitTestUtil; @@ -87,11 +86,10 @@ // Translate command to get some ids IQuery query =3D (IQuery) util.parseCommand("select * from partssu= pplier.parts"); //$NON-NLS-1$ IGroup group =3D (IGroup) query.getFrom().getItems().get(0); - MetadataID mid =3D group.getMetadataID(); + MetadataObject mid =3D group.getMetadataObject(); assertEquals("PartsSupplier.PARTSSUPPLIER.PARTS", mid.getFullName(= )); //$NON-NLS-1$ = // Use RMD to get stuff - MetadataObject groupObj =3D rmd.getObject(mid); - assertEquals("PARTS", groupObj.getNameInSource()); //$NON-NLS-1$ + assertEquals("PARTS", mid.getNameInSource()); //$NON-NLS-1$ } } Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/extension/TestSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-24 16:16:42 UTC (rev 488) @@ -113,7 +113,7 @@ throw new RuntimeException(e); } = } - public static final RuntimeMetadata metadata =3D TstLanguageBridgeFact= ory.metadataFactory.getRuntimeMetadata(); + public static final RuntimeMetadata metadata =3D TstLanguageBridgeFact= ory.metadataFactory; = private String getStringWithContext(ILanguageObject obj) throws Connec= torException { Properties props =3D new Properties(); = Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/oracle/TestOracleSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/orac= le/TestOracleSQLConversionVisitor.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/orac= le/TestOracleSQLConversionVisitor.java 2009-02-24 16:16:42 UTC (rev 488) @@ -43,7 +43,6 @@ import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl; -import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.unittest.FakeMetadataFacade; @@ -106,7 +105,7 @@ // Convert from sql to objects CommandBuilder commandBuilder =3D new CommandBuilder(metadata); ICommand obj =3D commandBuilder.getCommand(input); - RuntimeMetadata runtimeMetadata =3D new RuntimeMetadataImpl(new Me= tadataFactory(metadata)); + RuntimeMetadata runtimeMetadata =3D new RuntimeMetadataImpl(metada= ta); this.helpTestVisitor(obj, runtimeMetadata, modifiers, context, dbmsTimeZ= one, expectedOutput); } = Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/MockConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/MockConnector.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/MockConnector.java 2009-02-24 16:16:42 UTC (rev 488) @@ -7,7 +7,6 @@ import org.mockito.Mockito; = import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; @@ -15,6 +14,7 @@ import com.metamatrix.connector.api.ProcedureExecution; import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.connector.basic.BasicConnection; +import com.metamatrix.connector.basic.BasicConnector; import com.metamatrix.connector.basic.BasicConnectorCapabilities; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IGroup; @@ -25,7 +25,7 @@ import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = -public class MockConnector implements Connector { +public class MockConnector extends BasicConnector { = @Override public ConnectorCapabilities getCapabilities() { @@ -47,7 +47,7 @@ Properties props =3D new Properties(); props.setProperty("customBehaviour", "SkipExecute");//$NON-NLS-1$ //$N= ON-NLS-2$ = - MetadataObject metaObject =3D metadata.getObject(procedure.getMe= tadataID()); + MetadataObject metaObject =3D procedure.getMetadataObject(); = TestCase.assertEquals("AnyModel.ProcedureB",procedure.getProcedu= reName()); //$NON-NLS-1$ TestCase.assertEquals("PROC", metaObject.getNameInSource()); //$= NON-NLS-1$ @@ -64,13 +64,13 @@ Properties groupProps =3D new Properties(); groupProps.setProperty("customName", "CustomTableA");//$NON-NLS-1$ //$= NON-NLS-2$ IGroup group =3D (IGroup)query.getProjectedQuery().getFrom().getItems(= ).get(0); = - MetadataObject groupMD =3D metadata.getObject(group.getMetadataID()); + MetadataObject groupMD =3D group.getMetadataObject(); TestCase.assertEquals(groupProps, groupMD.getProperties()); = = ISelectSymbol symbl =3D (ISelectSymbol)query.getProjectedQuery().getSe= lect().getSelectSymbols().get(0); IElement element =3D (IElement)symbl.getExpression(); - Element elementMD =3D (Element)metadata.getObject(element.getMetadataI= D()); + Element elementMD =3D element.getMetadataObject(); = Properties elementProps =3D new Properties(); elementProps.setProperty("customPosition", "11");//$NON-NLS-1$ //$NON-= NLS-2$ @@ -98,7 +98,7 @@ = ISelectSymbol symbl2 =3D (ISelectSymbol)query.getProjectedQuery().getS= elect().getSelectSymbols().get(1); IElement element2 =3D (IElement)symbl2.getExpression(); - Element elementMD2 =3D (Element)metadata.getObject(element2.getMetadat= aID()); + Element elementMD2 =3D element2.getMetadataObject(); = Properties elementProps2 =3D new Properties(); elementProps2.setProperty("customPosition", "12");//$NON-NLS-1$ //$NON= -NLS-2$ Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestElement.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestElement.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestElement.java 2009-02-24 16:16:42 UTC (rev 488) @@ -31,7 +31,6 @@ import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.core.util.UnitTestUtil; = /** @@ -59,8 +58,7 @@ IQuery query =3D (IQuery) transUtil.parseCommand("SELECT " + eleme= ntName + " FROM " + groupName); //$NON-NLS-1$ //$NON-NLS-2$ ISelectSymbol symbol =3D (ISelectSymbol) query.getSelect().getSele= ctSymbols().get(0); IElement element =3D (IElement) symbol.getExpression(); - MetadataID metadataID =3D element.getMetadataID(); - return (Element) transUtil.createRuntimeMetadata().getObject(metad= ataID); + return element.getMetadataObject(); } = public void helpTestElement(String fullGroupName, String elementShortN= ame, TranslationUtility transUtil, Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestGroup.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestGroup.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestGroup.java 2009-02-24 16:16:42 UTC (rev 488) @@ -30,7 +30,6 @@ import com.metamatrix.connector.language.IGroup; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.core.util.UnitTestUtil; = /** @@ -60,8 +59,7 @@ public Group getGroup(String groupName, TranslationUtility transUtil) = throws Exception { IQuery query =3D (IQuery) transUtil.parseCommand("SELECT 1 FROM " = + groupName); //$NON-NLS-1$ IGroup group =3D (IGroup) query.getFrom().getItems().get(0); - MetadataID metadataID =3D group.getMetadataID(); - return (Group) transUtil.createRuntimeMetadata().getObject(metadat= aID); + return group.getMetadataObject(); } = public void helpTestGroup(String fullGroupName, String nameInSource, P= roperties expectedProps, TranslationUtility transUtil) throws Exception { Deleted: trunk/test-integration/src/test/java/com/metamatrix/data/metadata/= runtime/TestMetadataID.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestMetadataID.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestMetadataID.java 2009-02-24 16:16:42 UTC (rev 488) @@ -1,188 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.data.metadata.runtime; - -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.metadata.runtime.MetadataID; -import com.metamatrix.connector.metadata.runtime.MetadataID.Type; -import com.metamatrix.core.util.UnitTestUtil; - -/** - */ -public class TestMetadataID extends TestCase { - - private static TranslationUtility CONNECTOR_METADATA_UTILITY =3D creat= eTranslationUtility(getTestVDBName()); - - /** - * Constructor for TestMetadataID. - * @param name - */ - public TestMetadataID(String name) { - super(name); - } - - private static String getTestVDBName() { - return UnitTestUtil.getTestDataPath() + "/ConnectorMetadata.vdb"; //$= NON-NLS-1$ - } - = - public static TranslationUtility createTranslationUtility(String vdbNa= me) { - return new TranslationUtility(vdbName); = - } - = - = - // ################ TEST GROUP METADATAID ###################### - = - public MetadataID getGroupID(String groupName, TranslationUtility tran= sUtil) { - IQuery query =3D (IQuery) transUtil.parseCommand("SELECT 1 FROM " = + groupName); //$NON-NLS-1$ - IGroup group =3D (IGroup) query.getFrom().getItems().get(0); - return group.getMetadataID(); - } - - public void helpTestGroupID(String fullGroupName, String shortGroupNam= e, int elementCount, TranslationUtility transUtil) throws Exception { - MetadataID groupID =3D getGroupID(fullGroupName, transUtil); = - assertEquals(fullGroupName, groupID.getFullName()); - assertEquals(shortGroupName, groupID.getName()); - assertEquals(Type.TYPE_GROUP, groupID.getType()); - assertNull(groupID.getParentID()); - = - // Check children - List children =3D groupID.getChildIDs(); - assertEquals(elementCount, children.size()); - Iterator childIter =3D children.iterator(); - while(childIter.hasNext()) { - MetadataID childID =3D (MetadataID) childIter.next(); - assertEquals(Type.TYPE_ELEMENT, childID.getType()); - assertEquals(groupID, childID.getParentID()); - assertTrue(childID.getFullName().startsWith(groupID.getFullNam= e())); = - } - } - = - public void testGroupID() throws Exception { - helpTestGroupID("ConnectorMetadata.TestTable", "TestTable", 7, CON= NECTOR_METADATA_UTILITY);//$NON-NLS-1$ //$NON-NLS-2$ = - } = - - public void testGroupID_longName() throws Exception { - helpTestGroupID("ConnectorMetadata.TestCatalog.TestSchema.TestTabl= e2", "TestTable2", 1, CONNECTOR_METADATA_UTILITY);//$NON-NLS-1$ //$NON-NLS-= 2$ = - } = - - // ################ TEST ELEMENT METADATAID ###################### - = - public MetadataID getElementID(String groupName, String elementName, T= ranslationUtility transUtil) { - IQuery query =3D (IQuery) transUtil.parseCommand("SELECT " + eleme= ntName + " FROM " + groupName); //$NON-NLS-1$ //$NON-NLS-2$ - ISelectSymbol symbol =3D (ISelectSymbol) query.getSelect().getSele= ctSymbols().get(0); - IElement element =3D (IElement) symbol.getExpression(); - return element.getMetadataID(); - } - = - public void helpTestElementID(String groupName, String elementName, Tr= anslationUtility transUtil) throws Exception { - MetadataID elementID =3D getElementID(groupName, elementName, tran= sUtil); = - assertEquals(Type.TYPE_ELEMENT, elementID.getType()); - assertEquals(groupName + "." + elementName, elementID.getFullName(= )); //$NON-NLS-1$ - assertEquals(elementName, elementID.getName()); - assertEquals(Collections.EMPTY_LIST, elementID.getChildIDs()); - assertNotNull(elementID.getParentID()); - assertEquals(groupName, elementID.getParentID().getFullName()); = = - } - = - public void testElementID() throws Exception { - helpTestElementID("ConnectorMetadata.TestTable", "TestNameInSource= ", CONNECTOR_METADATA_UTILITY);//$NON-NLS-1$ //$NON-NLS-2$ = - } = - - public void testElementID_longName() throws Exception { - helpTestElementID("ConnectorMetadata.TestCatalog.TestSchema.TestTa= ble2", "TestCol", CONNECTOR_METADATA_UTILITY);//$NON-NLS-1$ //$NON-NLS-2$ = - } = - - // ################ TEST PROCEDURE AND PARAMETER METADATAID ##########= ############ - = - public MetadataID getProcedureID(String procName, int inputParamCount,= TranslationUtility transUtil) { - StringBuffer sql =3D new StringBuffer("EXEC "); //$NON-NLS-1$ - sql.append(procName); - sql.append("("); //$NON-NLS-1$ - for(int i=3D0; i children =3D groupID.getChildren(); + assertEquals(elementCount, children.size()); + for (Element element : children) { + assertEquals(groupID, element.getParent()); + assertTrue(element.getFullName().startsWith(groupID.getFullNam= e())); = + } + } + = + public void testGroupID() throws Exception { + helpTestGroupID("ConnectorMetadata.TestTable", "TestTable", 7, CON= NECTOR_METADATA_UTILITY);//$NON-NLS-1$ //$NON-NLS-2$ = + } = + + public void testGroupID_longName() throws Exception { + helpTestGroupID("ConnectorMetadata.TestCatalog.TestSchema.TestTabl= e2", "TestTable2", 1, CONNECTOR_METADATA_UTILITY);//$NON-NLS-1$ //$NON-NLS-= 2$ = + } = + + // ################ TEST ELEMENT METADATAID ###################### + = + public Element getElementID(String groupName, String elementName, Tran= slationUtility transUtil) { + IQuery query =3D (IQuery) transUtil.parseCommand("SELECT " + eleme= ntName + " FROM " + groupName); //$NON-NLS-1$ //$NON-NLS-2$ + ISelectSymbol symbol =3D (ISelectSymbol) query.getSelect().getSele= ctSymbols().get(0); + IElement element =3D (IElement) symbol.getExpression(); + return element.getMetadataObject(); + } + = + public void helpTestElementID(String groupName, String elementName, Tr= anslationUtility transUtil) throws Exception { + Element elementID =3D getElementID(groupName, elementName, transUt= il); = + assertEquals(groupName + "." + elementName, elementID.getFullName(= )); //$NON-NLS-1$ + assertEquals(elementName, elementID.getName()); + assertNotNull(elementID.getParent()); + assertEquals(groupName, elementID.getParent().getFullName()); = = + } + = + public void testElementID() throws Exception { + helpTestElementID("ConnectorMetadata.TestTable", "TestNameInSource= ", CONNECTOR_METADATA_UTILITY);//$NON-NLS-1$ //$NON-NLS-2$ = + } = + + public void testElementID_longName() throws Exception { + helpTestElementID("ConnectorMetadata.TestCatalog.TestSchema.TestTa= ble2", "TestCol", CONNECTOR_METADATA_UTILITY);//$NON-NLS-1$ //$NON-NLS-2$ = + } = + + // ################ TEST PROCEDURE AND PARAMETER METADATAID ##########= ############ + = + public Procedure getProcedureID(String procName, int inputParamCount, = TranslationUtility transUtil) { + StringBuffer sql =3D new StringBuffer("EXEC "); //$NON-NLS-1$ + sql.append(procName); + sql.append("("); //$NON-NLS-1$ + for(int i=3D0; i children =3D procID.getChildren(); + assertEquals(paramNames.length, children.size()); + Set actualParamNames =3D new HashSet(); + for (Parameter childID : children) { + assertEquals(procID, childID.getParent()); + assertTrue(childID.getFullName().startsWith(procID.getFullName= ())); + actualParamNames.add(childID.getName()); = + } + = + // Compare actual with expected param names + Set expectedParamNames =3D new HashSet(Arrays.asList(paramNames)); + assertEquals(expectedParamNames, actualParamNames); + } + = + public void testProcedureID() throws Exception { + String[] paramNames =3D new String[] { "InParam", "OutParam", "InO= utParam", "ReturnParam" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$//$NON-NLS-4$ + helpTestProcedureID("ConnectorMetadata.TestProc1", "TestProc1", 2,= paramNames, CONNECTOR_METADATA_UTILITY); //$NON-NLS-1$ //$NON-NLS-2$ = = + } + + public void testProcedureID_resultSet() throws Exception { + String[] paramNames =3D new String[] { "Param1", "RSParam" }; = //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$ + helpTestProcedureID("ConnectorMetadata.TestProc2", "TestProc2", 1,= paramNames, CONNECTOR_METADATA_UTILITY); //$NON-NLS-1$ //$NON-NLS-2$ = = + } + + public void testProcedureID_longName() throws Exception { + helpTestProcedureID("ConnectorMetadata.TestCatalog.TestSchema.Test= Proc", "TestProc", 0, new String[0], CONNECTOR_METADATA_UTILITY); //$NON-NL= S-1$ //$NON-NLS-2$ + } + + +} Property changes on: trunk/test-integration/src/test/java/com/metamatrix/da= ta/metadata/runtime/TestMetadataObject.java ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestParams.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestParams.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestParams.java 2009-02-24 16:16:42 UTC (rev 488) @@ -32,10 +32,8 @@ import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.Parameter; import com.metamatrix.connector.metadata.runtime.TypeModel; -import com.metamatrix.connector.metadata.runtime.MetadataID.Type; import com.metamatrix.core.util.UnitTestUtil; = = @@ -88,10 +86,9 @@ int precision, int scale, TranslationUtility transUtil, String model= edType, String modeledBaseType, String modeledPrimitiveType) throws Excepti= on { - MetadataID metadataID =3D param.getMetadataID(); - Parameter p =3D (Parameter)transUtil.createRuntimeMetadata().getOb= ject(metadataID); - assertEquals(name, metadataID.getName()); - assertEquals(fullName, metadataID.getFullName()); + Parameter p =3D param.getMetadataObject(); + assertEquals(name, p.getName()); + assertEquals(fullName, p.getFullName()); assertEquals(index, param.getIndex()); assertEquals(direction, param.getDirection()); assertEquals(nameInSource, p.getNameInSource()); @@ -104,7 +101,6 @@ assertEquals(scale, p.getScale()); assertEquals(null, param.getValue()); assertEquals(false, param.getValueSpecified()); = - assertEquals(Type.TYPE_PARAMETER, metadataID.getType()); = //System.out.println("\n" + p.getModeledType() + "\n" + p.getModel= edBaseType() + "\n" + p.getModeledPrimitiveType()); = Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestProcedure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestProcedure.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestProcedure.java 2009-02-24 16:16:42 UTC (rev 488) @@ -22,8 +22,6 @@ = package com.metamatrix.data.metadata.runtime; = -import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Properties; = @@ -32,11 +30,9 @@ import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; import com.metamatrix.connector.metadata.runtime.Parameter; import com.metamatrix.connector.metadata.runtime.Procedure; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.metadata.runtime.MetadataID.Type; import com.metamatrix.core.util.UnitTestUtil; = /** @@ -71,8 +67,7 @@ } sql.append(")"); //$NON-NLS-1$ IProcedure proc =3D (IProcedure) transUtil.parseCommand(sql.toStri= ng()); //$NON-NLS-1$ - MetadataID metadataID =3D proc.getMetadataID(); - return (Procedure) transUtil.createRuntimeMetadata().getObject(met= adataID); + return proc.getMetadataObject(); } = public void testProcedure1() throws Exception { @@ -84,13 +79,9 @@ int[] index =3D new int[] { 1, 2, 3, 4 }; Class[] type =3D new Class[] { Integer.class, Long.class, Short.cl= ass, java.sql.Date.class }; = = - MetadataID procID =3D proc.getMetadataID(); - Collection paramIDs =3D procID.getChildIDs(); = - Iterator paramIter =3D paramIDs.iterator(); - for(int i=3D0; paramIter.hasNext(); i++) { - MetadataID paramID =3D (MetadataID) paramIter.next(); - Parameter param =3D (Parameter) CONNECTOR_METADATA_UTILITY.cre= ateRuntimeMetadata().getObject(paramID); - = + List params =3D proc.getChildren(); = + for (int i =3D 0; i < params.size(); i++) { + Parameter param =3D params.get(i); assertEquals(nameInSource[i], param.getNameInSource()); assertEquals(direction[i], param.getDirection()); assertEquals(index[i], param.getIndex()); @@ -109,42 +100,32 @@ int[] index =3D new int[] { 1, 2 }; Class[] type =3D new Class[] { String.class, java.sql.ResultSet.cl= ass }; = = - MetadataID procID =3D proc.getMetadataID(); - Collection paramIDs =3D procID.getChildIDs(); = - Iterator paramIter =3D paramIDs.iterator(); - MetadataID paramID =3D null; - for(int i=3D0; paramIter.hasNext(); i++) { - paramID =3D (MetadataID) paramIter.next(); - Parameter param =3D (Parameter) rmd.getObject(paramID); - = + List params =3D proc.getChildren(); = + for (int i =3D 0; i < params.size(); i++) { + Parameter param =3D params.get(i); assertEquals(nameInSource[i], param.getNameInSource()); assertEquals(direction[i], param.getDirection()); assertEquals(index[i], param.getIndex()); assertEquals(type[i], param.getJavaType()); } = - // Check last param is a result set - List rsCols =3D paramID.getChildIDs(); - + Parameter param =3D params.get(1); + List rsCols =3D param.getChildren(); // Check first column of result set assertEquals(2, rsCols.size()); - MetadataID elemID =3D (MetadataID) rsCols.get(0); + Element elemID =3D rsCols.get(0); assertEquals("RSCol1", elemID.getName()); //$NON-NLS-1$ assertEquals("ConnectorMetadata.TestProc2.RSParam.RSCol1", elemID.= getFullName()); //$NON-NLS-1$ - assertEquals(Type.TYPE_ELEMENT, elemID.getType()); = - Element e1 =3D (Element) rmd.getObject(elemID); - assertEquals("Result set column name in source", e1.getNameInSourc= e()); //$NON-NLS-1$ - assertEquals(java.sql.Timestamp.class, e1.getJavaType()); - assertEquals(0, e1.getPosition()); + assertEquals("Result set column name in source", elemID.getNameInS= ource()); //$NON-NLS-1$ + assertEquals(java.sql.Timestamp.class, elemID.getJavaType()); + assertEquals(0, elemID.getPosition()); = - MetadataID elemID2 =3D (MetadataID) rsCols.get(1); = + Element elemID2 =3D rsCols.get(1); = assertEquals("RSCol2", elemID2.getName()); //$NON-NLS-1$ assertEquals("ConnectorMetadata.TestProc2.RSParam.RSCol2", elemID2= .getFullName()); //$NON-NLS-1$ - assertEquals(Type.TYPE_ELEMENT, elemID2.getType()); = - Element e2 =3D (Element) rmd.getObject(elemID2); - assertEquals(null, e2.getNameInSource()); //$NON-NLS-1$ - assertEquals(String.class, e2.getJavaType()); - assertEquals(1, e2.getPosition()); + assertEquals(null, elemID2.getNameInSource()); //$NON-NLS-= 1$ + assertEquals(String.class, elemID2.getJavaType()); + assertEquals(1, elemID2.getPosition()); Properties props =3D new Properties(); props.put("ColProp", "defaultvalue"); //$NON-NLS-1$ //$NON-NLS-2$ = Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/= util/TestCollectorVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estCollectorVisitor.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estCollectorVisitor.java 2009-02-24 16:16:42 UTC (rev 488) @@ -70,7 +70,7 @@ GroupImpl g =3D new GroupImpl("g1", null, null); //$NON-NLS-1$ List symbols =3D new ArrayList(); = symbols.add(new ElementImpl(g, "e1", null, String.class)); //$NON-= NLS-1$ - IFunction function =3D new FunctionImpl("length", new IExpression[= ] { new ElementImpl(g, "e2", null, String.class) }, Integer.class); //$NON-= NLS-1$ //$NON-NLS-2$ + IFunction function =3D new FunctionImpl("length", Arrays.asList(ne= w ElementImpl(g, "e2", null, String.class)), Integer.class); //$NON-NLS-1$ = //$NON-NLS-2$ symbols.add(function); SelectImpl s =3D new SelectImpl(symbols, false); List groups =3D new ArrayList(); Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/= util/TestSQLStringVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estSQLStringVisitor.java 2009-02-24 14:33:28 UTC (rev 487) +++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estSQLStringVisitor.java 2009-02-24 16:16:42 UTC (rev 488) @@ -25,6 +25,8 @@ import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; +import java.util.Arrays; +import java.util.List; = import junit.framework.TestCase; = @@ -35,7 +37,6 @@ import com.metamatrix.connector.language.IGroup; import com.metamatrix.connector.language.ILanguageObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.metadata.runtime.MetadataID.Type; import com.metamatrix.connector.visitor.util.SQLStringVisitor; import com.metamatrix.dqp.internal.datamgr.language.AggregateImpl; import com.metamatrix.dqp.internal.datamgr.language.ElementImpl; @@ -70,7 +71,6 @@ import com.metamatrix.dqp.internal.datamgr.language.TestSubqueryInCriteria= Impl; import com.metamatrix.dqp.internal.datamgr.language.TestUpdateImpl; import com.metamatrix.dqp.internal.datamgr.language.TstLanguageBridgeFacto= ry; -import com.metamatrix.dqp.internal.datamgr.metadata.MetadataFactory; import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.sql.ReservedWords; @@ -83,7 +83,7 @@ = public class TestSQLStringVisitor extends TestCase { = - public static final RuntimeMetadata metadata =3D TstLanguageBridgeFact= ory.metadataFactory.getRuntimeMetadata(); + public static final RuntimeMetadata metadata =3D TstLanguageBridgeFact= ory.metadataFactory; = = /** @@ -103,8 +103,8 @@ } = /** create fake BQT metadata to test this case, name in source is impo= rtant */ - private RuntimeMetadata exampleRuntimeMetadata(QueryMetadataInterface = metadata) { = - return new RuntimeMetadataImpl(new MetadataFactory(metadata)); + private RuntimeMetadataImpl exampleRuntimeMetadata(QueryMetadataInterf= ace metadata) { = + return new RuntimeMetadataImpl(metadata); } = /** create fake BQT metadata to test this case, name in source is impo= rtant */ @@ -215,18 +215,12 @@ public void testVisitConvertFunctionOracleStyleWithNIS() throws Except= ion { = FakeMetadataFacade facade =3D new FakeMetadataFacade(exampleMetada= taStore()); - RuntimeMetadata metadata =3D exampleRuntimeMetadata(facade); - MetadataFactory metadataFactory =3D new MetadataFactory(facade); + RuntimeMetadataImpl metadata =3D exampleRuntimeMetadata(facade); = - IExpression [] params =3D null; - params =3D new IExpression[2]; - IGroup g =3D new GroupImpl("SmallA", null, metadataFactory.createM= etadataID(facade.getStore().findObject("BQT1.SmallA", FakeMetadataObject.GR= OUP), Type.TYPE_GROUP)); //$NON-NLS-1$ - IElement e =3D new ElementImpl(g, "DoubleNum", metadataFactory.cre= ateMetadataID(facade.getStore().findObject("DoubleNum", FakeMetadataObject.= ELEMENT), Type.TYPE_ELEMENT), Double.class); //$NON-NLS-1$ //$NON-NLS-2$ - params[0] =3D e; - params[1] =3D new LiteralImpl("integer", String.class); //$NON-NLS= -1$ - + IGroup g =3D new GroupImpl("SmallA", null, metadata.getGroup("BQT1= .SmallA")); //$NON-NLS-1$ + IElement e =3D new ElementImpl(g, "DoubleNum", metadata.getElement= ("DoubleNum"), Double.class); //$NON-NLS-1$ //$NON-NLS-2$ + List params =3D Arrays.asList(e, new Litera= lImpl("integer", String.class)); //$NON-NLS-1$ = - = final String expected =3D "convert(SmallishA.doublishNum, integer)= "; //$NON-NLS-1$ IFunction test =3D new FunctionImpl("convert", params, Integer.cla= ss); //$NON-NLS-1$ = @@ -236,10 +230,7 @@ public void testVisitConvertFunctionOracleStyle() throws Exception { String expected =3D "convert(columnA, integer)"; //$NON-NLS-1$ = - IExpression [] params =3D null; - params =3D new IExpression[2]; - params[0] =3D new ElementImpl(null, "columnA", null, String.class)= ; //$NON-NLS-1$ - params[1] =3D new LiteralImpl("integer", String.class); //$NON-NLS= -1$ + List params =3D Arrays.asList(new ElementIm= pl(null, "columnA", null, String.class), new LiteralImpl("integer", String.= class)); IFunction test =3D new FunctionImpl("convert", params, Integer.cla= ss); //$NON-NLS-1$ = assertEquals(expected, getString(test)); = --===============6982499572702538070==-- From teiid-commits at lists.jboss.org Tue Feb 24 11:16:49 2009 Content-Type: multipart/mixed; boundary="===============3152101361711927290==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r489 - in trunk: common-internal/src/main/java/com/metamatrix/common/log and 4 other directories. Date: Tue, 24 Feb 2009 11:16:49 -0500 Message-ID: --===============3152101361711927290== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-24 11:16:49 -0500 (Tue, 24 Feb 2009) New Revision: 489 Removed: trunk/common-internal/src/main/java/com/metamatrix/common/log/format/ trunk/common-internal/src/main/java/com/metamatrix/dqp/ trunk/common-internal/src/main/java/com/metamatrix/platform/security/mem= bership/service/ trunk/connector-api/src/main/java/com/metamatrix/connector/identity/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/extension/ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/userpool/ Log: TEIID-164 TEIID-374 refactored connector metadata, removed collection sette= rs from connector api, moved pooling and identity knowlege onto base connec= tor api --===============3152101361711927290==-- From teiid-commits at lists.jboss.org Tue Feb 24 11:41:35 2009 Content-Type: multipart/mixed; boundary="===============9077781877724593415==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r490 - in trunk: adminshell and 1 other directories. Date: Tue, 24 Feb 2009 11:41:35 -0500 Message-ID: --===============9077781877724593415== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-24 11:41:35 -0500 (Tue, 24 Feb 2009) New Revision: 490 Added: trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/Util.java Removed: trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestHelper.java Modified: trunk/adminshell/pom.xml trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestMultiFileTextSynchExecution.java trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestRowHeaderTextSynchExecution.java trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestTextSynchExecution.java trunk/pom.xml Log: TEIID-380 upgrade to junit 4.4 Modified: trunk/adminshell/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/adminshell/pom.xml 2009-02-24 16:16:49 UTC (rev 489) +++ trunk/adminshell/pom.xml 2009-02-24 16:41:35 UTC (rev 490) @@ -29,6 +29,7 @@ junit junit + 3.8.1 \ No newline at end of file Deleted: trunk/connectors/connector-text/src/test/java/com/metamatrix/conne= ctor/text/TestHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestHelper.java 2009-02-24 16:16:49 UTC (rev 489) +++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestHelper.java 2009-02-24 16:41:35 UTC (rev 490) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.text; - -import java.io.File; -import java.io.FileInputStream; -import java.util.List; -import java.util.Properties; - -import junit.framework.Assert; - -import com.metamatrix.cdk.api.ConnectorHost; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.core.util.UnitTestUtil; - -public class TestHelper { - - static void helpTestExecution(String vdb, String descriptorFile, String s= ql, int maxBatchSize, int expectedRowCount) throws Exception { - descriptorFile =3D UnitTestUtil.getTestDataPath() + File.separator + des= criptorFile; - Properties connProps =3D new Properties(); - connProps.load(new FileInputStream(descriptorFile)); - connProps.put(TextPropertyNames.DESCRIPTOR_FILE, descriptorFile); - connProps.put(TextPropertyNames.DATE_RESULT_FORMATS, "yyyy-MM-dd,hh:m= m:ss,hh:mm,dd/mm/yyyy"); //$NON-NLS-1$ - connProps.put(TextPropertyNames.DATE_RESULT_FORMATS_DELIMITER, ","); = //$NON-NLS-1$ - ConnectorHost host =3D new ConnectorHost(new TextConnector(), connPro= ps, UnitTestUtil.getTestDataPath() + File.separator + vdb, false); - List results =3D host.executeCommand(sql); - Assert.assertEquals("Total row count doesn't match expected size. ", = expectedRowCount, results.size()); //$NON-NLS-1$ - } - - public static ConnectorHost getConnectorHostWithFakeMetadata(String descr= iptorFile) throws Exception { - Properties connProps =3D new Properties(); - connProps.load(new FileInputStream(descriptorFile)); - connProps.put(TextPropertyNames.DESCRIPTOR_FILE, descriptorFile); - connProps.put(TextPropertyNames.COLUMN_CNT_MUST_MATCH_MODEL, "true"); - connProps.put(TextPropertyNames.DATE_RESULT_FORMATS, "yyyy-MM-dd,hh:m= m:ss,hh:mm,dd/mm/yyyy"); //$NON-NLS-1$ - connProps.put(TextPropertyNames.DATE_RESULT_FORMATS_DELIMITER, ","); = //$NON-NLS-1$ - ConnectorHost host =3D new ConnectorHost(new TextConnector(), connPro= ps, FakeTranslationFactory.getInstance().getTextTranslationUtility(), false= ); - return host; - } - -} Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/conn= ector/text/TestMultiFileTextSynchExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestMultiFileTextSynchExecution.java 2009-02-24 16:16:49 UTC (rev 489) +++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestMultiFileTextSynchExecution.java 2009-02-24 16:41:35 UTC (rev 490) @@ -45,7 +45,7 @@ public void testSubmitRequest() throws Exception { String sql =3D "SELECT ID FROM Library"; //$NON-NLS-1$ try { - TestHelper.getConnectorHostWithFakeMetadata(BAD_COUNT_FILE).execu= teCommand(sql); + Util.getConnectorHostWithFakeMetadata(BAD_COUNT_FILE).executeComm= and(sql); fail("Should have failed due to extra column defined in .csv f= ile");//$NON-NLS-1$ } catch (ConnectorException e) { assertEquals("Expected input file to have 3 columns based on m= odel, but found 4. This could be caused by misplaced quotes, causing multi= ple columns to be treated as one.", e.getMessage()); //$NON-NLS-1$ @@ -55,7 +55,7 @@ public void testNextBatch3() throws Exception { String sql =3D "SELECT ID FROM Library WHERE Author =3D 'Blind'"; = //$NON-NLS-1$ try { - TestHelper.getConnectorHostWithFakeMetadata(BAD_COUNT_FILE).execu= teCommand(sql); + Util.getConnectorHostWithFakeMetadata(BAD_COUNT_FILE).executeComm= and(sql); fail("Should have failed due to extra column defined in .csv f= ile");//$NON-NLS-1$ } catch (ConnectorException e) { assertEquals("Expected input file to have 3 columns based on m= odel, but found 4. This could be caused by misplaced quotes, causing multi= ple columns to be treated as one.", e.getMessage()); //$NON-NLS-1$ @@ -64,7 +64,7 @@ = public void testNextBatch2() throws Exception { String sql =3D "SELECT ID, PDate, Author FROM Library"; //$NON-NLS= -1$ - ConnectorHost host =3D TestHelper.getConnectorHostWithFakeMetadata= (DEFAULT_DESC_FILE); + ConnectorHost host =3D Util.getConnectorHostWithFakeMetadata(DEFAU= LT_DESC_FILE); int expectedRows =3D 4; List results =3D host.executeCommand(sql); assertEquals("Get batch size doesn't match expected one. ", expect= edRows, results.size()); //$NON-NLS-1$ @@ -102,7 +102,7 @@ */ public void testDefect13066() throws Exception { String sql =3D "SELECT TRADEID FROM SummitData.SUMMITDATA"; //$NON= -NLS-1$ - TestHelper.helpTestExecution("summitData/TextFileTest_1.vdb", "Sum= mitData_Descriptor.txt", sql, 500, 4139); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("summitData/TextFileTest_1.vdb", "SummitDat= a_Descriptor.txt", sql, 500, 4139); //$NON-NLS-1$ //$NON-NLS-2$ } = /** @@ -112,7 +112,7 @@ */ public void testDefect13368() throws Exception { String sql =3D "SELECT RATE, DESK FROM SummitData.SUMMITDATA"; //$= NON-NLS-1$ - TestHelper.helpTestExecution("summitData/TextFileTest_1.vdb", "Sum= mitData_Descriptor.txt", sql, 5, 4139); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("summitData/TextFileTest_1.vdb", "SummitDat= a_Descriptor.txt", sql, 5, 4139); //$NON-NLS-1$ //$NON-NLS-2$ } = /** @@ -122,18 +122,18 @@ */ public void testDefect13371() throws Exception { String sql =3D " SELECT SUMMITEXTRACTCDM.START, SUMMITEXTRACTCDM.= SUMMIT_ID, SUMMITEXTRACTCDM.CURRENCY, SUMMITEXTRACTCDM.AMOUNT, SUMMITEXTRAC= TCDM.MATURITY, SUMMITEXTRACTCDM.RATE, SUMMITEXTRACTCDM.DESK, SUMMITEXTRACTC= DM.CDM_ID FROM SUMMITEXTRACTCDM"; //$NON-NLS-1$ - TestHelper.helpTestExecution("summitData/TextFiles.vdb", "SummitEx= tractCDM_Descriptor.txt", sql, 500, 52); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("summitData/TextFiles.vdb", "SummitExtractC= DM_Descriptor.txt", sql, 500, 52); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testDefect11402() throws Exception { String sql =3D "SELECT Part_ID, Part_Name, Part_Color, Part_Weight= from PARTS.PARTS"; //$NON-NLS-1$ - TestHelper.helpTestExecution("TextParts/TextParts.vdb", "/TextPart= s/PartsDescriptor.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("TextParts/TextParts.vdb", "/TextParts/Part= sDescriptor.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ } = /** test case 4151 */ public void testCase4151() throws Exception { String sql =3D "SELECT COLA, COLB, COLC FROM ThreeColString_Text.t= estfile"; //$NON-NLS-1$ - TestHelper.helpTestExecution("case4151/MM_00004151.vdb", "testfile= -descriptor.txt", sql, 15000, 5); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("case4151/MM_00004151.vdb", "testfile-descr= iptor.txt", sql, 15000, 5); //$NON-NLS-1$ //$NON-NLS-2$ } = } Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/conn= ector/text/TestRowHeaderTextSynchExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestRowHeaderTextSynchExecution.java 2009-02-24 16:16:49 UTC (rev 489) +++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestRowHeaderTextSynchExecution.java 2009-02-24 16:41:35 UTC (rev 490) @@ -40,7 +40,7 @@ */ public void testRowHeader() throws Exception { String sql =3D "SELECT Part_ID, Part_Name, Part_Color, Part_Weight= from PARTS.PARTS"; //$NON-NLS-1$ - TestHelper.helpTestExecution("TextParts/TextParts.vdb", "TextParts= /PartsDescriptor.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("TextParts/TextParts.vdb", "TextParts/Parts= Descriptor.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ } = /** @@ -50,7 +50,7 @@ */ public void testRowHeader2() throws Exception { String sql =3D "SELECT Part_ID, Part_Name, Part_Color, Part_Weight= from PARTS.PARTS_NoNameInSource"; //$NON-NLS-1$ - TestHelper.helpTestExecution("TextParts/TextParts.vdb", "TextParts= /PartsDescriptor.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("TextParts/TextParts.vdb", "TextParts/Parts= Descriptor.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ } = /** = @@ -60,7 +60,7 @@ */ public void testRowHeader3() throws Exception { String sql =3D "SELECT Part_ID, Part_Name, Part_Color, Part_Weight= from PARTS.PARTS_AlphaNameInSource"; //$NON-NLS-1$ - TestHelper.helpTestExecution("TextParts/TextParts.vdb", "TextParts= /PartsDescriptor.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("TextParts/TextParts.vdb", "TextParts/Parts= Descriptor.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ } = /** @@ -71,7 +71,7 @@ */ public void testRowHeader4() throws Exception { String sql =3D "SELECT Part_ID, Part_Name, Part_Color, Part_Weight= from PARTS.PARTS_AlphaDiffNameInSource"; //$NON-NLS-1$ - TestHelper.helpTestExecution("TextParts/TextParts.vdb", "TextParts= /PartsDescriptor.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("TextParts/TextParts.vdb", "TextParts/Parts= Descriptor.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ } = /** @@ -81,7 +81,7 @@ */ public void testRowHeader5() throws Exception { String sql =3D "SELECT Part_ID, Part_Name, Part_Color, Part_Weight= from PARTS.PARTS_NoNameInSource"; //$NON-NLS-1$ - TestHelper.helpTestExecution("TextParts/TextParts.vdb", "TextParts= /PartsDescriptor_HeaderRowTest.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-= NLS-2$ + Util.helpTestExecution("TextParts/TextParts.vdb", "TextParts/Parts= Descriptor_HeaderRowTest.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ } = /** @@ -91,7 +91,7 @@ */ public void testRowHeader6() throws Exception { String sql =3D "SELECT Part_ID, Part_Name, Part_Color, Part_Weight= from PARTS.PARTS_AlphaDiffNameInSource"; //$NON-NLS-1$ - TestHelper.helpTestExecution("TextParts/TextParts.vdb", "TextParts= /PartsDescriptor_HeaderRowTest.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-= NLS-2$ + Util.helpTestExecution("TextParts/TextParts.vdb", "TextParts/Parts= Descriptor_HeaderRowTest.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ } = /** @@ -101,7 +101,7 @@ */ public void testRowHeader7() throws Exception { String sql =3D "SELECT Part_ID, Part_Name, Part_Color, Part_Weight= from PARTS.PARTS_NoNameInSource"; //$NON-NLS-1$ - TestHelper.helpTestExecution("TextParts/TextParts.vdb", "TextParts= /PartsDescriptor3.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("TextParts/TextParts.vdb", "TextParts/Parts= Descriptor3.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ } = /** @@ -111,7 +111,7 @@ */ public void testRowHeader8() throws Exception { String sql =3D "SELECT Part_ID, Part_Name, Part_Color, Part_Weight= from PARTS.PARTS_SpaceNameInSource"; //$NON-NLS-1$ - TestHelper.helpTestExecution("TextParts/TextParts.vdb", "TextParts= /PartsDescriptor4.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("TextParts/TextParts.vdb", "TextParts/Parts= Descriptor4.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ } = /** @@ -123,7 +123,7 @@ public void testRowHeader_Error() throws Exception { String sql =3D "SELECT Part_ID, Part_Name, Part_Color, Part_Weight= from PARTS.PARTS_AlphaNameInSource"; //$NON-NLS-1$ try { - TestHelper.helpTestExecution("TextParts/TextParts.vdb", "TextP= arts/PartsDescriptor4.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("TextParts/TextParts.vdb", "TextParts/P= artsDescriptor4.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ fail("Should have received ConnectorException due to an invali= d header row being defined."); //$NON-NLS-1$ } catch (ConnectorException ce ) { assertEquals("'SELECT PARTS_AlphaNameInSource.Part_Id, PARTS_Alph= aNameInSource.Part_Name, PARTS_AlphaNameInSource.Part_Color, PARTS_AlphaNam= eInSource.Part_Weight FROM PARTS_AlphaNameInSource' cannot be translated by= the TextTranslator. Column Part_Id not found for element Parts.PARTS_Alpha= NameInSource.Part_Id. Verify column name \"Part_Id\" is defined in the hea= der row of the text file and that the header row number is correctly define= d in the descriptor file.", ce.getMessage()); //$NON-NLS-1$ @@ -140,7 +140,7 @@ */ public void testRowHeader_Error2() throws Exception { String sql =3D "SELECT Part_ID, Part_Name, Part_Color, Part_Weight= from PARTS.PARTS_NoNameInSource"; //$NON-NLS-1$ - TestHelper.helpTestExecution("TextParts/TextParts.vdb", "TextParts= /PartsDescriptor4.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ + Util.helpTestExecution("TextParts/TextParts.vdb", "TextParts/Parts= Descriptor4.txt", sql, 15000, 21); //$NON-NLS-1$ //$NON-NLS-2$ } = } Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/conn= ector/text/TestTextSynchExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestTextSynchExecution.java 2009-02-24 16:16:49 UTC (rev 489) +++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestTextSynchExecution.java 2009-02-24 16:41:35 UTC (rev 490) @@ -45,7 +45,7 @@ = public void testNextBatch2() throws Exception { String sql =3D "SELECT ID, PDate, Author FROM Library"; //$NON-NLS= -1$ - ConnectorHost host =3D TestHelper.getConnectorHostWithFakeMetadata= (DEFAULT_DESC_FILE); + ConnectorHost host =3D Util.getConnectorHostWithFakeMetadata(DEFAU= LT_DESC_FILE); int expectedRows =3D 2; List results =3D host.executeCommand(sql); assertEquals("Get batch size doesn't match expected one. ", expect= edRows, results.size()); //$NON-NLS-1$ @@ -76,7 +76,7 @@ */ public void testDefect13066() throws Exception { String sql =3D "SELECT TRADEID FROM SummitData.SUMMITDATA"; //$NON= -NLS-1$ - TestHelper.helpTestExecution("summitData/TextFileTest_1.vdb", "Sum= mitData_Descriptor.txt", sql, 500, 4139); //$NON-NLS-1$ + Util.helpTestExecution("summitData/TextFileTest_1.vdb", "SummitDat= a_Descriptor.txt", sql, 500, 4139); //$NON-NLS-1$ } = /** @@ -86,7 +86,7 @@ */ public void testDefect13368() throws Exception { String sql =3D "SELECT RATE, DESK FROM SummitData.SUMMITDATA"; //$= NON-NLS-1$ - TestHelper.helpTestExecution("summitData/TextFileTest_1.vdb", "Sum= mitData_Descriptor.txt", sql, 5, 4139); //$NON-NLS-1$ + Util.helpTestExecution("summitData/TextFileTest_1.vdb", "SummitDat= a_Descriptor.txt", sql, 5, 4139); //$NON-NLS-1$ } = /** @@ -96,18 +96,18 @@ */ public void testDefect13371() throws Exception { String sql =3D " SELECT SUMMITEXTRACTCDM.START, SUMMITEXTRACTCDM.= SUMMIT_ID, SUMMITEXTRACTCDM.CURRENCY, SUMMITEXTRACTCDM.AMOUNT, SUMMITEXTRAC= TCDM.MATURITY, SUMMITEXTRACTCDM.RATE, SUMMITEXTRACTCDM.DESK, SUMMITEXTRACTC= DM.CDM_ID FROM SUMMITEXTRACTCDM"; //$NON-NLS-1$ - TestHelper.helpTestExecution("summitData/TextFiles.vdb", "SummitEx= tractCDM_Descriptor.txt", sql, 500, 52); //$NON-NLS-1$ + Util.helpTestExecution("summitData/TextFiles.vdb", "SummitExtractC= DM_Descriptor.txt", sql, 500, 52); //$NON-NLS-1$ } = public void testDefect11402() throws Exception { String sql =3D "SELECT Part_ID, Part_Name, Part_Color, Part_Weight= from PARTS.PARTS"; //$NON-NLS-1$ - TestHelper.helpTestExecution("TextParts/TextParts.vdb", "/TextPart= s/PartsDescriptor.txt", sql, 15000, 21); //$NON-NLS-1$ + Util.helpTestExecution("TextParts/TextParts.vdb", "/TextParts/Part= sDescriptor.txt", sql, 15000, 21); //$NON-NLS-1$ } = /** test case 4151 */ public void testCase4151() throws Exception { String sql =3D "SELECT COLA, COLB, COLC FROM ThreeColString_Text.t= estfile"; //$NON-NLS-1$ - TestHelper.helpTestExecution("case4151/MM_00004151.vdb", "testfile= -descriptor.txt", sql, 15000, 5); //$NON-NLS-1$ + Util.helpTestExecution("case4151/MM_00004151.vdb", "testfile-descr= iptor.txt", sql, 15000, 5); //$NON-NLS-1$ } = } Copied: trunk/connectors/connector-text/src/test/java/com/metamatrix/connec= tor/text/Util.java (from rev 486, trunk/connectors/connector-text/src/test/= java/com/metamatrix/connector/text/TestHelper.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/Util.java (rev 0) +++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/Util.java 2009-02-24 16:41:35 UTC (rev 490) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package com.metamatrix.connector.text; + +import java.io.File; +import java.io.FileInputStream; +import java.util.List; +import java.util.Properties; + +import junit.framework.Assert; + +import com.metamatrix.cdk.api.ConnectorHost; +import com.metamatrix.cdk.unittest.FakeTranslationFactory; +import com.metamatrix.core.util.UnitTestUtil; + +public class Util { + + static void helpTestExecution(String vdb, String descriptorFile, String s= ql, int maxBatchSize, int expectedRowCount) throws Exception { + descriptorFile =3D UnitTestUtil.getTestDataPath() + File.separator + des= criptorFile; + Properties connProps =3D new Properties(); + connProps.load(new FileInputStream(descriptorFile)); + connProps.put(TextPropertyNames.DESCRIPTOR_FILE, descriptorFile); + connProps.put(TextPropertyNames.DATE_RESULT_FORMATS, "yyyy-MM-dd,hh:m= m:ss,hh:mm,dd/mm/yyyy"); //$NON-NLS-1$ + connProps.put(TextPropertyNames.DATE_RESULT_FORMATS_DELIMITER, ","); = //$NON-NLS-1$ + ConnectorHost host =3D new ConnectorHost(new TextConnector(), connPro= ps, UnitTestUtil.getTestDataPath() + File.separator + vdb, false); + List results =3D host.executeCommand(sql); + Assert.assertEquals("Total row count doesn't match expected size. ", = expectedRowCount, results.size()); //$NON-NLS-1$ + } + + public static ConnectorHost getConnectorHostWithFakeMetadata(String descr= iptorFile) throws Exception { + Properties connProps =3D new Properties(); + connProps.load(new FileInputStream(descriptorFile)); + connProps.put(TextPropertyNames.DESCRIPTOR_FILE, descriptorFile); + connProps.put(TextPropertyNames.COLUMN_CNT_MUST_MATCH_MODEL, "true"); + connProps.put(TextPropertyNames.DATE_RESULT_FORMATS, "yyyy-MM-dd,hh:m= m:ss,hh:mm,dd/mm/yyyy"); //$NON-NLS-1$ + connProps.put(TextPropertyNames.DATE_RESULT_FORMATS_DELIMITER, ","); = //$NON-NLS-1$ + ConnectorHost host =3D new ConnectorHost(new TextConnector(), connPro= ps, FakeTranslationFactory.getInstance().getTextTranslationUtility(), false= ); + return host; + } + +} Property changes on: trunk/connectors/connector-text/src/test/java/com/meta= matrix/connector/text/Util.java ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/pom.xml 2009-02-24 16:16:49 UTC (rev 489) +++ trunk/pom.xml 2009-02-24 16:41:35 UTC (rev 490) @@ -173,7 +173,7 @@ junit junit - 3.8.1 + 4.4 test @@ -397,11 +397,6 @@ 3.0 - junit - junit - 3.8.1 - - org.jboss.netty netty 3.0.2.GA --===============9077781877724593415==-- From teiid-commits at lists.jboss.org Tue Feb 24 13:28:12 2009 Content-Type: multipart/mixed; boundary="===============3324125732850690397==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r491 - in trunk: connector-api/src/main/java/com/metamatrix/connector/visitor/util and 51 other directories. Date: Tue, 24 Feb 2009 13:28:12 -0500 Message-ID: --===============3324125732850690397== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-24 13:28:11 -0500 (Tue, 24 Feb 2009) New Revision: 491 Added: trunk/connectors/connector-jdbc/src/main/java/org/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCBaseExecution.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCConnector.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCExecutionHelper.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCPlugin.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCProcedureExecution.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCPropertyNames.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCQueryExecution.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCSourceConnection.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCUpdateExecution.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/S= impleCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/a= ccess/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= b2/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= b2/DB2ConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= b2/DB2SQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= erby/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= erby/DerbyConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/i= nformix/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/m= m/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/m= ysql/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/m= ysql/MySQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/ConcatFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/DayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/ExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/LeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/LocateFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/Log10FunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/MonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/OracleConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/OracleSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/DatePartFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/ModifiedDatePartFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/PostgreSQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= qlserver/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= sl/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/ModFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/SybaseConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= eradata/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/BasicFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/DropFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/FunctionReplacementVisitor.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/SQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/SubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/x= a/ trunk/connectors/connector-jdbc/src/main/resources/org/ trunk/connectors/connector-jdbc/src/main/resources/org/teiid/ trunk/connectors/connector-jdbc/src/main/resources/org/teiid/connector/ trunk/connectors/connector-jdbc/src/main/resources/org/teiid/connector/j= dbc/ trunk/connectors/connector-jdbc/src/test/java/org/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/F= akeConnection.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/M= etadataFactory.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/T= estJDBCSourceConnection.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/a= ccess/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/d= b2/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/d= b2/TestDB2ConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/d= erby/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/d= erby/TestDerbyConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/e= xtension/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/e= xtension/impl/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/e= xtension/impl/TestDropFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/e= xtension/impl/TestEscapeSyntaxModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/m= ysql/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestDayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestLeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestLocateFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestLog10FunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestMonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestOracleConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestSubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/p= ostgresql/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/s= qlserver/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/s= ybase/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/u= til/ Removed: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCBaseExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCConnector.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCPlugin.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCProcedureExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCPropertyNames.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCQueryExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCSourceConnection.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/JDBCUpdateExecution.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/SimpleCapabilities.java trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/access/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/db2/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/derby/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/informix/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mm/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/mysql/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/oracle/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/postgresql/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sqlserver/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/ssl/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/sybase/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/teradata/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/translator/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/util/ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/xa/ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= b2/DB2ConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= b2/DB2SQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= erby/DerbyConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/m= ysql/MySQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/ConcatFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/DayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/ExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/LeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/LocateFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/Log10FunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/MonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/OracleConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/OracleSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/DatePartFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/ModifiedDatePartFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/PostgreSQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/ModFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/SybaseConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/BasicFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/DropFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/SQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/SubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/main/resources/com/ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/FakeConnection.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/MetadataFactory.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/TestJDBCSourceConnection.java trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/access/ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/db2/ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/derby/ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/extension/impl/ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/mysql/ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/oracle/ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/postgresql/ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sqlserver/ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/sybase/ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/util/ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/d= b2/TestDB2ConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/d= erby/TestDerbyConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/e= xtension/impl/TestDropFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/e= xtension/impl/TestEscapeSyntaxModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestDayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestLeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestLocateFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestLog10FunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestMonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestOracleConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestSubstringFunctionModifier.java Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connector= Annotations.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/= CollectorVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/Transa= ctionContext.java trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XAConn= ection.java trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XAConn= ector.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/a= ccess/AccessCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/a= ccess/AccessSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= b2/DB2Capabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= erby/DerbyCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= erby/DerbySQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/i= nformix/InformixCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/i= nformix/InformixSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/m= m/MMCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/m= ysql/MySQLCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/m= ysql/MySQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/OracleCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/PostgreSQLCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/PostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= qlserver/SqlServerCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= qlserver/SqlServerSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= sl/SequeLinkOracleCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/SybaseCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/SybaseSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= eradata/TeradataCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/AliasModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/BindValueVisitor.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/EscapeSyntaxModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/FunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/TranslatedCommand.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/Translator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/x= a/JDBCSourceXAConnection.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/x= a/XAJDBCPropertyNames.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/a= ccess/TestAccessSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/d= b2/TestDB2SqlTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/m= ysql/TestMySQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestOracleTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/p= ostgresql/TestPostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/s= qlserver/TestSqlServerConversionVisitor.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/s= ybase/TestSybaseConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/s= ybase/TestSybaseSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/u= til/TestFunctionReplacementVisitor.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialCapabilities.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.j= ava trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestWo= rkItem.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Trans= actionContextImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Trans= actionServerImpl.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exten= sion/TestSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracl= e/TestOracleSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/= TestJDBCExecutionHelper.java trunk/test-integration/src/test/java/com/metamatrix/server/integration/T= estTPCR.java trunk/test-integration/src/test/java/com/metamatrix/server/integration/T= estXMLTypeTranslations.java Log: TEIID-164 repackaging the JDBC connector classes Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/api/Co= nnectorAnnotations.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rAnnotations.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rAnnotations.java 2009-02-24 18:28:11 UTC (rev 491) @@ -51,12 +51,4 @@ boolean enabled() default true; } = - @Retention(RetentionPolicy.RUNTIME) - @Target({ElementType.TYPE}) - public @interface ConnectorConfiguration { - boolean userIdentityCapable() default false; - boolean useSynchronousWorkers() default true; - boolean useConnectionPooling() default true; - } - } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/util/CollectorVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /CollectorVisitor.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /CollectorVisitor.java 2009-02-24 18:28:11 UTC (rev 491) @@ -42,7 +42,8 @@ this.type =3D type; } = - private void checkInstance(ILanguageObject obj) { + @SuppressWarnings("unchecked") + private void checkInstance(ILanguageObject obj) { if(type.isInstance(obj)) { this.objects.add((T)obj); } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api= /TransactionContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/Trans= actionContext.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/Trans= actionContext.java 2009-02-24 18:28:11 UTC (rev 491) @@ -29,12 +29,14 @@ */ public interface TransactionContext { = - public static final int TRANSACTION_GLOBAL =3D 0; - public static final int TRANSACTION_LOCAL =3D 1; - public static final int TRANSACTION_REQUEST =3D 2; - public static final int TRANSACTION_BLOCK =3D 3; - public static final int TRANSACTION_NONE =3D 4; - = + public enum Scope { + TRANSACTION_BLOCK, + TRANSACTION_GLOBAL, + TRANSACTION_LOCAL, + TRANSACTION_NONE, + TRANSACTION_REQUEST + } + = public boolean isInTransaction(); = /** = @@ -47,5 +49,5 @@ */ public String getTxnID(); = - public int getTransactionType(); + public Scope getTransactionType(); } Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api= /XAConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XACon= nection.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XACon= nection.java 2009-02-24 18:28:11 UTC (rev 491) @@ -31,9 +31,8 @@ = public interface XAConnection extends Connection{ /** - * Get XAResource for this connection if the underlining data source i= s to be - * involved in a distributed transaction. - * @return + * Get XAResource for this connection + * @return the XAResource, never null */ XAResource getXAResource() throws ConnectorException; = Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api= /XAConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XACon= nector.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XACon= nector.java 2009-02-24 18:28:11 UTC (rev 491) @@ -32,9 +32,7 @@ /** * Obtain a connection with the connector. The connection must have XA= Resource in * order to participate in distributed transaction. The connection typ= ically is associated - * with a particular security context. The connection is assumed to be= pooled in = - * the underlying source if pooling is necessary - the connection will= be closed = - * when execution has completed against it. = + * with a particular context. = * @param context The context of the current user that will be using t= his connection, = * may be null if this connection is for an administrative operation. = * @param transactionContext The context of the transaction under whic= h the connection will be used. May be null. Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/JDBCBaseExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCBaseExecution.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCBaseExecution.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,286 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc; - -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.SQLWarning; -import java.sql.Statement; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; - -import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorIdentity; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; -import com.metamatrix.connector.jdbc.translator.Translator; -import com.metamatrix.connector.language.ICommand; - -/** - */ -public abstract class JDBCBaseExecution extends BasicExecution { - - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - // Fields - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - - // Passed to constructor - protected Connection connection; - protected Translator sqlTranslator; - protected ConnectorIdentity id; - protected ConnectorLogger logger; - protected ExecutionContext context; - - // Derived from properties - protected boolean trimString; - protected int fetchSize; - - // Set during execution - protected Statement statement; - - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - // Constructors - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - - protected JDBCBaseExecution(Connection connection, - Translator sqlTranslator, - ConnectorLogger logger, - Properties props, - ExecutionContext context) { - this.connection =3D connection; - this.sqlTranslator =3D sqlTranslator; - this.logger =3D logger; - this.context =3D context; - - String propStr =3D props.getProperty(JDBCPropertyNames.TRIM_STRING= S); - if (propStr !=3D null) { - trimString =3D Boolean.valueOf(propStr).booleanValue(); - } - = - fetchSize =3D PropertiesUtils.getIntProperty(props, JDBCPropertyNa= mes.FETCH_SIZE, context.getBatchSize()); - int max =3D sqlTranslator.getMaxResultRows(); - if (max > 0) { - fetchSize =3D Math.min(fetchSize, max); - } - } - - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - // Methods - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - - private void addSql(TranslatedCommand command, - StringBuffer message) { - String sql =3D command.getSql(); - int ndx =3D sql.indexOf('?'); - if (ndx >=3D 0) { - message.append(sql.substring(0, ndx)); - int len =3D sql.length(); - for (Iterator itr =3D command.getPreparedValues().iterator(); = itr.hasNext() && ndx < len;) { - message.append(itr.next()); - int nextNdx =3D sql.indexOf('?', ++ndx); - if (nextNdx >=3D 0) { - message.append(sql.substring(ndx, nextNdx)); - } else { - message.append(sql.substring(ndx)); - } - ndx =3D nextNdx; - } - } else { - message.append(sql); - } - } - - /** - * @param error - * @param command - * @return - * @since 5.5 - */ - protected ConnectorException createAndLogError(SQLException error, - TranslatedCommand comma= nd) { - ConnectorException connectorErr =3D createError(error, command); - this.logger.logError(connectorErr.getMessage()); - return connectorErr; - } - - /** - * @param error - * @param messageKey - * @param commands - * @return - * @throws ConnectorException - * @since 5.5 - */ - protected ConnectorException createAndLogError(Throwable error, - String messageKey, - List commands) throws C= onnectorException { - String msg; - if (commands.isEmpty()) { - msg =3D error.getMessage(); - } else { - msg =3D JDBCPlugin.Util.getString(messageKey, error.getMessage= ()); - StringBuffer buf =3D new StringBuffer(msg); - for (Iterator itr =3D commands.iterator(); itr.hasNext();) { - buf.append("\n "); //$NON-NLS-1$ - addSql((TranslatedCommand)itr.next(), buf); - } - msg =3D buf.toString(); - } - this.logger.logError(msg); - if (error instanceof ConnectorException) { - error =3D ((ConnectorException)error).getCause(); - } - throw new ConnectorException(error, msg); - } - - /** - * @param error - * @param command - * @return - * @since 5.5 - */ - protected ConnectorException createError(SQLException error, - TranslatedCommand command) { - String msg =3D (command =3D=3D null ? error.getMessage() - : JDBCPlugin.Util.getString("JDBCQueryExecution.Er= ror_executing_query__1", //$NON-NLS-1$ - error.getMessage(), cr= eateSql(command))); - return new ConnectorException(error, msg); - } - - private String createSql(TranslatedCommand command) { - StringBuffer msg =3D new StringBuffer(); - addSql(command, msg); - return msg.toString(); - } - - protected TranslatedCommand translateCommand(ICommand command) throws = ConnectorException { - TranslatedCommand translatedCommand =3D new TranslatedCommand(cont= ext, sqlTranslator); - translatedCommand.translateCommand(command); - - if (translatedCommand.getSql() !=3D null && this.logger.isDetailEn= abled()) { - this.logger.logDetail("Source-specific command: " + translated= Command.getSql()); //$NON-NLS-1$ - } - - return translatedCommand; - } - - /* - * @see com.metamatrix.data.Execution#close() - */ - public synchronized void close() throws ConnectorException { - try { - if (statement !=3D null) { - statement.close(); - } - } catch (SQLException e) { - throw new ConnectorException(e); - } - } - - /* - * @see com.metamatrix.data.Execution#cancel() - */ - public synchronized void cancel() throws ConnectorException { - // if both the DBMS and driver support aborting an SQL - try { - if (statement !=3D null) { - statement.cancel(); - } - } catch (SQLException e) { - // Defect 16187 - DataDirect does not support the cancel() met= hod for - // Statement.cancel() for DB2 and Informix. Here we are tolera= nt - // of these and other JDBC drivers that do not support the can= cel() operation. - } - } - - protected void setSizeContraints(Statement statement) throws SQLExcept= ion { - if (sqlTranslator.getMaxResultRows() > 0) { - statement.setMaxRows(sqlTranslator.getMaxResultRows()); - } - statement.setFetchSize(fetchSize); - } - - protected synchronized Statement getStatement() throws SQLException { - if (statement !=3D null) { - statement.close(); - statement =3D null; - } - statement =3D connection.createStatement(); - setSizeContraints(statement); - return statement; - } - - protected synchronized CallableStatement getCallableStatement(String s= ql) throws SQLException { - if (statement !=3D null) { - statement.close(); - statement =3D null; - } - statement =3D connection.prepareCall(sql); - setSizeContraints(statement); - return (CallableStatement)statement; - } - - protected synchronized PreparedStatement getPreparedStatement(String s= ql) throws SQLException { - if (statement !=3D null) { - statement.close(); - statement =3D null; - } - statement =3D connection.prepareStatement(sql); - setSizeContraints(statement); - return (PreparedStatement)statement; - } - - /** - * Returns the JDBC connection used by the execution object. - * = - * @return Returns the connection. - * @since 4.1.1 - */ - public Connection getConnection() { - return this.connection; - } - = - public Translator getSqlTranslator() { - return sqlTranslator; - } - = - public void addStatementWarnings() throws SQLException { - SQLWarning warning =3D this.statement.getWarnings(); - while (warning !=3D null) { - SQLWarning toAdd =3D warning; - warning =3D toAdd.getNextWarning(); - toAdd.setNextException(null); - if (logger.isDetailEnabled()) { - logger.logDetail(context.getRequestIdentifier() + " Warning: ", war= ning); //$NON-NLS-1$ - } - context.addWarning(toAdd); - } - this.statement.clearWarnings(); - } -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/JDBCCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCCapabilities.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,399 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc; - -import java.util.Arrays; -import java.util.List; - -import com.metamatrix.connector.basic.BasicConnectorCapabilities; - -/** - */ -public class JDBCCapabilities extends BasicConnectorCapabilities { - = - public static final int DEFAULT_JDBC_MAX_IN_CRITERIA_SIZE =3D 1000; - - /** - * = - */ - public JDBCCapabilities() { - this.setMaxInCriteriaSize(DEFAULT_JDBC_MAX_IN_CRITERIA_SIZE); - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#getSupportedFunction= s() - */ - public List getSupportedFunctions() { - return Arrays.asList(new String[] { "+", "-", "*", "/" }); //$NON-= NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - } - - /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#getM= axInCriteriaSize() - * @since 4.2 - */ - public int getMaxInCriteriaSize() { - return maxInCriteriaSize; - } - = - public void setMaxInCriteriaSize(int maxInCriteriaSize) { - this.maxInCriteriaSize =3D maxInCriteriaSize; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregates() - */ - public boolean supportsAggregates() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesAv= g() - */ - public boolean supportsAggregatesAvg() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesCo= unt() - */ - public boolean supportsAggregatesCount() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesCo= untStar() - */ - public boolean supportsAggregatesCountStar() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesDi= stinct() - */ - public boolean supportsAggregatesDistinct() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesMa= x() - */ - public boolean supportsAggregatesMax() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesMi= n() - */ - public boolean supportsAggregatesMin() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesSu= m() - */ - public boolean supportsAggregatesSum() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsAliasedGroup= () - */ - public boolean supportsAliasedGroup() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsAndCriteria() - */ - public boolean supportsAndCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsBetweenCrite= ria() - */ - public boolean supportsBetweenCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsCaseExpressi= ons() - */ - public boolean supportsCaseExpressions() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= ria() - */ - public boolean supportsCompareCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= riaEquals() - */ - public boolean supportsCompareCriteriaEquals() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= riaGreaterThan() - */ - public boolean supportsCompareCriteriaGreaterThan() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= riaGreaterThanOrEqual() - */ - public boolean supportsCompareCriteriaGreaterThanOrEqual() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= riaLessThan() - */ - public boolean supportsCompareCriteriaLessThan() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= riaLessThanOrEqual() - */ - public boolean supportsCompareCriteriaLessThanOrEqual() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= riaNotEquals() - */ - public boolean supportsCompareCriteriaNotEquals() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsCorrelatedSu= bqueries() - */ - public boolean supportsCorrelatedSubqueries() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsCriteria() - */ - public boolean supportsCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsExistsCriter= ia() - */ - public boolean supportsExistsCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsFullOuterJoi= ns() - */ - public boolean supportsFullOuterJoins() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsInCriteria() - */ - public boolean supportsInCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsInCriteriaSu= bquery() - */ - public boolean supportsInCriteriaSubquery() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsIsNullCriter= ia() - */ - public boolean supportsIsNullCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsJoins() - */ - public boolean supportsJoins() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsLikeCriteria= () - */ - public boolean supportsLikeCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsLikeCriteria= EscapeCharacter() - */ - public boolean supportsLikeCriteriaEscapeCharacter() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsNotCriteria() - */ - public boolean supportsNotCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsOrCriteria() - */ - public boolean supportsOrCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsOrderBy() - */ - public boolean supportsOrderBy() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsOuterJoins() - */ - public boolean supportsOuterJoins() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsQuantifiedCo= mpareCriteria() - */ - public boolean supportsQuantifiedCompareCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsQuantifiedCo= mpareCriteriaAll() - */ - public boolean supportsQuantifiedCompareCriteriaAll() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsScalarFuncti= ons() - */ - public boolean supportsScalarFunctions() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsScalarSubque= ries() - */ - public boolean supportsScalarSubqueries() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsSearchedCase= Expressions() - */ - public boolean supportsSearchedCaseExpressions() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsSelectDistin= ct() - */ - public boolean supportsSelectDistinct() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsSelectLitera= ls() - */ - public boolean supportsSelectLiterals() { - return true; - } - - /* = - * @see com.metamatrix.data.ConnectorCapabilities#supportsSelfJoins() - */ - public boolean supportsSelfJoins() { - return true; - } - - /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsInl= ineViews() - */ - public boolean supportsInlineViews() { - return false; - } = - = - public boolean supportsOrderByInInlineViews() { - return false; - } - - /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsQua= ntifiedCompareCriteriaSome() - */ - public boolean supportsQuantifiedCompareCriteriaSome() { - return true; - } - = - /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= onOrderBy() - */ - public boolean supportsUnionOrderBy() { - return true; - } - = - /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsSetQueryOrderBy() - */ - @Override - public boolean supportsSetQueryOrderBy() { - return true; - } - = - /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= ons() - */ - public boolean supportsUnions() { - return true; - } - = - @Override - public boolean supportsBulkInsert() { - return true; - } - = - @Override - public boolean supportsBatchedUpdates() { - return true; - } - -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/JDBCConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCConnector.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCConnector.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,390 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.sql.Driver; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.util.Enumeration; -import java.util.Properties; - -import javax.sql.DataSource; -import javax.sql.XADataSource; - -import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.SingleIdentity; -import com.metamatrix.connector.api.MappedUserIdentity; -import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.basic.BasicConnector; -import com.metamatrix.connector.internal.ConnectorPropertyNames; -import com.metamatrix.connector.jdbc.translator.Translator; -import com.metamatrix.connector.jdbc.xa.JDBCSourceXAConnection; -import com.metamatrix.connector.jdbc.xa.XAJDBCPropertyNames; -import com.metamatrix.connector.xa.api.TransactionContext; -import com.metamatrix.connector.xa.api.XAConnection; -import com.metamatrix.connector.xa.api.XAConnector; -import com.metamatrix.core.MetaMatrixCoreException; -import com.metamatrix.core.util.ReflectionHelper; - -/** - * JDBC implementation of Connector interface. - */ -(a)ConnectionPooling -public class JDBCConnector extends BasicConnector implements XAConnector { - = - public static final String INVALID_AUTHORIZATION_SPECIFICATION_NO_SUBC= LASS =3D "28000"; //$NON-NLS-1$ - - static final int NO_ISOLATION_LEVEL_SET =3D Integer.MIN_VALUE; - - enum TransactionIsolationLevel { - TRANSACTION_READ_UNCOMMITTED(java.sql.Connection.TRANSACTION_READ_= UNCOMMITTED), - TRANSACTION_READ_COMMITTED(java.sql.Connection.TRANSACTION_READ_CO= MMITTED), - TRANSACTION_REPEATABLE_READ(java.sql.Connection.TRANSACTION_REPEAT= ABLE_READ), - TRANSACTION_SERIALIZABLE(java.sql.Connection.TRANSACTION_SERIALIZA= BLE), - TRANSACTION_NONE(java.sql.Connection.TRANSACTION_NONE); - - private int connectionContant; - - private TransactionIsolationLevel(int connectionConstant) { - this.connectionContant =3D connectionConstant; - } - = - public int getConnectionConstant() { - return connectionContant; - } - } - = - protected ConnectorEnvironment environment; - private ConnectorLogger logger; - private ConnectorCapabilities capabilities; - private Translator sqlTranslator; - private DataSource ds; - private XADataSource xaDs; - private int transIsoLevel =3D NO_ISOLATION_LEVEL_SET; - = - @Override - public void start(ConnectorEnvironment environment) - throws ConnectorException { - logger =3D environment.getLogger(); - this.environment =3D environment; - = - logger.logInfo(JDBCPlugin.Util.getString("JDBCConnector.JDBCConnec= tor_initialized._1")); //$NON-NLS-1$ - = - capabilities =3D createCapabilities(environment, Thread.currentThr= ead().getContextClassLoader()); - - Properties connectionProps =3D environment.getProperties(); - - // Get the JDBC properties ... - String dataSourceClassName =3D connectionProps.getProperty(JDBCPro= pertyNames.CONNECTION_SOURCE_CLASS); - = - // Verify required items - if (dataSourceClassName =3D=3D null || dataSourceClassName.trim().= length() =3D=3D 0) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Missing_JDBC_driver_class_name_1")); //$NON-NLS-1$ - } - dataSourceClassName =3D dataSourceClassName.trim(); - - String levelStr =3D connectionProps.getProperty(JDBCPropertyNames.= TRANSACTION_ISOLATION_LEVEL); - = - if(levelStr !=3D null && levelStr.trim().length() !=3D 0){ - transIsoLevel =3D TransactionIsolationLevel.valueOf(levelStr.toUp= perCase()).getConnectionConstant(); - } - = - try { - String className =3D environment.getProperties().getProperty(J= DBCPropertyNames.EXT_TRANSLATOR_CLASS, Translator.class.getName()); = - this.sqlTranslator =3D (Translator)ReflectionHelper.create(cla= ssName, null, Thread.currentThread().getContextClassLoader()); - } catch (MetaMatrixCoreException e) { - throw new ConnectorException(e); - } - sqlTranslator.initialize(environment); - = - if (areAdminConnectionsAllowed()) { - testConnection(); - } - - logger.logInfo(JDBCPlugin.Util.getString("JDBCConnector.JDBCConnec= tor_started._4")); //$NON-NLS-1$ - } - = - private void testConnection() throws ConnectorException { - Connection connection =3D null; - try { - connection =3D getConnection(null); - } catch (ConnectorException e) { - SQLException ex =3D (SQLException)e.getCause(); - String sqlState =3D ex.getSQLState(); - if (sqlState !=3D null && INVALID_AUTHORIZATION_SPECIFICATION_= NO_SUBCLASS.equals(sqlState)) { - throw e; - } - this.logger.logError(e.getMessage(), e); - } finally { - if (connection !=3D null) { - connection.close(); - } - } - } - = - @Override - public void stop() { = - /* - * attempt to deregister drivers that may have been implicitly registered - * with the driver manager - */ - Enumeration drivers =3D DriverManager.getDrivers(); - - String driverClassname =3D this.environment.getProperties().getPro= perty(JDBCPropertyNames.CONNECTION_SOURCE_CLASS); - boolean usingCustomClassLoader =3D PropertiesUtils.getBooleanPrope= rty(this.environment.getProperties(), ConnectorPropertyNames.USING_CUSTOM_C= LASSLOADER, false); - - while(drivers.hasMoreElements()){ - Driver tempdriver =3D (Driver)drivers.nextElement(); - if(tempdriver.getClass().getClassLoader() !=3D this.getClass()= .getClassLoader()) { - continue; - } - if(usingCustomClassLoader || tempdriver.getClass().getName().e= quals(driverClassname)) { - try { - DriverManager.deregisterDriver(tempdriver); - } catch (Throwable e) { - this.environment.getLogger().logError(e.getMessage()); - } - } - } - = - logger.logInfo(JDBCPlugin.Util.getString("JDBCConnector.JDBCConnec= tor_stopped._3")); //$NON-NLS-1$ - } - = - @Override - public Connection getConnection(ExecutionContext context) throws Conne= ctorException { - DataSource dataSource =3D getDataSource(); - if (dataSource =3D=3D null) { - return getXAConnection(context, null); - } - java.sql.Connection conn =3D null; - try { = - if (context =3D=3D null || context.getConnectorIdentity() instanceof Si= ngleIdentity) { - conn =3D dataSource.getConnection(); - } else if (context.getConnectorIdentity() instanceof MappedUserIdentity= ) { - MappedUserIdentity id =3D (MappedUserIdentity)context.getConnectorIden= tity(); - conn =3D dataSource.getConnection(id.getMappedUser(), id.getPassword()= ); - } - setDefaultTransactionIsolationLevel(conn); - } catch (SQLException e) { - throw new ConnectorException(e); - } - return new JDBCSourceConnection(conn, this.environment, sqlTranslator); - } - = - @Override - public XAConnection getXAConnection( - ExecutionContext context, - TransactionContext transactionContext) throws ConnectorException { - XADataSource xaDataSource =3D getXADataSource(); - if (xaDataSource =3D=3D null) { - throw new UnsupportedOperationException("Connector is not XA capable"); - } - javax.sql.XAConnection conn =3D null; - try { - if (context =3D=3D null || context.getConnectorIdentity() instanceof Si= ngleIdentity) { - conn =3D xaDataSource.getXAConnection(); - } else if (context.getConnectorIdentity() instanceof MappedUserIdentity= ) { - MappedUserIdentity id =3D (MappedUserIdentity)context.getConnectorIden= tity(); - conn =3D xaDataSource.getXAConnection(id.getMappedUser(), id.getPasswo= rd()); - } - java.sql.Connection c =3D conn.getConnection(); - setDefaultTransactionIsolationLevel(c); - return new JDBCSourceXAConnection(c, conn, this.environment, sqlTransla= tor); - } catch (SQLException e) { - throw new ConnectorException(e); - } - } - - @Override - public ConnectorCapabilities getCapabilities() { - return capabilities; - } - - static ConnectorCapabilities createCapabilities(ConnectorEnvironment envi= ronment, ClassLoader loader) - throws ConnectorException { - //create Capabilities - String className =3D environment.getProperties().getProperty(JDBCPropert= yNames.EXT_CAPABILITY_CLASS, JDBCCapabilities.class.getName()); = - try { - ConnectorCapabilities result =3D (ConnectorCapabilities)ReflectionHe= lper.create(className, null, loader); - if(result instanceof JDBCCapabilities) { - String setCriteriaBatchSize =3D environment.getProperties().getP= roperty(JDBCPropertyNames.SET_CRITERIA_BATCH_SIZE); - if(setCriteriaBatchSize !=3D null) { - int maxInCriteriaSize =3D Integer.parseInt(setCriteriaBatchS= ize); - if(maxInCriteriaSize > 0) { - ((JDBCCapabilities)result).setMaxInCriteriaSize(maxInCri= teriaSize); - } - } = - } - return result; - } catch (Exception e) { - throw new ConnectorException(e); - } - } - = - protected void createDataSources(String dataSourceClassName, final Pro= perties connectionProps) throws ConnectorException { - // create data source - Object temp =3D null; - try { - temp =3D ReflectionHelper.create(dataSourceClassName, null, Threa= d.currentThread().getContextClassLoader()); - } catch (MetaMatrixCoreException e) { - throw new ConnectorException(e,JDBCPlugin.Util.getString("JDBCSource= ConnectionFactory.Unable_to_load_the_JDBC_driver_class_6", dataSourceClassN= ame)); //$NON-NLS-1$ - } - - final String url =3D connectionProps.getProperty(JDBCPropertyNames= .URL); - if (url =3D=3D null || url.trim().length() =3D=3D 0) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Missing_JDBC_database_name_3")); //$NON-NLS-1$ - } - = - if (temp instanceof Driver) { - final Driver driver =3D (Driver)temp; - // check URL if there is one - validateURL(driver, url); - this.ds =3D (DataSource)Proxy.newProxyInstance(Thread.currentThread(= ).getContextClassLoader(), new Class[] {DataSource.class}, new InvocationHa= ndler() { - @Override - public Object invoke(Object proxy, Method method, - Object[] args) throws Throwable { - if (method.getName().equals("getConnection")) { - Properties p =3D new Properties(); - if (args.length =3D=3D 2) { - p.put("user", args[0]); - p.put("password", args[1]); - } else { - p.put("user", connectionProps.getProperty(JDBCPropertyNames.USER= NAME)); - p.put("password", connectionProps.getProperty(JDBCPropertyNames.= PASSWORD)); - } - return driver.connect(url, p); - } = - throw new UnsupportedOperationException("Driver DataSource proxy o= nly provides Connections"); - } - }); - } else { - parseURL(url, connectionProps); - if (temp instanceof DataSource) { - this.ds =3D (DataSource)temp; - PropertiesUtils.setBeanProperties(this.ds, connectionProps, n= ull); - } else if (temp instanceof XADataSource) { - this.xaDs =3D (XADataSource)temp; - PropertiesUtils.setBeanProperties(this.xaDs, connectionProps,= null); - } else { - throw new ConnectorException("Specified class is not a XADataSource= , DataSource, or Driver " + dataSourceClassName); - } - } = - if (this.ds instanceof XADataSource) { - this.xaDs =3D (XADataSource)this.ds; - } - } - = - public DataSource getDataSource() { - return ds; - } - = - public XADataSource getXADataSource() { - return xaDs; - } - = - private void validateURL(Driver driver, String url) throws ConnectorEx= ception { - boolean acceptsURL =3D false; - try { - acceptsURL =3D driver.acceptsURL(url); - } catch ( SQLException e ) { - throw new ConnectorException(e); - } - if(!acceptsURL ){ - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Driver__7", driver.getClass().getName(), url)); //$NO= N-NLS-1$ - } - } - = - /** - * Parse URL for DataSource connection properties and add to connectio= nProps. - * @param url - * @param connectionProps - * @throws ConnectorException = - */ - static void parseURL(final String url, final Properties connectionProp= s) throws ConnectorException { - // Will be: [jdbc:mmx:dbType://aHost:aPort], [DatabaseName=3DaData= Base], [CollectionID=3DaCollectionID], ... - final String[] urlParts =3D url.split(";"); //$NON-NLS-1$ - - // Will be: [jdbc:mmx:dbType:], [aHost:aPort] - final String[] protoHost =3D urlParts[0].split("//"); //$NON-NLS-1$ - - // Will be: [aHost], [aPort] - final String[] hostPort =3D protoHost[1].split(":"); //$NON-NLS-1$ - connectionProps.setProperty(XAJDBCPropertyNames.SERVER_NAME, (Stri= ng)hostPort[0]); - connectionProps.setProperty(XAJDBCPropertyNames.PORT_NUMBER, (Stri= ng)hostPort[1]); - - // For "databaseName", "SID", and all optional props - // (=3D;=3D;...) - for ( int i =3D 1; i < urlParts.length; i++ ) { - final String nameVal =3D (String) urlParts[i]; - // Will be: [propName], [propVal] - final String[] aProp =3D nameVal.split("=3D"); //$NON-NLS-1$ - if ( aProp.length > 1) { - // Set optional prop names lower case so that we can find - // set method names for them when we introspect the DataSo= urce - connectionProps.setProperty(aProp[0].toLowerCase(), aProp[= 1]); - } - } - = - String serverName =3D connectionProps.getProperty(XAJDBCPropertyNa= mes.SERVER_NAME); - String serverPort =3D connectionProps.getProperty(XAJDBCPropertyNa= mes.PORT_NUMBER); - if ( serverName =3D=3D null || serverName.trim().length() =3D=3D 0 ) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.MissingProp", //$NON-NLS-1$ - XAJDBCPropertyNames.SERVER_NAME)); - } - if ( serverPort =3D=3D null || serverPort.trim().length() =3D=3D 0= ) { - throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.MissingProp", //$NON-NLS-1$ - XAJDBCPropertyNames.PORT_NUMBER)); - } - = - // Unique resource name for this connector - final StringBuffer dataSourceResourceName =3D new StringBuffer(con= nectionProps.getProperty(XAJDBCPropertyNames.DATASOURCE_NAME, "XADS")); //$= NON-NLS-1$ - dataSourceResourceName.append('_'); = - dataSourceResourceName.append(serverName); - dataSourceResourceName.append('_'); = - dataSourceResourceName.append(connectionProps.getProperty(Connecto= rPropertyNames.CONNECTOR_ID)); - connectionProps.setProperty( XAJDBCPropertyNames.DATASOURCE_NAME, = dataSourceResourceName.toString()); - } - = - public int getDefaultTransactionIsolationLevel() { - return this.transIsoLevel; - } - = - protected void setDefaultTransactionIsolationLevel(java.sql.Connection sq= lConn) - throws SQLException { - if(getDefaultTransactionIsolationLevel() !=3D NO_ISOLATION_LEVEL_SET && = getDefaultTransactionIsolationLevel() !=3D java.sql.Connection.TRANSACTION_= NONE){ - sqlConn.setTransactionIsolation(getDefaultTransactionIsolationLevel(= )); - } - } - = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/JDBCPlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCPlugin.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCPlugin.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc; - -import java.util.ResourceBundle; -import com.metamatrix.core.BundleUtil; - -/** - * CommonPlugin - *

Used here in data to have access to the new - * logging framework for LogManager.

- */ -public class JDBCPlugin { // extends Plugin { - - /** - * The plug-in identifier of this plugin - * (value "com.metamatrix.data"). - */ - public static final String PLUGIN_ID =3D "com.metamatrix.connector.jdb= c" ; //$NON-NLS-1$ - - public static final BundleUtil Util =3D new BundleUtil(PLUGIN_ID, - PLUGIN_ID + ".i18n",= ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$ -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/JDBCProcedureExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCProcedureExecution.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCProcedureExecution.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,197 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc; - -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; -import com.metamatrix.connector.jdbc.translator.Translator; -import com.metamatrix.connector.jdbc.util.JDBCExecutionHelper; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; - -/** - */ -public class JDBCProcedureExecution extends JDBCQueryExecution implements = ProcedureExecution { - - private Map parameterIndexMap; - private RuntimeMetadata metadata; - = - /** - * @param connection - * @param sqlTranslator - * @param logger - * @param props - * @param id - */ - public JDBCProcedureExecution(ICommand command, - Connection connection, - Translator sqlTranslator, - ConnectorLogger logger, - Properties props, - RuntimeMetadata metadata, ExecutionContext context, - ConnectorEnvironment env) { - super(command, connection, sqlTranslator, logger, props, context, = env); - this.metadata =3D metadata; - } - - @Override - public void execute() throws ConnectorException { - IProcedure procedure =3D (IProcedure)command; - columnDataTypes =3D getColumnDataTypes(procedure.getParameters(), = metadata); - - //translate command - TranslatedCommand translatedComm =3D translateCommand(procedure); - = - //create statement or CallableStatement and execute - String sql =3D translatedComm.getSql(); - try{ - //create parameter index map - parameterIndexMap =3D createParameterIndexMap(procedure.getPar= ameters(), sql); - CallableStatement cstmt =3D getCallableStatement(sql); - results =3D sqlTranslator.executeStoredProcedure(cstmt, transl= atedComm); - if (results !=3D null) { - initResultSetInfo(); - } - addStatementWarnings(); - }catch(SQLException e){ - throw new ConnectorException(e, JDBCPlugin.Util.getString("JDB= CQueryExecution.Error_executing_query__1", sql)); - } = - = - } - = - @Override - public List next() throws ConnectorException, DataNotAvailableExceptio= n { - if (results =3D=3D null) { - return null; - } - return super.next(); - } - = - /** - * @param results - * @return - */ - public static Class[] getColumnDataTypes(List params, RuntimeMetadata = metadata) throws ConnectorException { - if (params !=3D null) { = - IParameter resultSet =3D null; - Iterator iter =3D params.iterator(); - while(iter.hasNext()){ - IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() =3D=3D Direction.RESULT_SET){ - resultSet =3D param; - break; - } - } - - if(resultSet !=3D null){ - List columnMetadata =3D resultSet.getMetadataObje= ct().getChildren(); - - int size =3D columnMetadata.size(); - Class[] coulmnDTs =3D new Class[size]; - for(int i =3D0; ijava.sql.Connection. - * @see java.sql.Connection#setTransactionIsolation(int) - */ - public static final String TRANSACTION_ISOLATION_LEVEL =3D "Transactio= nIsolationLevel"; //$NON-NLS-1$ - - /** - * This is the property name of the ConnectorService property that def= ines - * the time zone of the source database. This property should only be= used in = - * cases where the source database is in a different time zone than th= e = - * ConnectorService VM and the database/driver is not already handling = - * time zones correctly. - */ - public static final String DATABASE_TIME_ZONE =3D "DatabaseTimeZone"; = //$NON-NLS-1$ - - //***** Extension properties *****// - /** - * This property is used to specify the implementation of - * com.metamatrix.data.ConnectorCapabilities. = - */ - public static final String EXT_CAPABILITY_CLASS=3D "ExtensionCapabilit= yClass"; //$NON-NLS-1$ - - /** - * This property is used to specify the implementation of - * com.metamatrix.connector.jdbc.extension.Translator - */ - public static final String EXT_TRANSLATOR_CLASS=3D "ExtensionTranslati= onClass"; //$NON-NLS-1$ - - /** - * This property can be used to specify the fetch size used from the c= onnector to - * its underlying source. - */ - public static final String FETCH_SIZE =3D "FetchSize"; //$NON-NLS-1$ - - /** - * This property can be used to indicate that prepared statements shou= ld be used. - * This means Literals will be substituted for - * bind variables. - * @since 5.0.1 = - */ - public static final String USE_BIND_VARIABLES =3D "UseBindVariables"; = //$NON-NLS-1$ - = - /** - * This property is used to turn on/off the use of the default comment= s like - * connection id and requestid in the source SQL query. - */ - public static final String USE_COMMENTS_SOURCE_QUERY=3D "UseCommentsIn= SourceQuery"; //$NON-NLS-1$ = - = - public static final String CONNECTION_TEST_QUERY =3D "ConnectionTestQu= ery"; //$NON-NLS-1$ - = - public static final String IS_VALID_TIMEOUT =3D "IsValidTimeout"; //$N= ON-NLS-1$ - -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/JDBCQueryExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCQueryExecution.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCQueryExecution.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,195 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ - -package com.metamatrix.connector.jdbc; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.Types; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.api.ValueTranslator; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; -import com.metamatrix.connector.jdbc.translator.Translator; -import com.metamatrix.connector.jdbc.util.JDBCExecutionHelper; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IQueryCommand; - -/** - * = - */ -public class JDBCQueryExecution extends JDBCBaseExecution implements Resul= tSetExecution { - - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - // Fields - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - - protected ResultSet results; - protected Class[] columnDataTypes; - protected ConnectorEnvironment env; - protected ICommand command; - private boolean[] transformKnown; - private ValueTranslator[] transforms; - private boolean[] trimColumn; - private int[] nativeTypes; - - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - // Constructors - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - - public JDBCQueryExecution(ICommand command, Connection connection, - Translator sqlTranslator, - ConnectorLogger logger, - Properties props, - ExecutionContext context, - ConnectorEnvironment env) { - super(connection, sqlTranslator, logger, props, context); - this.command =3D command; - this.env =3D env; - } - = - @Override - public void execute() throws ConnectorException { - // get column types - columnDataTypes =3D ((IQueryCommand)command).getColumnTypes(); - - // translate command - TranslatedCommand translatedComm =3D translateCommand(command); - - String sql =3D translatedComm.getSql(); - - try { - - if (!translatedComm.isPrepared()) { - results =3D getStatement().executeQuery(sql); - } else { - PreparedStatement pstatement =3D getPreparedStatement(sql); - sqlTranslator.bindPreparedStatementValues(this.connection,= pstatement, translatedComm); - results =3D pstatement.executeQuery(); - } = - addStatementWarnings(); - initResultSetInfo(); - - } catch (SQLException e) { - throw createAndLogError(e, translatedComm); - } - } - - protected void initResultSetInfo() throws SQLException { - trimColumn =3D new boolean[columnDataTypes.length]; - nativeTypes =3D new int[columnDataTypes.length]; - ResultSetMetaData rsmd =3D results.getMetaData(); - for(int i=3D0; i=3D 0) { - return connection.isValid(timeout); - } - if(connection.isClosed()){ - return false; - } = - String connectionTestQuery =3D sqlTranslator.getConnectionTest= Query(); - if (connectionTestQuery !=3D null) { - statement =3D connection.createStatement(); - statement.executeQuery(connectionTestQuery); - } - } catch(SQLException e) { - return false; - } finally { - if ( statement !=3D null ) { - try { - statement.close(); - } catch ( SQLException e ) { - } - } - } - return true; - } - = - @Override - public void closeCalled() { - = - } - = -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/JDBCUpdateExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCUpdateExecution.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/JDBCUpdateExecution.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,264 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; -import com.metamatrix.connector.jdbc.translator.Translator; -import com.metamatrix.connector.language.IBatchedUpdates; -import com.metamatrix.connector.language.IBulkInsert; -import com.metamatrix.connector.language.ICommand; - -/** - */ -public class JDBCUpdateExecution extends JDBCBaseExecution implements - UpdateExecution { - - private ICommand command; - private int[] result; - = - /** - * @param connection - * @param sqlTranslator - * @param logger - * @param props - * @param id - */ - public JDBCUpdateExecution(ICommand command, Connection connection, - Translator sqlTranslator, - ConnectorLogger logger, - Properties props, - ExecutionContext context) { - super(connection, sqlTranslator, logger, props, context); - this.command =3D command; - } - - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - // Methods - // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D - - @Override - public void execute() throws ConnectorException { - if (command instanceof IBulkInsert) { - result =3D new int [] {execute((IBulkInsert)command)}; - } else if (command instanceof IBatchedUpdates) { - result =3D execute(((IBatchedUpdates)command)); - } else { - // translate command - TranslatedCommand translatedComm =3D translateCommand(command); - - result =3D new int [] {executeTranslatedCommand(translatedComm= )}; - } - } - - /** - * @see com.metamatrix.data.api.BatchedUpdatesExecution#execute(com.me= tamatrix.connector.language.ICommand[]) - * @since 4.2 - */ - public int[] execute(IBatchedUpdates batchedCommand) throws ConnectorE= xception { - boolean succeeded =3D false; - - boolean commitType =3D getAutoCommit(null); - ICommand[] commands =3D (ICommand[])batchedCommand.getUpdateComman= ds().toArray(new ICommand[batchedCommand.getUpdateCommands().size()]); - int[] results =3D new int[commands.length]; - - try { - // temporarily turn the auto commit off, and set it back to wh= at it was - // before at the end of the command execution. - if (commitType) { - connection.setAutoCommit(false); - } - - List executedCmds =3D new ArrayList(); - = - TranslatedCommand previousCommand =3D null; - = - for (int i =3D 0; i < commands.length; i++) { - TranslatedCommand command =3D translateCommand(commands[i]= ); - if (command.isPrepared()) { - PreparedStatement pstmt =3D null; - if (previousCommand !=3D null && previousCommand.isPre= pared() && previousCommand.getSql().equals(command.getSql())) { - pstmt =3D (PreparedStatement)statement; - } else { - if (!executedCmds.isEmpty()) { - executeBatch(i, results, executedCmds); - } - pstmt =3D getPreparedStatement(command.getSql()); - } - sqlTranslator.bindPreparedStatementValues(this.connect= ion, pstmt, command); - pstmt.addBatch(); - } else { - if (previousCommand !=3D null && previousCommand.isPre= pared()) { - executeBatch(i, results, executedCmds); - getStatement(); - } - if (statement =3D=3D null) { - getStatement(); - } - statement.addBatch(command.getSql()); - } - executedCmds.add(command); - previousCommand =3D command; - } - if (!executedCmds.isEmpty()) { - executeBatch(commands.length, results, executedCmds); - } - succeeded =3D true; - } catch (SQLException e) { - throw createAndLogError(e, null); - } finally { - if (commitType) { - restoreAutoCommit(!succeeded, null); - } - } - - return results; - } - - /** - * An implementation to bulk insert rows into single table. - * = - * @param command - * @return - * @throws ConnectorException - */ - public int execute(IBulkInsert command) throws ConnectorException { - boolean succeeded =3D false; - - // translate command - TranslatedCommand translatedComm =3D translateCommand(command); - - // create statement or PreparedStatement and execute - String sql =3D translatedComm.getSql(); - - boolean commitType =3D getAutoCommit(translatedComm); - int updateCount =3D -1; - try { - // temporarily turn the auto commit off, and set it back to wh= at it was - // before at the end of the command execution. - if (commitType) { - connection.setAutoCommit(false); - } - PreparedStatement stmt =3D getPreparedStatement(sql); - updateCount =3D sqlTranslator.executeStatementForBulkInsert(th= is.connection, stmt, translatedComm); - addStatementWarnings(); - succeeded =3D true; - } catch (SQLException e) { - throw createAndLogError(e, translatedComm); - } finally { - if (commitType) { - restoreAutoCommit(!succeeded, translatedComm); - } - } - return updateCount; - } - - private void executeBatch(int commandCount, - int[] results, - List commands) throws ConnectorException { - try { - int[] batchResults =3D statement.executeBatch(); - addStatementWarnings(); - for (int j =3D 0; j < batchResults.length; j++) { - results[commandCount - 1 - j] =3D batchResults[batchResult= s.length - 1 - j]; - } - commands.clear(); - } catch (SQLException err) { - throw createAndLogError(err, "JDBCQueryExecution.Error_executi= ng_query__3", commands); //$NON-NLS-1$ - } - } - - /** - * @param translatedComm - * @throws ConnectorException - * @since 4.3 - */ - private int executeTranslatedCommand(TranslatedCommand translatedComm)= throws ConnectorException { - // create statement or PreparedStatement and execute - String sql =3D translatedComm.getSql(); - - try { - int updateCount; - if (!translatedComm.isPrepared()) { - updateCount =3D getStatement().executeUpdate(sql); - } else { - PreparedStatement pstatement =3D getPreparedStatement(sql); - sqlTranslator.bindPreparedStatementValues(this.connection,= pstatement, translatedComm); - updateCount =3D pstatement.executeUpdate(); - } = - addStatementWarnings(); - return updateCount; - } catch (SQLException err) { - throw createError(err, translatedComm); - } - } - - /** - * @param command - * @return - * @throws ConnectorException - */ - private boolean getAutoCommit(TranslatedCommand command) throws Connec= torException { - try { - return connection.getAutoCommit(); - } catch (SQLException err) { - throw createAndLogError(err, command); - } - } - - /** - * If the auto comm - * = - * @param exceptionOccurred - * @param command - * @throws ConnectorException - */ - private void restoreAutoCommit(boolean exceptionOccurred, - TranslatedCommand command) throws Conne= ctorException { - try { - if (exceptionOccurred) { - connection.rollback(); - } - connection.setAutoCommit(true); - } catch (SQLException err) { - throw createAndLogError(err, command); - } - } - = - @Override - public int[] getUpdateCounts() throws DataNotAvailableException, - ConnectorException { - return result; - } -} Deleted: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/conne= ctor/jdbc/SimpleCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/SimpleCapabilities.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/SimpleCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,371 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc; - -import java.util.List; - -import com.metamatrix.connector.api.ConnectorCapabilities; - -/** - * This is a "simple" capabilities class that allows criteria but no = - * complicated joins, subqueries, etc to be passed to the connector. - * This capabilities class may come in handy for testing and for = - * sources that support JDBC but don't support extended JDBC capabilities.= = - */ -public class SimpleCapabilities extends JDBCCapabilities implements Connec= torCapabilities { - - public SimpleCapabilities() { - // Max acceptable by all BQT dbs (Sybase=3D250, Oracle=3D1000) - setMaxInCriteriaSize(250); - } - = - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAndCrite= ria() - */ - public boolean supportsAndCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteria() - */ - public boolean supportsCompareCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteriaEquals() - */ - public boolean supportsCompareCriteriaEquals() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteriaGreaterThan() - */ - public boolean supportsCompareCriteriaGreaterThan() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteriaGreaterThanOrEqual() - */ - public boolean supportsCompareCriteriaGreaterThanOrEqual() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteriaLessThan() - */ - public boolean supportsCompareCriteriaLessThan() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteriaLessThanOrEqual() - */ - public boolean supportsCompareCriteriaLessThanOrEqual() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteriaNotEquals() - */ - public boolean supportsCompareCriteriaNotEquals() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCriteria= () - */ - public boolean supportsCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsInCriter= ia() - */ - public boolean supportsInCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsIsNullCr= iteria() - */ - public boolean supportsIsNullCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsJoins() - */ - public boolean supportsJoins() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsLikeCrit= eria() - */ - public boolean supportsLikeCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsNotCrite= ria() - */ - public boolean supportsNotCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsOrCriter= ia() - */ - public boolean supportsOrCriteria() { - return true; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsSelectDi= stinct() - */ - public boolean supportsSelectDistinct() { - return true; - } - - /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsSel= ectLiterals() - * @since 4.2 - */ - public boolean supportsSelectLiterals() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAliasedG= roup() - */ - public boolean supportsAliasedGroup() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsSelfJoin= s() - */ - public boolean supportsSelfJoins() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsOuterJoi= ns() - */ - public boolean supportsOuterJoins() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsFullOute= rJoins() - */ - public boolean supportsFullOuterJoins() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsBetweenC= riteria() - */ - public boolean supportsBetweenCriteria() { - return false; - } - - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsLikeCrit= eriaEscapeCharacter() - */ - public boolean supportsLikeCriteriaEscapeCharacter() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsInCriter= iaSubquery() - */ - public boolean supportsInCriteriaSubquery() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsExistsCr= iteria() - */ - public boolean supportsExistsCriteria() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsQuantifi= edCompareCriteria() - */ - public boolean supportsQuantifiedCompareCriteria() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsQuantifi= edCompareCriteriaSome() - */ - public boolean supportsQuantifiedCompareCriteriaSome() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsQuantifi= edCompareCriteriaAll() - */ - public boolean supportsQuantifiedCompareCriteriaAll() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsOrderBy() - */ - public boolean supportsOrderBy() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= es() - */ - public boolean supportsAggregates() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esSum() - */ - public boolean supportsAggregatesSum() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esAvg() - */ - public boolean supportsAggregatesAvg() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esMin() - */ - public boolean supportsAggregatesMin() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esMax() - */ - public boolean supportsAggregatesMax() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esCount() - */ - public boolean supportsAggregatesCount() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esCountStar() - */ - public boolean supportsAggregatesCountStar() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esDistinct() - */ - public boolean supportsAggregatesDistinct() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsScalarSu= bqueries() - */ - public boolean supportsScalarSubqueries() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCorrelat= edSubqueries() - */ - public boolean supportsCorrelatedSubqueries() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCaseExpr= essions() - */ - public boolean supportsCaseExpressions() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsSearched= CaseExpressions() - */ - public boolean supportsSearchedCaseExpressions() { - return false; - } - - /* = - * @see com.metamatrix.data.api.ConnectorCapabilities#supportsScalarFu= nctions() - */ - public boolean supportsScalarFunctions() { - return false; - } - - /** - * Return null to indicate no functions are supported. - * @return null = - * @see com.metamatrix.connector.api.ConnectorCapabilities#getSupporte= dFunctions() - */ - public List getSupportedFunctions() { - return null; - } - - public boolean supportsInlineViews() { - return false; - } = - - public boolean supportsOrderByInInlineViews() { - return false; - } - - /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= onOrderBy() - * @since 4.2 - */ - public boolean supportsUnionOrderBy() { - return false; - } - = - /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= ons() - * @since 4.2 - */ - public boolean supportsUnions() { - return false; - } - -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/JDBCBaseExecution.java (from rev 488, trunk/connectors/connector-jdbc/s= rc/main/java/com/metamatrix/connector/jdbc/JDBCBaseExecution.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCBaseExecution.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCBaseExecution.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,287 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc; + +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.SQLWarning; +import java.sql.Statement; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; + +import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.jdbc.translator.Translator; + +import com.metamatrix.common.util.PropertiesUtils; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorIdentity; +import com.metamatrix.connector.api.ConnectorLogger; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.basic.BasicExecution; +import com.metamatrix.connector.language.ICommand; + +/** + */ +public abstract class JDBCBaseExecution extends BasicExecution { + + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + // Fields + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + + // Passed to constructor + protected Connection connection; + protected Translator sqlTranslator; + protected ConnectorIdentity id; + protected ConnectorLogger logger; + protected ExecutionContext context; + + // Derived from properties + protected boolean trimString; + protected int fetchSize; + + // Set during execution + protected Statement statement; + + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + // Constructors + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + + protected JDBCBaseExecution(Connection connection, + Translator sqlTranslator, + ConnectorLogger logger, + Properties props, + ExecutionContext context) { + this.connection =3D connection; + this.sqlTranslator =3D sqlTranslator; + this.logger =3D logger; + this.context =3D context; + + String propStr =3D props.getProperty(JDBCPropertyNames.TRIM_STRING= S); + if (propStr !=3D null) { + trimString =3D Boolean.valueOf(propStr).booleanValue(); + } + = + fetchSize =3D PropertiesUtils.getIntProperty(props, JDBCPropertyNa= mes.FETCH_SIZE, context.getBatchSize()); + int max =3D sqlTranslator.getMaxResultRows(); + if (max > 0) { + fetchSize =3D Math.min(fetchSize, max); + } + } + + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + // Methods + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + + private void addSql(TranslatedCommand command, + StringBuffer message) { + String sql =3D command.getSql(); + int ndx =3D sql.indexOf('?'); + if (ndx >=3D 0) { + message.append(sql.substring(0, ndx)); + int len =3D sql.length(); + for (Iterator itr =3D command.getPreparedValues().iterator(); = itr.hasNext() && ndx < len;) { + message.append(itr.next()); + int nextNdx =3D sql.indexOf('?', ++ndx); + if (nextNdx >=3D 0) { + message.append(sql.substring(ndx, nextNdx)); + } else { + message.append(sql.substring(ndx)); + } + ndx =3D nextNdx; + } + } else { + message.append(sql); + } + } + + /** + * @param error + * @param command + * @return + * @since 5.5 + */ + protected ConnectorException createAndLogError(SQLException error, + TranslatedCommand comma= nd) { + ConnectorException connectorErr =3D createError(error, command); + this.logger.logError(connectorErr.getMessage()); + return connectorErr; + } + + /** + * @param error + * @param messageKey + * @param commands + * @return + * @throws ConnectorException + * @since 5.5 + */ + protected ConnectorException createAndLogError(Throwable error, + String messageKey, + List commands) throws C= onnectorException { + String msg; + if (commands.isEmpty()) { + msg =3D error.getMessage(); + } else { + msg =3D JDBCPlugin.Util.getString(messageKey, error.getMessage= ()); + StringBuffer buf =3D new StringBuffer(msg); + for (Iterator itr =3D commands.iterator(); itr.hasNext();) { + buf.append("\n "); //$NON-NLS-1$ + addSql((TranslatedCommand)itr.next(), buf); + } + msg =3D buf.toString(); + } + this.logger.logError(msg); + if (error instanceof ConnectorException) { + error =3D ((ConnectorException)error).getCause(); + } + throw new ConnectorException(error, msg); + } + + /** + * @param error + * @param command + * @return + * @since 5.5 + */ + protected ConnectorException createError(SQLException error, + TranslatedCommand command) { + String msg =3D (command =3D=3D null ? error.getMessage() + : JDBCPlugin.Util.getString("JDBCQueryExecution.Er= ror_executing_query__1", //$NON-NLS-1$ + error.getMessage(), cr= eateSql(command))); + return new ConnectorException(error, msg); + } + + private String createSql(TranslatedCommand command) { + StringBuffer msg =3D new StringBuffer(); + addSql(command, msg); + return msg.toString(); + } + + protected TranslatedCommand translateCommand(ICommand command) throws = ConnectorException { + TranslatedCommand translatedCommand =3D new TranslatedCommand(cont= ext, sqlTranslator); + translatedCommand.translateCommand(command); + + if (translatedCommand.getSql() !=3D null && this.logger.isDetailEn= abled()) { + this.logger.logDetail("Source-specific command: " + translated= Command.getSql()); //$NON-NLS-1$ + } + + return translatedCommand; + } + + /* + * @see com.metamatrix.data.Execution#close() + */ + public synchronized void close() throws ConnectorException { + try { + if (statement !=3D null) { + statement.close(); + } + } catch (SQLException e) { + throw new ConnectorException(e); + } + } + + /* + * @see com.metamatrix.data.Execution#cancel() + */ + public synchronized void cancel() throws ConnectorException { + // if both the DBMS and driver support aborting an SQL + try { + if (statement !=3D null) { + statement.cancel(); + } + } catch (SQLException e) { + // Defect 16187 - DataDirect does not support the cancel() met= hod for + // Statement.cancel() for DB2 and Informix. Here we are tolera= nt + // of these and other JDBC drivers that do not support the can= cel() operation. + } + } + + protected void setSizeContraints(Statement statement) throws SQLExcept= ion { + if (sqlTranslator.getMaxResultRows() > 0) { + statement.setMaxRows(sqlTranslator.getMaxResultRows()); + } + statement.setFetchSize(fetchSize); + } + + protected synchronized Statement getStatement() throws SQLException { + if (statement !=3D null) { + statement.close(); + statement =3D null; + } + statement =3D connection.createStatement(); + setSizeContraints(statement); + return statement; + } + + protected synchronized CallableStatement getCallableStatement(String s= ql) throws SQLException { + if (statement !=3D null) { + statement.close(); + statement =3D null; + } + statement =3D connection.prepareCall(sql); + setSizeContraints(statement); + return (CallableStatement)statement; + } + + protected synchronized PreparedStatement getPreparedStatement(String s= ql) throws SQLException { + if (statement !=3D null) { + statement.close(); + statement =3D null; + } + statement =3D connection.prepareStatement(sql); + setSizeContraints(statement); + return (PreparedStatement)statement; + } + + /** + * Returns the JDBC connection used by the execution object. + * = + * @return Returns the connection. + * @since 4.1.1 + */ + public Connection getConnection() { + return this.connection; + } + = + public Translator getSqlTranslator() { + return sqlTranslator; + } + = + public void addStatementWarnings() throws SQLException { + SQLWarning warning =3D this.statement.getWarnings(); + while (warning !=3D null) { + SQLWarning toAdd =3D warning; + warning =3D toAdd.getNextWarning(); + toAdd.setNextException(null); + if (logger.isDetailEnabled()) { + logger.logDetail(context.getRequestIdentifier() + " Warning: ", war= ning); //$NON-NLS-1$ + } + context.addWarning(toAdd); + } + this.statement.clearWarnings(); + } +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/JDBCBaseExecution.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/JDBCCapabilities.java (from rev 486, trunk/connectors/connector-jdbc/sr= c/main/java/com/metamatrix/connector/jdbc/JDBCCapabilities.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCCapabilities.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,399 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc; + +import java.util.Arrays; +import java.util.List; + +import com.metamatrix.connector.basic.BasicConnectorCapabilities; + +/** + */ +public class JDBCCapabilities extends BasicConnectorCapabilities { + = + public static final int DEFAULT_JDBC_MAX_IN_CRITERIA_SIZE =3D 1000; + + /** + * = + */ + public JDBCCapabilities() { + this.setMaxInCriteriaSize(DEFAULT_JDBC_MAX_IN_CRITERIA_SIZE); + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#getSupportedFunction= s() + */ + public List getSupportedFunctions() { + return Arrays.asList(new String[] { "+", "-", "*", "/" }); //$NON-= NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } + + /** = + * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#getM= axInCriteriaSize() + * @since 4.2 + */ + public int getMaxInCriteriaSize() { + return maxInCriteriaSize; + } + = + public void setMaxInCriteriaSize(int maxInCriteriaSize) { + this.maxInCriteriaSize =3D maxInCriteriaSize; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregates() + */ + public boolean supportsAggregates() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesAv= g() + */ + public boolean supportsAggregatesAvg() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesCo= unt() + */ + public boolean supportsAggregatesCount() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesCo= untStar() + */ + public boolean supportsAggregatesCountStar() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesDi= stinct() + */ + public boolean supportsAggregatesDistinct() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesMa= x() + */ + public boolean supportsAggregatesMax() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesMi= n() + */ + public boolean supportsAggregatesMin() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsAggregatesSu= m() + */ + public boolean supportsAggregatesSum() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsAliasedGroup= () + */ + public boolean supportsAliasedGroup() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsAndCriteria() + */ + public boolean supportsAndCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsBetweenCrite= ria() + */ + public boolean supportsBetweenCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsCaseExpressi= ons() + */ + public boolean supportsCaseExpressions() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= ria() + */ + public boolean supportsCompareCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= riaEquals() + */ + public boolean supportsCompareCriteriaEquals() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= riaGreaterThan() + */ + public boolean supportsCompareCriteriaGreaterThan() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= riaGreaterThanOrEqual() + */ + public boolean supportsCompareCriteriaGreaterThanOrEqual() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= riaLessThan() + */ + public boolean supportsCompareCriteriaLessThan() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= riaLessThanOrEqual() + */ + public boolean supportsCompareCriteriaLessThanOrEqual() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsCompareCrite= riaNotEquals() + */ + public boolean supportsCompareCriteriaNotEquals() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsCorrelatedSu= bqueries() + */ + public boolean supportsCorrelatedSubqueries() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsCriteria() + */ + public boolean supportsCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsExistsCriter= ia() + */ + public boolean supportsExistsCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsFullOuterJoi= ns() + */ + public boolean supportsFullOuterJoins() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsInCriteria() + */ + public boolean supportsInCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsInCriteriaSu= bquery() + */ + public boolean supportsInCriteriaSubquery() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsIsNullCriter= ia() + */ + public boolean supportsIsNullCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsJoins() + */ + public boolean supportsJoins() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsLikeCriteria= () + */ + public boolean supportsLikeCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsLikeCriteria= EscapeCharacter() + */ + public boolean supportsLikeCriteriaEscapeCharacter() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsNotCriteria() + */ + public boolean supportsNotCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsOrCriteria() + */ + public boolean supportsOrCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsOrderBy() + */ + public boolean supportsOrderBy() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsOuterJoins() + */ + public boolean supportsOuterJoins() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsQuantifiedCo= mpareCriteria() + */ + public boolean supportsQuantifiedCompareCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsQuantifiedCo= mpareCriteriaAll() + */ + public boolean supportsQuantifiedCompareCriteriaAll() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsScalarFuncti= ons() + */ + public boolean supportsScalarFunctions() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsScalarSubque= ries() + */ + public boolean supportsScalarSubqueries() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsSearchedCase= Expressions() + */ + public boolean supportsSearchedCaseExpressions() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsSelectDistin= ct() + */ + public boolean supportsSelectDistinct() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsSelectLitera= ls() + */ + public boolean supportsSelectLiterals() { + return true; + } + + /* = + * @see com.metamatrix.data.ConnectorCapabilities#supportsSelfJoins() + */ + public boolean supportsSelfJoins() { + return true; + } + + /** = + * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsInl= ineViews() + */ + public boolean supportsInlineViews() { + return false; + } = + = + public boolean supportsOrderByInInlineViews() { + return false; + } + + /** = + * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsQua= ntifiedCompareCriteriaSome() + */ + public boolean supportsQuantifiedCompareCriteriaSome() { + return true; + } + = + /** = + * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= onOrderBy() + */ + public boolean supportsUnionOrderBy() { + return true; + } + = + /** = + * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsSetQueryOrderBy() + */ + @Override + public boolean supportsSetQueryOrderBy() { + return true; + } + = + /** = + * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= ons() + */ + public boolean supportsUnions() { + return true; + } + = + @Override + public boolean supportsBulkInsert() { + return true; + } + = + @Override + public boolean supportsBatchedUpdates() { + return true; + } + +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/JDBCCapabilities.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/JDBCConnector.java (from rev 488, trunk/connectors/connector-jdbc/src/m= ain/java/com/metamatrix/connector/jdbc/JDBCConnector.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCConnector.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCConnector.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,391 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ +package org.teiid.connector.jdbc; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.sql.Driver; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Enumeration; +import java.util.Properties; + +import javax.sql.DataSource; +import javax.sql.XADataSource; + +import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.jdbc.xa.JDBCSourceXAConnection; +import org.teiid.connector.jdbc.xa.XAJDBCPropertyNames; + +import com.metamatrix.common.util.PropertiesUtils; +import com.metamatrix.connector.api.Connection; +import com.metamatrix.connector.api.ConnectorCapabilities; +import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorLogger; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.SingleIdentity; +import com.metamatrix.connector.api.MappedUserIdentity; +import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; +import com.metamatrix.connector.basic.BasicConnector; +import com.metamatrix.connector.internal.ConnectorPropertyNames; +import com.metamatrix.connector.xa.api.TransactionContext; +import com.metamatrix.connector.xa.api.XAConnection; +import com.metamatrix.connector.xa.api.XAConnector; +import com.metamatrix.core.MetaMatrixCoreException; +import com.metamatrix.core.util.ReflectionHelper; + +/** + * JDBC implementation of Connector interface. + */ +(a)ConnectionPooling +public class JDBCConnector extends BasicConnector implements XAConnector { + = + public static final String INVALID_AUTHORIZATION_SPECIFICATION_NO_SUBC= LASS =3D "28000"; //$NON-NLS-1$ + + static final int NO_ISOLATION_LEVEL_SET =3D Integer.MIN_VALUE; + + enum TransactionIsolationLevel { + TRANSACTION_READ_UNCOMMITTED(java.sql.Connection.TRANSACTION_READ_= UNCOMMITTED), + TRANSACTION_READ_COMMITTED(java.sql.Connection.TRANSACTION_READ_CO= MMITTED), + TRANSACTION_REPEATABLE_READ(java.sql.Connection.TRANSACTION_REPEAT= ABLE_READ), + TRANSACTION_SERIALIZABLE(java.sql.Connection.TRANSACTION_SERIALIZA= BLE), + TRANSACTION_NONE(java.sql.Connection.TRANSACTION_NONE); + + private int connectionContant; + + private TransactionIsolationLevel(int connectionConstant) { + this.connectionContant =3D connectionConstant; + } + = + public int getConnectionConstant() { + return connectionContant; + } + } + = + protected ConnectorEnvironment environment; + private ConnectorLogger logger; + private ConnectorCapabilities capabilities; + private Translator sqlTranslator; + private DataSource ds; + private XADataSource xaDs; + private int transIsoLevel =3D NO_ISOLATION_LEVEL_SET; + = + @Override + public void start(ConnectorEnvironment environment) + throws ConnectorException { + logger =3D environment.getLogger(); + this.environment =3D environment; + = + logger.logInfo(JDBCPlugin.Util.getString("JDBCConnector.JDBCConnec= tor_initialized._1")); //$NON-NLS-1$ + = + capabilities =3D createCapabilities(environment, Thread.currentThr= ead().getContextClassLoader()); + + Properties connectionProps =3D environment.getProperties(); + + // Get the JDBC properties ... + String dataSourceClassName =3D connectionProps.getProperty(JDBCPro= pertyNames.CONNECTION_SOURCE_CLASS); + = + // Verify required items + if (dataSourceClassName =3D=3D null || dataSourceClassName.trim().= length() =3D=3D 0) { + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Missing_JDBC_driver_class_name_1")); //$NON-NLS-1$ + } + dataSourceClassName =3D dataSourceClassName.trim(); + + String levelStr =3D connectionProps.getProperty(JDBCPropertyNames.= TRANSACTION_ISOLATION_LEVEL); + = + if(levelStr !=3D null && levelStr.trim().length() !=3D 0){ + transIsoLevel =3D TransactionIsolationLevel.valueOf(levelStr.toUp= perCase()).getConnectionConstant(); + } + = + try { + String className =3D environment.getProperties().getProperty(J= DBCPropertyNames.EXT_TRANSLATOR_CLASS, Translator.class.getName()); = + this.sqlTranslator =3D (Translator)ReflectionHelper.create(cla= ssName, null, Thread.currentThread().getContextClassLoader()); + } catch (MetaMatrixCoreException e) { + throw new ConnectorException(e); + } + sqlTranslator.initialize(environment); + = + if (areAdminConnectionsAllowed()) { + testConnection(); + } + + logger.logInfo(JDBCPlugin.Util.getString("JDBCConnector.JDBCConnec= tor_started._4")); //$NON-NLS-1$ + } + = + private void testConnection() throws ConnectorException { + Connection connection =3D null; + try { + connection =3D getConnection(null); + } catch (ConnectorException e) { + SQLException ex =3D (SQLException)e.getCause(); + String sqlState =3D ex.getSQLState(); + if (sqlState !=3D null && INVALID_AUTHORIZATION_SPECIFICATION_= NO_SUBCLASS.equals(sqlState)) { + throw e; + } + this.logger.logError(e.getMessage(), e); + } finally { + if (connection !=3D null) { + connection.close(); + } + } + } + = + @Override + public void stop() { = + /* + * attempt to deregister drivers that may have been implicitly registered + * with the driver manager + */ + Enumeration drivers =3D DriverManager.getDrivers(); + + String driverClassname =3D this.environment.getProperties().getPro= perty(JDBCPropertyNames.CONNECTION_SOURCE_CLASS); + boolean usingCustomClassLoader =3D PropertiesUtils.getBooleanPrope= rty(this.environment.getProperties(), ConnectorPropertyNames.USING_CUSTOM_C= LASSLOADER, false); + + while(drivers.hasMoreElements()){ + Driver tempdriver =3D (Driver)drivers.nextElement(); + if(tempdriver.getClass().getClassLoader() !=3D this.getClass()= .getClassLoader()) { + continue; + } + if(usingCustomClassLoader || tempdriver.getClass().getName().e= quals(driverClassname)) { + try { + DriverManager.deregisterDriver(tempdriver); + } catch (Throwable e) { + this.environment.getLogger().logError(e.getMessage()); + } + } + } + = + logger.logInfo(JDBCPlugin.Util.getString("JDBCConnector.JDBCConnec= tor_stopped._3")); //$NON-NLS-1$ + } + = + @Override + public Connection getConnection(ExecutionContext context) throws Conne= ctorException { + DataSource dataSource =3D getDataSource(); + if (dataSource =3D=3D null) { + return getXAConnection(context, null); + } + java.sql.Connection conn =3D null; + try { = + if (context =3D=3D null || context.getConnectorIdentity() instanceof Si= ngleIdentity) { + conn =3D dataSource.getConnection(); + } else if (context.getConnectorIdentity() instanceof MappedUserIdentity= ) { + MappedUserIdentity id =3D (MappedUserIdentity)context.getConnectorIden= tity(); + conn =3D dataSource.getConnection(id.getMappedUser(), id.getPassword()= ); + } + setDefaultTransactionIsolationLevel(conn); + } catch (SQLException e) { + throw new ConnectorException(e); + } + return new JDBCSourceConnection(conn, this.environment, sqlTranslator); + } + = + @Override + public XAConnection getXAConnection( + ExecutionContext context, + TransactionContext transactionContext) throws ConnectorException { + XADataSource xaDataSource =3D getXADataSource(); + if (xaDataSource =3D=3D null) { + throw new UnsupportedOperationException("Connector is not XA capable"); + } + javax.sql.XAConnection conn =3D null; + try { + if (context =3D=3D null || context.getConnectorIdentity() instanceof Si= ngleIdentity) { + conn =3D xaDataSource.getXAConnection(); + } else if (context.getConnectorIdentity() instanceof MappedUserIdentity= ) { + MappedUserIdentity id =3D (MappedUserIdentity)context.getConnectorIden= tity(); + conn =3D xaDataSource.getXAConnection(id.getMappedUser(), id.getPasswo= rd()); + } + java.sql.Connection c =3D conn.getConnection(); + setDefaultTransactionIsolationLevel(c); + return new JDBCSourceXAConnection(c, conn, this.environment, sqlTransla= tor); + } catch (SQLException e) { + throw new ConnectorException(e); + } + } + + @Override + public ConnectorCapabilities getCapabilities() { + return capabilities; + } + + static ConnectorCapabilities createCapabilities(ConnectorEnvironment envi= ronment, ClassLoader loader) + throws ConnectorException { + //create Capabilities + String className =3D environment.getProperties().getProperty(JDBCPropert= yNames.EXT_CAPABILITY_CLASS, JDBCCapabilities.class.getName()); = + try { + ConnectorCapabilities result =3D (ConnectorCapabilities)ReflectionHe= lper.create(className, null, loader); + if(result instanceof JDBCCapabilities) { + String setCriteriaBatchSize =3D environment.getProperties().getP= roperty(JDBCPropertyNames.SET_CRITERIA_BATCH_SIZE); + if(setCriteriaBatchSize !=3D null) { + int maxInCriteriaSize =3D Integer.parseInt(setCriteriaBatchS= ize); + if(maxInCriteriaSize > 0) { + ((JDBCCapabilities)result).setMaxInCriteriaSize(maxInCri= teriaSize); + } + } = + } + return result; + } catch (Exception e) { + throw new ConnectorException(e); + } + } + = + protected void createDataSources(String dataSourceClassName, final Pro= perties connectionProps) throws ConnectorException { + // create data source + Object temp =3D null; + try { + temp =3D ReflectionHelper.create(dataSourceClassName, null, Threa= d.currentThread().getContextClassLoader()); + } catch (MetaMatrixCoreException e) { + throw new ConnectorException(e,JDBCPlugin.Util.getString("JDBCSource= ConnectionFactory.Unable_to_load_the_JDBC_driver_class_6", dataSourceClassN= ame)); //$NON-NLS-1$ + } + + final String url =3D connectionProps.getProperty(JDBCPropertyNames= .URL); + if (url =3D=3D null || url.trim().length() =3D=3D 0) { + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Missing_JDBC_database_name_3")); //$NON-NLS-1$ + } + = + if (temp instanceof Driver) { + final Driver driver =3D (Driver)temp; + // check URL if there is one + validateURL(driver, url); + this.ds =3D (DataSource)Proxy.newProxyInstance(Thread.currentThread(= ).getContextClassLoader(), new Class[] {DataSource.class}, new InvocationHa= ndler() { + @Override + public Object invoke(Object proxy, Method method, + Object[] args) throws Throwable { + if (method.getName().equals("getConnection")) { + Properties p =3D new Properties(); + if (args.length =3D=3D 2) { + p.put("user", args[0]); + p.put("password", args[1]); + } else { + p.put("user", connectionProps.getProperty(JDBCPropertyNames.USER= NAME)); + p.put("password", connectionProps.getProperty(JDBCPropertyNames.= PASSWORD)); + } + return driver.connect(url, p); + } = + throw new UnsupportedOperationException("Driver DataSource proxy o= nly provides Connections"); + } + }); + } else { + parseURL(url, connectionProps); + if (temp instanceof DataSource) { + this.ds =3D (DataSource)temp; + PropertiesUtils.setBeanProperties(this.ds, connectionProps, n= ull); + } else if (temp instanceof XADataSource) { + this.xaDs =3D (XADataSource)temp; + PropertiesUtils.setBeanProperties(this.xaDs, connectionProps,= null); + } else { + throw new ConnectorException("Specified class is not a XADataSource= , DataSource, or Driver " + dataSourceClassName); + } + } = + if (this.ds instanceof XADataSource) { + this.xaDs =3D (XADataSource)this.ds; + } + } + = + public DataSource getDataSource() { + return ds; + } + = + public XADataSource getXADataSource() { + return xaDs; + } + = + private void validateURL(Driver driver, String url) throws ConnectorEx= ception { + boolean acceptsURL =3D false; + try { + acceptsURL =3D driver.acceptsURL(url); + } catch ( SQLException e ) { + throw new ConnectorException(e); + } + if(!acceptsURL ){ + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.Driver__7", driver.getClass().getName(), url)); //$NO= N-NLS-1$ + } + } + = + /** + * Parse URL for DataSource connection properties and add to connectio= nProps. + * @param url + * @param connectionProps + * @throws ConnectorException = + */ + static void parseURL(final String url, final Properties connectionProp= s) throws ConnectorException { + // Will be: [jdbc:mmx:dbType://aHost:aPort], [DatabaseName=3DaData= Base], [CollectionID=3DaCollectionID], ... + final String[] urlParts =3D url.split(";"); //$NON-NLS-1$ + + // Will be: [jdbc:mmx:dbType:], [aHost:aPort] + final String[] protoHost =3D urlParts[0].split("//"); //$NON-NLS-1$ + + // Will be: [aHost], [aPort] + final String[] hostPort =3D protoHost[1].split(":"); //$NON-NLS-1$ + connectionProps.setProperty(XAJDBCPropertyNames.SERVER_NAME, (Stri= ng)hostPort[0]); + connectionProps.setProperty(XAJDBCPropertyNames.PORT_NUMBER, (Stri= ng)hostPort[1]); + + // For "databaseName", "SID", and all optional props + // (=3D;=3D;...) + for ( int i =3D 1; i < urlParts.length; i++ ) { + final String nameVal =3D (String) urlParts[i]; + // Will be: [propName], [propVal] + final String[] aProp =3D nameVal.split("=3D"); //$NON-NLS-1$ + if ( aProp.length > 1) { + // Set optional prop names lower case so that we can find + // set method names for them when we introspect the DataSo= urce + connectionProps.setProperty(aProp[0].toLowerCase(), aProp[= 1]); + } + } + = + String serverName =3D connectionProps.getProperty(XAJDBCPropertyNa= mes.SERVER_NAME); + String serverPort =3D connectionProps.getProperty(XAJDBCPropertyNa= mes.PORT_NUMBER); + if ( serverName =3D=3D null || serverName.trim().length() =3D=3D 0 ) { + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.MissingProp", //$NON-NLS-1$ + XAJDBCPropertyNames.SERVER_NAME)); + } + if ( serverPort =3D=3D null || serverPort.trim().length() =3D=3D 0= ) { + throw new ConnectorException(JDBCPlugin.Util.getString("JDBCSo= urceConnectionFactory.MissingProp", //$NON-NLS-1$ + XAJDBCPropertyNames.PORT_NUMBER)); + } + = + // Unique resource name for this connector + final StringBuffer dataSourceResourceName =3D new StringBuffer(con= nectionProps.getProperty(XAJDBCPropertyNames.DATASOURCE_NAME, "XADS")); //$= NON-NLS-1$ + dataSourceResourceName.append('_'); = + dataSourceResourceName.append(serverName); + dataSourceResourceName.append('_'); = + dataSourceResourceName.append(connectionProps.getProperty(Connecto= rPropertyNames.CONNECTOR_ID)); + connectionProps.setProperty( XAJDBCPropertyNames.DATASOURCE_NAME, = dataSourceResourceName.toString()); + } + = + public int getDefaultTransactionIsolationLevel() { + return this.transIsoLevel; + } + = + protected void setDefaultTransactionIsolationLevel(java.sql.Connection sq= lConn) + throws SQLException { + if(getDefaultTransactionIsolationLevel() !=3D NO_ISOLATION_LEVEL_SET && = getDefaultTransactionIsolationLevel() !=3D java.sql.Connection.TRANSACTION_= NONE){ + sqlConn.setTransactionIsolation(getDefaultTransactionIsolationLevel(= )); + } + } + = +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/JDBCConnector.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/JDBCExecutionHelper.java (from rev 486, trunk/connectors/connector-jdbc= /src/main/java/com/metamatrix/connector/jdbc/util/JDBCExecutionHelper.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCExecutionHelper.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCExecutionHelper.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,99 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ +package org.teiid.connector.jdbc; + +import java.util.Iterator; +import java.util.List; + +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.api.ValueTranslator; +import com.metamatrix.connector.basic.BasicValueTranslator; + +/** + */ +public class JDBCExecutionHelper { + + = + public static Object convertValue(Object value, Class expectedType, Li= st valueTranslators, TypeFacility typeFacility, boolean trimStrings, Execut= ionContext context) throws ConnectorException { + if(expectedType.isAssignableFrom(value.getClass())){ + return value; + } + ValueTranslator translator =3D determineTransformation(value.getCl= ass(), expectedType, valueTranslators, typeFacility); + Object result =3D translator.translate(value, context); + if(trimStrings && result instanceof String){ + result =3D trimString((String)result); + } + return result; + } + + /** + * @param actualType + * @param expectedType + * @return Transformation between actual and expected type + */ + public static ValueTranslator determineTransformation(Class actualType= , Class expectedType, List valueTranslators, TypeFacility typeFacility) thr= ows ConnectorException { + ValueTranslator valueTranslator =3D null; + = + //check valueTranslators first + if(valueTranslators !=3D null && !valueTranslators.isEmpty()){ = = + Iterator iter =3D valueTranslators.iterator(); + while(iter.hasNext()){ + ValueTranslator translator =3D (ValueTranslator)iter.next(= ); + = + //Evaluate expressions in this order for performance. + if(expectedType.equals(translator.getTargetType()) && tran= slator.getSourceType().isAssignableFrom(actualType)){ + valueTranslator =3D translator; + break; + } + } + } + = + if(valueTranslator =3D=3D null){ + valueTranslator =3D new BasicValueTranslator(actualType, expec= tedType, typeFacility); + } + return valueTranslator; + } + = + /** + * Expects string to never be null = + * @param value Incoming value + * @return Right trimmed value = + * @since 4.2 + */ + public static String trimString(String value) { + for(int i=3Dvalue.length()-1; i>=3D0; i--) { + if(value.charAt(i) !=3D ' ') { + // end of trim, return what's left + return value.substring(0, i+1); + } + } + + // All spaces, so trim it all + return ""; //$NON-NLS-1$ = + } + = +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/JDBCExecutionHelper.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/JDBCPlugin.java (from rev 486, trunk/connectors/connector-jdbc/src/main= /java/com/metamatrix/connector/jdbc/JDBCPlugin.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCPlugin.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCPlugin.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ +package org.teiid.connector.jdbc; + +import java.util.ResourceBundle; +import com.metamatrix.core.BundleUtil; + +/** + * CommonPlugin + *

Used here in data to have access to the new + * logging framework for LogManager.

+ */ +public class JDBCPlugin { // extends Plugin { + + public static final String PLUGIN_ID =3D "org.teiid.connector.jdbc" ; = //$NON-NLS-1$ + + public static final BundleUtil Util =3D new BundleUtil(PLUGIN_ID, + PLUGIN_ID + ".i18n",= ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$ +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/JDBCPlugin.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/JDBCProcedureExecution.java (from rev 488, trunk/connectors/connector-j= dbc/src/main/java/com/metamatrix/connector/jdbc/JDBCProcedureExecution.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCProcedureExecution.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCProcedureExecution.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,197 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc; + +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.jdbc.translator.Translator; + +import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorLogger; +import com.metamatrix.connector.api.DataNotAvailableException; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.ProcedureExecution; +import com.metamatrix.connector.language.ICommand; +import com.metamatrix.connector.language.IParameter; +import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IParameter.Direction; +import com.metamatrix.connector.metadata.runtime.Element; +import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; + +/** + */ +public class JDBCProcedureExecution extends JDBCQueryExecution implements = ProcedureExecution { + + private Map parameterIndexMap; + private RuntimeMetadata metadata; + = + /** + * @param connection + * @param sqlTranslator + * @param logger + * @param props + * @param id + */ + public JDBCProcedureExecution(ICommand command, + Connection connection, + Translator sqlTranslator, + ConnectorLogger logger, + Properties props, + RuntimeMetadata metadata, ExecutionContext context, + ConnectorEnvironment env) { + super(command, connection, sqlTranslator, logger, props, context, = env); + this.metadata =3D metadata; + } + + @Override + public void execute() throws ConnectorException { + IProcedure procedure =3D (IProcedure)command; + columnDataTypes =3D getColumnDataTypes(procedure.getParameters(), = metadata); + + //translate command + TranslatedCommand translatedComm =3D translateCommand(procedure); + = + //create statement or CallableStatement and execute + String sql =3D translatedComm.getSql(); + try{ + //create parameter index map + parameterIndexMap =3D createParameterIndexMap(procedure.getPar= ameters(), sql); + CallableStatement cstmt =3D getCallableStatement(sql); + results =3D sqlTranslator.executeStoredProcedure(cstmt, transl= atedComm); + if (results !=3D null) { + initResultSetInfo(); + } + addStatementWarnings(); + }catch(SQLException e){ + throw new ConnectorException(e, JDBCPlugin.Util.getString("JDB= CQueryExecution.Error_executing_query__1", sql)); + } = + = + } + = + @Override + public List next() throws ConnectorException, DataNotAvailableExceptio= n { + if (results =3D=3D null) { + return null; + } + return super.next(); + } + = + /** + * @param results + * @return + */ + public static Class[] getColumnDataTypes(List params, RuntimeMetadata = metadata) throws ConnectorException { + if (params !=3D null) { = + IParameter resultSet =3D null; + Iterator iter =3D params.iterator(); + while(iter.hasNext()){ + IParameter param =3D (IParameter)iter.next(); + if(param.getDirection() =3D=3D Direction.RESULT_SET){ + resultSet =3D param; + break; + } + } + + if(resultSet !=3D null){ + List columnMetadata =3D resultSet.getMetadataObje= ct().getChildren(); + + int size =3D columnMetadata.size(); + Class[] coulmnDTs =3D new Class[size]; + for(int i =3D0; ijava.sql.Connection. + * @see java.sql.Connection#setTransactionIsolation(int) + */ + public static final String TRANSACTION_ISOLATION_LEVEL =3D "Transactio= nIsolationLevel"; //$NON-NLS-1$ + + /** + * This is the property name of the ConnectorService property that def= ines + * the time zone of the source database. This property should only be= used in = + * cases where the source database is in a different time zone than th= e = + * ConnectorService VM and the database/driver is not already handling = + * time zones correctly. + */ + public static final String DATABASE_TIME_ZONE =3D "DatabaseTimeZone"; = //$NON-NLS-1$ + + //***** Extension properties *****// + /** + * This property is used to specify the implementation of + * com.metamatrix.data.ConnectorCapabilities. = + */ + public static final String EXT_CAPABILITY_CLASS=3D "ExtensionCapabilit= yClass"; //$NON-NLS-1$ + + /** + * This property is used to specify the implementation of + * com.metamatrix.connector.jdbc.extension.Translator + */ + public static final String EXT_TRANSLATOR_CLASS=3D "ExtensionTranslati= onClass"; //$NON-NLS-1$ + + /** + * This property can be used to specify the fetch size used from the c= onnector to + * its underlying source. + */ + public static final String FETCH_SIZE =3D "FetchSize"; //$NON-NLS-1$ + + /** + * This property can be used to indicate that prepared statements shou= ld be used. + * This means Literals will be substituted for + * bind variables. + * @since 5.0.1 = + */ + public static final String USE_BIND_VARIABLES =3D "UseBindVariables"; = //$NON-NLS-1$ + = + /** + * This property is used to turn on/off the use of the default comment= s like + * connection id and requestid in the source SQL query. + */ + public static final String USE_COMMENTS_SOURCE_QUERY=3D "UseCommentsIn= SourceQuery"; //$NON-NLS-1$ = + = + public static final String CONNECTION_TEST_QUERY =3D "ConnectionTestQu= ery"; //$NON-NLS-1$ + = + public static final String IS_VALID_TIMEOUT =3D "IsValidTimeout"; //$N= ON-NLS-1$ + +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/JDBCPropertyNames.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/JDBCQueryExecution.java (from rev 486, trunk/connectors/connector-jdbc/= src/main/java/com/metamatrix/connector/jdbc/JDBCQueryExecution.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCQueryExecution.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCQueryExecution.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,195 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ + +package org.teiid.connector.jdbc; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.jdbc.translator.Translator; + +import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorLogger; +import com.metamatrix.connector.api.DataNotAvailableException; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.ResultSetExecution; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.api.ValueTranslator; +import com.metamatrix.connector.language.ICommand; +import com.metamatrix.connector.language.IQueryCommand; + +/** + * = + */ +public class JDBCQueryExecution extends JDBCBaseExecution implements Resul= tSetExecution { + + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + // Fields + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + + protected ResultSet results; + protected Class[] columnDataTypes; + protected ConnectorEnvironment env; + protected ICommand command; + private boolean[] transformKnown; + private ValueTranslator[] transforms; + private boolean[] trimColumn; + private int[] nativeTypes; + + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + // Constructors + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + + public JDBCQueryExecution(ICommand command, Connection connection, + Translator sqlTranslator, + ConnectorLogger logger, + Properties props, + ExecutionContext context, + ConnectorEnvironment env) { + super(connection, sqlTranslator, logger, props, context); + this.command =3D command; + this.env =3D env; + } + = + @Override + public void execute() throws ConnectorException { + // get column types + columnDataTypes =3D ((IQueryCommand)command).getColumnTypes(); + + // translate command + TranslatedCommand translatedComm =3D translateCommand(command); + + String sql =3D translatedComm.getSql(); + + try { + + if (!translatedComm.isPrepared()) { + results =3D getStatement().executeQuery(sql); + } else { + PreparedStatement pstatement =3D getPreparedStatement(sql); + sqlTranslator.bindPreparedStatementValues(this.connection,= pstatement, translatedComm); + results =3D pstatement.executeQuery(); + } = + addStatementWarnings(); + initResultSetInfo(); + + } catch (SQLException e) { + throw createAndLogError(e, translatedComm); + } + } + + protected void initResultSetInfo() throws SQLException { + trimColumn =3D new boolean[columnDataTypes.length]; + nativeTypes =3D new int[columnDataTypes.length]; + ResultSetMetaData rsmd =3D results.getMetaData(); + for(int i=3D0; i=3D 0) { + return connection.isValid(timeout); + } + if(connection.isClosed()){ + return false; + } = + String connectionTestQuery =3D sqlTranslator.getConnectionTest= Query(); + if (connectionTestQuery !=3D null) { + statement =3D connection.createStatement(); + statement.executeQuery(connectionTestQuery); + } + } catch(SQLException e) { + return false; + } finally { + if ( statement !=3D null ) { + try { + statement.close(); + } catch ( SQLException e ) { + } + } + } + return true; + } + = + @Override + public void closeCalled() { + = + } + = +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/JDBCSourceConnection.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/JDBCUpdateExecution.java (from rev 486, trunk/connectors/connector-jdbc= /src/main/java/com/metamatrix/connector/jdbc/JDBCUpdateExecution.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCUpdateExecution.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCUpdateExecution.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,265 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.jdbc.translator.Translator; + +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ConnectorLogger; +import com.metamatrix.connector.api.DataNotAvailableException; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.UpdateExecution; +import com.metamatrix.connector.language.IBatchedUpdates; +import com.metamatrix.connector.language.IBulkInsert; +import com.metamatrix.connector.language.ICommand; + +/** + */ +public class JDBCUpdateExecution extends JDBCBaseExecution implements + UpdateExecution { + + private ICommand command; + private int[] result; + = + /** + * @param connection + * @param sqlTranslator + * @param logger + * @param props + * @param id + */ + public JDBCUpdateExecution(ICommand command, Connection connection, + Translator sqlTranslator, + ConnectorLogger logger, + Properties props, + ExecutionContext context) { + super(connection, sqlTranslator, logger, props, context); + this.command =3D command; + } + + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + // Methods + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D + + @Override + public void execute() throws ConnectorException { + if (command instanceof IBulkInsert) { + result =3D new int [] {execute((IBulkInsert)command)}; + } else if (command instanceof IBatchedUpdates) { + result =3D execute(((IBatchedUpdates)command)); + } else { + // translate command + TranslatedCommand translatedComm =3D translateCommand(command); + + result =3D new int [] {executeTranslatedCommand(translatedComm= )}; + } + } + + /** + * @see com.metamatrix.data.api.BatchedUpdatesExecution#execute(com.me= tamatrix.connector.language.ICommand[]) + * @since 4.2 + */ + public int[] execute(IBatchedUpdates batchedCommand) throws ConnectorE= xception { + boolean succeeded =3D false; + + boolean commitType =3D getAutoCommit(null); + ICommand[] commands =3D (ICommand[])batchedCommand.getUpdateComman= ds().toArray(new ICommand[batchedCommand.getUpdateCommands().size()]); + int[] results =3D new int[commands.length]; + + try { + // temporarily turn the auto commit off, and set it back to wh= at it was + // before at the end of the command execution. + if (commitType) { + connection.setAutoCommit(false); + } + + List executedCmds =3D new ArrayList(); + = + TranslatedCommand previousCommand =3D null; + = + for (int i =3D 0; i < commands.length; i++) { + TranslatedCommand command =3D translateCommand(commands[i]= ); + if (command.isPrepared()) { + PreparedStatement pstmt =3D null; + if (previousCommand !=3D null && previousCommand.isPre= pared() && previousCommand.getSql().equals(command.getSql())) { + pstmt =3D (PreparedStatement)statement; + } else { + if (!executedCmds.isEmpty()) { + executeBatch(i, results, executedCmds); + } + pstmt =3D getPreparedStatement(command.getSql()); + } + sqlTranslator.bindPreparedStatementValues(this.connect= ion, pstmt, command); + pstmt.addBatch(); + } else { + if (previousCommand !=3D null && previousCommand.isPre= pared()) { + executeBatch(i, results, executedCmds); + getStatement(); + } + if (statement =3D=3D null) { + getStatement(); + } + statement.addBatch(command.getSql()); + } + executedCmds.add(command); + previousCommand =3D command; + } + if (!executedCmds.isEmpty()) { + executeBatch(commands.length, results, executedCmds); + } + succeeded =3D true; + } catch (SQLException e) { + throw createAndLogError(e, null); + } finally { + if (commitType) { + restoreAutoCommit(!succeeded, null); + } + } + + return results; + } + + /** + * An implementation to bulk insert rows into single table. + * = + * @param command + * @return + * @throws ConnectorException + */ + public int execute(IBulkInsert command) throws ConnectorException { + boolean succeeded =3D false; + + // translate command + TranslatedCommand translatedComm =3D translateCommand(command); + + // create statement or PreparedStatement and execute + String sql =3D translatedComm.getSql(); + + boolean commitType =3D getAutoCommit(translatedComm); + int updateCount =3D -1; + try { + // temporarily turn the auto commit off, and set it back to wh= at it was + // before at the end of the command execution. + if (commitType) { + connection.setAutoCommit(false); + } + PreparedStatement stmt =3D getPreparedStatement(sql); + updateCount =3D sqlTranslator.executeStatementForBulkInsert(th= is.connection, stmt, translatedComm); + addStatementWarnings(); + succeeded =3D true; + } catch (SQLException e) { + throw createAndLogError(e, translatedComm); + } finally { + if (commitType) { + restoreAutoCommit(!succeeded, translatedComm); + } + } + return updateCount; + } + + private void executeBatch(int commandCount, + int[] results, + List commands) throws ConnectorException { + try { + int[] batchResults =3D statement.executeBatch(); + addStatementWarnings(); + for (int j =3D 0; j < batchResults.length; j++) { + results[commandCount - 1 - j] =3D batchResults[batchResult= s.length - 1 - j]; + } + commands.clear(); + } catch (SQLException err) { + throw createAndLogError(err, "JDBCQueryExecution.Error_executi= ng_query__3", commands); //$NON-NLS-1$ + } + } + + /** + * @param translatedComm + * @throws ConnectorException + * @since 4.3 + */ + private int executeTranslatedCommand(TranslatedCommand translatedComm)= throws ConnectorException { + // create statement or PreparedStatement and execute + String sql =3D translatedComm.getSql(); + + try { + int updateCount; + if (!translatedComm.isPrepared()) { + updateCount =3D getStatement().executeUpdate(sql); + } else { + PreparedStatement pstatement =3D getPreparedStatement(sql); + sqlTranslator.bindPreparedStatementValues(this.connection,= pstatement, translatedComm); + updateCount =3D pstatement.executeUpdate(); + } = + addStatementWarnings(); + return updateCount; + } catch (SQLException err) { + throw createError(err, translatedComm); + } + } + + /** + * @param command + * @return + * @throws ConnectorException + */ + private boolean getAutoCommit(TranslatedCommand command) throws Connec= torException { + try { + return connection.getAutoCommit(); + } catch (SQLException err) { + throw createAndLogError(err, command); + } + } + + /** + * If the auto comm + * = + * @param exceptionOccurred + * @param command + * @throws ConnectorException + */ + private void restoreAutoCommit(boolean exceptionOccurred, + TranslatedCommand command) throws Conne= ctorException { + try { + if (exceptionOccurred) { + connection.rollback(); + } + connection.setAutoCommit(true); + } catch (SQLException err) { + throw createAndLogError(err, command); + } + } + = + @Override + public int[] getUpdateCounts() throws DataNotAvailableException, + ConnectorException { + return result; + } +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/JDBCUpdateExecution.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/SimpleCapabilities.java (from rev 486, trunk/connectors/connector-jdbc/= src/main/java/com/metamatrix/connector/jdbc/SimpleCapabilities.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= SimpleCapabilities.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= SimpleCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,371 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc; + +import java.util.List; + +import com.metamatrix.connector.api.ConnectorCapabilities; + +/** + * This is a "simple" capabilities class that allows criteria but no = + * complicated joins, subqueries, etc to be passed to the connector. + * This capabilities class may come in handy for testing and for = + * sources that support JDBC but don't support extended JDBC capabilities.= = + */ +public class SimpleCapabilities extends JDBCCapabilities implements Connec= torCapabilities { + + public SimpleCapabilities() { + // Max acceptable by all BQT dbs (Sybase=3D250, Oracle=3D1000) + setMaxInCriteriaSize(250); + } + = + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAndCrite= ria() + */ + public boolean supportsAndCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteria() + */ + public boolean supportsCompareCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteriaEquals() + */ + public boolean supportsCompareCriteriaEquals() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteriaGreaterThan() + */ + public boolean supportsCompareCriteriaGreaterThan() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteriaGreaterThanOrEqual() + */ + public boolean supportsCompareCriteriaGreaterThanOrEqual() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteriaLessThan() + */ + public boolean supportsCompareCriteriaLessThan() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteriaLessThanOrEqual() + */ + public boolean supportsCompareCriteriaLessThanOrEqual() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCompareC= riteriaNotEquals() + */ + public boolean supportsCompareCriteriaNotEquals() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCriteria= () + */ + public boolean supportsCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsInCriter= ia() + */ + public boolean supportsInCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsIsNullCr= iteria() + */ + public boolean supportsIsNullCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsJoins() + */ + public boolean supportsJoins() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsLikeCrit= eria() + */ + public boolean supportsLikeCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsNotCrite= ria() + */ + public boolean supportsNotCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsOrCriter= ia() + */ + public boolean supportsOrCriteria() { + return true; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsSelectDi= stinct() + */ + public boolean supportsSelectDistinct() { + return true; + } + + /** = + * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsSel= ectLiterals() + * @since 4.2 + */ + public boolean supportsSelectLiterals() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAliasedG= roup() + */ + public boolean supportsAliasedGroup() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsSelfJoin= s() + */ + public boolean supportsSelfJoins() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsOuterJoi= ns() + */ + public boolean supportsOuterJoins() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsFullOute= rJoins() + */ + public boolean supportsFullOuterJoins() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsBetweenC= riteria() + */ + public boolean supportsBetweenCriteria() { + return false; + } + + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsLikeCrit= eriaEscapeCharacter() + */ + public boolean supportsLikeCriteriaEscapeCharacter() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsInCriter= iaSubquery() + */ + public boolean supportsInCriteriaSubquery() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsExistsCr= iteria() + */ + public boolean supportsExistsCriteria() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsQuantifi= edCompareCriteria() + */ + public boolean supportsQuantifiedCompareCriteria() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsQuantifi= edCompareCriteriaSome() + */ + public boolean supportsQuantifiedCompareCriteriaSome() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsQuantifi= edCompareCriteriaAll() + */ + public boolean supportsQuantifiedCompareCriteriaAll() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsOrderBy() + */ + public boolean supportsOrderBy() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= es() + */ + public boolean supportsAggregates() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esSum() + */ + public boolean supportsAggregatesSum() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esAvg() + */ + public boolean supportsAggregatesAvg() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esMin() + */ + public boolean supportsAggregatesMin() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esMax() + */ + public boolean supportsAggregatesMax() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esCount() + */ + public boolean supportsAggregatesCount() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esCountStar() + */ + public boolean supportsAggregatesCountStar() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsAggregat= esDistinct() + */ + public boolean supportsAggregatesDistinct() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsScalarSu= bqueries() + */ + public boolean supportsScalarSubqueries() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCorrelat= edSubqueries() + */ + public boolean supportsCorrelatedSubqueries() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsCaseExpr= essions() + */ + public boolean supportsCaseExpressions() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsSearched= CaseExpressions() + */ + public boolean supportsSearchedCaseExpressions() { + return false; + } + + /* = + * @see com.metamatrix.data.api.ConnectorCapabilities#supportsScalarFu= nctions() + */ + public boolean supportsScalarFunctions() { + return false; + } + + /** + * Return null to indicate no functions are supported. + * @return null = + * @see com.metamatrix.connector.api.ConnectorCapabilities#getSupporte= dFunctions() + */ + public List getSupportedFunctions() { + return null; + } + + public boolean supportsInlineViews() { + return false; + } = + + public boolean supportsOrderByInInlineViews() { + return false; + } + + /** = + * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= onOrderBy() + * @since 4.2 + */ + public boolean supportsUnionOrderBy() { + return false; + } + = + /** = + * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= ons() + * @since 4.2 + */ + public boolean supportsUnions() { + return false; + } + +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/SimpleCapabilities.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/access (from rev 486, trunk/connectors/connector-jdbc/src/main/java/com= /metamatrix/connector/jdbc/access) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/access ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/access/AccessCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/access/AccessCapabilities.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= access/AccessCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,9 +22,9 @@ = /* */ -package com.metamatrix.connector.jdbc.access; +package org.teiid.connector.jdbc.access; = -import com.metamatrix.connector.jdbc.JDBCCapabilities; +import org.teiid.connector.jdbc.JDBCCapabilities; = public class AccessCapabilities extends JDBCCapabilities{ /* = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/access/AccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/access/AccessSQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= access/AccessSQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,9 +22,10 @@ = /* */ -package com.metamatrix.connector.jdbc.access; +package org.teiid.connector.jdbc.access; = -import com.metamatrix.connector.jdbc.translator.Translator; +import org.teiid.connector.jdbc.translator.Translator; + import com.metamatrix.connector.language.ILimit; = public class AccessSQLTranslator extends Translator { Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/db2 (from rev 486, trunk/connectors/connector-jdbc/src/main/java/com/me= tamatrix/connector/jdbc/db2) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/db2 ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/db2/DB2Capabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2Capabilities.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2Capabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,12 +22,13 @@ = /* */ -package com.metamatrix.connector.jdbc.db2; +package org.teiid.connector.jdbc.db2; = import java.util.ArrayList; import java.util.List; + +import org.teiid.connector.jdbc.JDBCCapabilities; = -import com.metamatrix.connector.jdbc.JDBCCapabilities; = /** */ Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/db2/DB2ConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2ConvertModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2ConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,332 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.db2; - -import java.util.ArrayList; -import java.util.List; - -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; -import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.*; -import com.metamatrix.connector.language.ICompareCriteria.Operator; - -/** - */ -public class DB2ConvertModifier extends BasicFunctionModifier implements F= unctionModifier { - - private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); - - private ILanguageFactory langFactory; - = - public DB2ConvertModifier(ILanguageFactory langFactory) { - this.langFactory =3D langFactory; - } - - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - Class sourceType =3D args[0].getType(); - String targetTypeString =3D getTargetType(args[1]); - Class targetType =3D TypeFacility.getDataTypeClass(targetTypeStrin= g); - IExpression returnExpr =3D null; - = - if(targetType !=3D null) { - = - // targetType is always lower-case due to getTargetType implem= entation - if(targetType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { = - returnExpr =3D convertToString(args[0], sourceType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.TIMESTA= MP)) { = - returnExpr =3D convertToTimestamp(args[0], sourceType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.DATE)) = { = - returnExpr =3D convertToDate(args[0], sourceType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.TIME)) = { = - returnExpr =3D convertToTime(args[0], sourceType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN= ) || = - targetType.equals(TypeFacility.RUNTIME_TYPES.B= YTE) || = - targetType.equals(TypeFacility.RUNTIME_TYPES.S= HORT)) { = - returnExpr =3D convertToSmallInt(args[0], sourceType, targ= etType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.INTEGER= )) { = - returnExpr =3D convertToInteger(args[0], sourceType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.LONG) |= | = - targetType.equals(TypeFacility.RUNTIME_TYPES.B= IG_INTEGER)) { = - returnExpr =3D convertToBigInt(args[0], sourceType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.FLOAT))= { = - returnExpr =3D convertToReal(args[0], sourceType); - - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.DOUBLE)= ) { = - returnExpr =3D convertToDouble(args[0], sourceType); - - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.BIG_DEC= IMAL)) { = - returnExpr =3D convertToBigDecimal(args[0], sourceType); - - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.CHAR)) = { = - returnExpr =3D convertToChar(args[0], sourceType); - } = - = - if(returnExpr !=3D null) { - return returnExpr; - } - } - = - // Last resort - just drop the convert and let the db figure it out - return DROP_MODIFIER.modify(function); = - } - - /** = - * @param expression - * @return - * @since 4.2 - */ - private String getTargetType(IExpression expression) { - if(expression !=3D null && expression instanceof ILiteral) { - String target =3D (String) ((ILiteral)expression).getValue(); - return target.toLowerCase(); - } = - = - return null; = - } - = - - /** = - * @param expression - * @param sourceType - * @return - * @since 4.2 - */ - private IExpression convertToString(IExpression expression, - Class sourceType) { - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { - // BEFORE: convert(booleanExpression, string) - // AFTER: CASE WHEN booleanExpression =3D 0 THEN 'false' ELSE= 'true' END - - ILiteral literalZero =3D this.langFactory.createLiteral(new In= teger(0), TypeFacility.RUNTIME_TYPES.INTEGER); - ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(Operator.EQ, expression, literalZero); - List whens =3D new ArrayList(1); - whens.add(when); - = - ILiteral literalFalse =3D this.langFactory.createLiteral("fals= e", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - List thens =3D new ArrayList(1); - thens.add(literalFalse); - = - ILiteral literalTrue =3D this.langFactory.createLiteral("true"= , TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - = - return this.langFactory.createSearchedCaseExpression(whens, th= ens, literalTrue, TypeFacility.RUNTIME_TYPES.STRING); - = - } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.CHAR)) { - // Drop convert entirely for char - return null; - = - } else { - // BEFORE: convert(EXPR, string) = - // AFTER: char(EXPR) = - return wrapNewFunction(expression, "char", TypeFacility.RUNTIM= E_TYPES.STRING); //$NON-NLS-1$ = - } - } - = - private IExpression convertToChar(IExpression expression, - Class sourceType) { - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { - ILiteral literalOne =3D this.langFactory.createLiteral(new Int= eger(1), TypeFacility.RUNTIME_TYPES.INTEGER); - return this.langFactory.createFunction("char", new IExpression= [] { expression, literalOne }, TypeFacility.RUNTIME_TYPES.CHAR); //$NON-NLS= -1$ - } = - = - return null; - } - - private IExpression convertToSmallInt(IExpression expression, - Class sourceType, Class targetType= ) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING) && targetT= ype.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { = - // BEFORE: convert(stringExpression, boolean) - // AFTER: CASE WHEN stringExpression =3D 'true' THEN 1 ELSE 0= END - ILiteral literalTrue =3D this.langFactory.createLiteral("true"= , TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(Operator.EQ, expression, literalTrue); - List whens =3D new ArrayList(1); - whens.add(when); - = - ILiteral literalOne =3D this.langFactory.createLiteral(new Int= eger(1), TypeFacility.RUNTIME_TYPES.INTEGER); - List thens =3D new ArrayList(1); - thens.add(literalOne); - = - ILiteral literalZero =3D this.langFactory.createLiteral(new In= teger(0), TypeFacility.RUNTIME_TYPES.INTEGER); - = - return this.langFactory.createSearchedCaseExpression(whens, th= ens, literalZero, TypeFacility.RUNTIME_TYPES.STRING); - = - } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN) || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.BYTE)= || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.SHORT= )){ - = - // Just drop these - return null; - } - - // BEFORE: convert(expression, [boolean,byte,short]) - // AFTER: smallint(expression) - return wrapNewFunction(expression, "smallint", targetType); //$NON= -NLS-1$ - } - - private IExpression convertToInteger(IExpression expression, Class sou= rceType) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN) || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.BYT= E) || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.SHO= RT)){ - = - // Just drop these - return null; - } = - - // BEFORE: convert(expression, integer) - // AFTER: integer(expression) - return wrapNewFunction(expression, "integer", TypeFacility.RUNTI= ME_TYPES.INTEGER); //$NON-NLS-1$ - } - - private IExpression convertToBigInt(IExpression expression, Class sour= ceType) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING) || - sourceType.equals(TypeFacility.RUNTIME_TYPES.FLOAT= ) || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.DOUBL= E) || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.BIG_D= ECIMAL)){ - - // BEFORE: convert(expression, [long, biginteger]) - // AFTER: bigint(expression) - return wrapNewFunction(expression, "bigint", TypeFacility.RUNT= IME_TYPES.LONG); //$NON-NLS-1$ - - } = - - // Just drop anything else - return null; - } - - private IExpression convertToReal(IExpression expression, Class source= Type) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING) || - sourceType.equals(TypeFacility.RUNTIME_TYPES.DOUBL= E) || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.BIG_D= ECIMAL)){ - - // BEFORE: convert(expression, [double, bigdecimal]) - // AFTER: real(expression) - return wrapNewFunction(expression, "real", TypeFacility.RUNTIM= E_TYPES.FLOAT); //$NON-NLS-1$ - - } = - - // Just drop anything else - return null; - } - - private IExpression convertToDouble(IExpression expression, Class sour= ceType) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)){ - - // BEFORE: convert(expression, double) - // AFTER: double(expression) - return wrapNewFunction(expression, "double", TypeFacility.RUNT= IME_TYPES.DOUBLE); //$NON-NLS-1$ - - } = - - // Just drop anything else - return null; - } - - private IExpression convertToBigDecimal(IExpression expression, Class = sourceType) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)){ - - // BEFORE: convert(expression, bigdecimal) - // AFTER: decimal(expression) - return wrapNewFunction(expression, "decimal", TypeFacility.RUN= TIME_TYPES.BIG_DECIMAL); //$NON-NLS-1$ - - } = - - // Just drop anything else - return null; - } - - /** = - * @param expression - * @param sourceType - * @return - * @since 4.2 - */ - private IExpression convertToDate(IExpression expression, - Class sourceType) { - = - // BEFORE: convert(EXPR, date) = - // AFTER: date(EXPR) = - return wrapNewFunction(expression, "date", TypeFacility.RUNTIME_TY= PES.DATE); //$NON-NLS-1$ - } - - private IExpression convertToTime(IExpression expression, Class source= Type) { - = - // BEFORE: convert(EXPR, time) = - // AFTER: time(EXPR) = - return wrapNewFunction(expression, "time", TypeFacility.RUNTIME_TY= PES.DATE); //$NON-NLS-1$ - } - - private IExpression convertToTimestamp(IExpression expression, - Class sourceType) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { - // BEFORE: convert(EXPR, timestamp) - // AFTER: timestamp(expr) - return wrapNewFunction(expression, "timestamp", TypeFacility.R= UNTIME_TYPES.TIMESTAMP); //$NON-NLS-1$ - = - } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.DATE)) { - // BEFORE: convert(EXPR, timestamp) - // AFTER: timestamp(EXPR, '00:00:00') - ILiteral timeString =3D this.langFactory.createLiteral("00:00:= 00", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - return this.langFactory.createFunction("timestamp", new IExpre= ssion[] {expression, timeString}, TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ - = - } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.TIME)) { - // BEFORE: convert(EXPR, timestamp) - // AFTER: timestamp('1970-01-01', EXPR) - ILiteral dateString =3D this.langFactory.createLiteral("1970-0= 1-01", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - return this.langFactory.createFunction("timestamp", new IExpre= ssion[] {dateString, expression}, TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ - } - = - return null; - } - = - /** = - * @param expression - * @param functionName - * @param outputType - * @return - * @since 4.2 - */ - private IFunction wrapNewFunction(IExpression expression, - String functionName, - Class outputType) { - return langFactory.createFunction(functionName, = - new IExpression[] { expression }, - outputType); - } - -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/db2/DB2ConvertModifier.java (from rev 488, trunk/connectors/connector-j= dbc/src/main/java/com/metamatrix/connector/jdbc/db2/DB2ConvertModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2ConvertModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2ConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,334 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.db2; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.DropFunctionModifier; +import org.teiid.connector.jdbc.translator.FunctionModifier; + +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.*; +import com.metamatrix.connector.language.ICompareCriteria.Operator; + +/** + */ +public class DB2ConvertModifier extends BasicFunctionModifier implements F= unctionModifier { + + private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); + + private ILanguageFactory langFactory; + = + public DB2ConvertModifier(ILanguageFactory langFactory) { + this.langFactory =3D langFactory; + } + + public IExpression modify(IFunction function) { + List args =3D function.getParameters(); + Class sourceType =3D args.get(0).getType(); + String targetTypeString =3D getTargetType(args.get(1)); + Class targetType =3D TypeFacility.getDataTypeClass(targetTypeStrin= g); + IExpression returnExpr =3D null; + = + if(targetType !=3D null) { + = + // targetType is always lower-case due to getTargetType implem= entation + if(targetType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { = + returnExpr =3D convertToString(args.get(0), sourceType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.TIMESTA= MP)) { = + returnExpr =3D convertToTimestamp(args.get(0), sourceType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.DATE)) = { = + returnExpr =3D convertToDate(args.get(0), sourceType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.TIME)) = { = + returnExpr =3D convertToTime(args.get(0), sourceType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN= ) || = + targetType.equals(TypeFacility.RUNTIME_TYPES.B= YTE) || = + targetType.equals(TypeFacility.RUNTIME_TYPES.S= HORT)) { = + returnExpr =3D convertToSmallInt(args.get(0), sourceType, = targetType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.INTEGER= )) { = + returnExpr =3D convertToInteger(args.get(0), sourceType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.LONG) |= | = + targetType.equals(TypeFacility.RUNTIME_TYPES.B= IG_INTEGER)) { = + returnExpr =3D convertToBigInt(args.get(0), sourceType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.FLOAT))= { = + returnExpr =3D convertToReal(args.get(0), sourceType); + + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.DOUBLE)= ) { = + returnExpr =3D convertToDouble(args.get(0), sourceType); + + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.BIG_DEC= IMAL)) { = + returnExpr =3D convertToBigDecimal(args.get(0), sourceType= ); + + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.CHAR)) = { = + returnExpr =3D convertToChar(args.get(0), sourceType); + } = + = + if(returnExpr !=3D null) { + return returnExpr; + } + } + = + // Last resort - just drop the convert and let the db figure it out + return DROP_MODIFIER.modify(function); = + } + + /** = + * @param expression + * @return + * @since 4.2 + */ + private String getTargetType(IExpression expression) { + if(expression !=3D null && expression instanceof ILiteral) { + String target =3D (String) ((ILiteral)expression).getValue(); + return target.toLowerCase(); + } = + = + return null; = + } + = + + /** = + * @param expression + * @param sourceType + * @return + * @since 4.2 + */ + private IExpression convertToString(IExpression expression, + Class sourceType) { + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { + // BEFORE: convert(booleanExpression, string) + // AFTER: CASE WHEN booleanExpression =3D 0 THEN 'false' ELSE= 'true' END + + ILiteral literalZero =3D this.langFactory.createLiteral(new In= teger(0), TypeFacility.RUNTIME_TYPES.INTEGER); + ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(Operator.EQ, expression, literalZero); + List whens =3D new ArrayList(1); + whens.add(when); + = + ILiteral literalFalse =3D this.langFactory.createLiteral("fals= e", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ + List thens =3D new ArrayList(1); + thens.add(literalFalse); + = + ILiteral literalTrue =3D this.langFactory.createLiteral("true"= , TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ + = + return this.langFactory.createSearchedCaseExpression(whens, th= ens, literalTrue, TypeFacility.RUNTIME_TYPES.STRING); + = + } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.CHAR)) { + // Drop convert entirely for char + return null; + = + } else { + // BEFORE: convert(EXPR, string) = + // AFTER: char(EXPR) = + return wrapNewFunction(expression, "char", TypeFacility.RUNTIM= E_TYPES.STRING); //$NON-NLS-1$ = + } + } + = + private IExpression convertToChar(IExpression expression, + Class sourceType) { + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { + ILiteral literalOne =3D this.langFactory.createLiteral(new Int= eger(1), TypeFacility.RUNTIME_TYPES.INTEGER); + return this.langFactory.createFunction("char", Arrays.asList(e= xpression, literalOne), TypeFacility.RUNTIME_TYPES.CHAR); //$NON-NLS-1$ + } = + = + return null; + } + + private IExpression convertToSmallInt(IExpression expression, + Class sourceType, Class targetType= ) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING) && targetT= ype.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { = + // BEFORE: convert(stringExpression, boolean) + // AFTER: CASE WHEN stringExpression =3D 'true' THEN 1 ELSE 0= END + ILiteral literalTrue =3D this.langFactory.createLiteral("true"= , TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ + ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(Operator.EQ, expression, literalTrue); + List whens =3D new ArrayList(1); + whens.add(when); + = + ILiteral literalOne =3D this.langFactory.createLiteral(new Int= eger(1), TypeFacility.RUNTIME_TYPES.INTEGER); + List thens =3D new ArrayList(1); + thens.add(literalOne); + = + ILiteral literalZero =3D this.langFactory.createLiteral(new In= teger(0), TypeFacility.RUNTIME_TYPES.INTEGER); + = + return this.langFactory.createSearchedCaseExpression(whens, th= ens, literalZero, TypeFacility.RUNTIME_TYPES.STRING); + = + } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN) || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.BYTE)= || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.SHORT= )){ + = + // Just drop these + return null; + } + + // BEFORE: convert(expression, [boolean,byte,short]) + // AFTER: smallint(expression) + return wrapNewFunction(expression, "smallint", targetType); //$NON= -NLS-1$ + } + + private IExpression convertToInteger(IExpression expression, Class sou= rceType) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN) || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.BYT= E) || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.SHO= RT)){ + = + // Just drop these + return null; + } = + + // BEFORE: convert(expression, integer) + // AFTER: integer(expression) + return wrapNewFunction(expression, "integer", TypeFacility.RUNTI= ME_TYPES.INTEGER); //$NON-NLS-1$ + } + + private IExpression convertToBigInt(IExpression expression, Class sour= ceType) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING) || + sourceType.equals(TypeFacility.RUNTIME_TYPES.FLOAT= ) || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.DOUBL= E) || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.BIG_D= ECIMAL)){ + + // BEFORE: convert(expression, [long, biginteger]) + // AFTER: bigint(expression) + return wrapNewFunction(expression, "bigint", TypeFacility.RUNT= IME_TYPES.LONG); //$NON-NLS-1$ + + } = + + // Just drop anything else + return null; + } + + private IExpression convertToReal(IExpression expression, Class source= Type) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING) || + sourceType.equals(TypeFacility.RUNTIME_TYPES.DOUBL= E) || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.BIG_D= ECIMAL)){ + + // BEFORE: convert(expression, [double, bigdecimal]) + // AFTER: real(expression) + return wrapNewFunction(expression, "real", TypeFacility.RUNTIM= E_TYPES.FLOAT); //$NON-NLS-1$ + + } = + + // Just drop anything else + return null; + } + + private IExpression convertToDouble(IExpression expression, Class sour= ceType) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)){ + + // BEFORE: convert(expression, double) + // AFTER: double(expression) + return wrapNewFunction(expression, "double", TypeFacility.RUNT= IME_TYPES.DOUBLE); //$NON-NLS-1$ + + } = + + // Just drop anything else + return null; + } + + private IExpression convertToBigDecimal(IExpression expression, Class = sourceType) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)){ + + // BEFORE: convert(expression, bigdecimal) + // AFTER: decimal(expression) + return wrapNewFunction(expression, "decimal", TypeFacility.RUN= TIME_TYPES.BIG_DECIMAL); //$NON-NLS-1$ + + } = + + // Just drop anything else + return null; + } + + /** = + * @param expression + * @param sourceType + * @return + * @since 4.2 + */ + private IExpression convertToDate(IExpression expression, + Class sourceType) { + = + // BEFORE: convert(EXPR, date) = + // AFTER: date(EXPR) = + return wrapNewFunction(expression, "date", TypeFacility.RUNTIME_TY= PES.DATE); //$NON-NLS-1$ + } + + private IExpression convertToTime(IExpression expression, Class source= Type) { + = + // BEFORE: convert(EXPR, time) = + // AFTER: time(EXPR) = + return wrapNewFunction(expression, "time", TypeFacility.RUNTIME_TY= PES.DATE); //$NON-NLS-1$ + } + + private IExpression convertToTimestamp(IExpression expression, + Class sourceType) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { + // BEFORE: convert(EXPR, timestamp) + // AFTER: timestamp(expr) + return wrapNewFunction(expression, "timestamp", TypeFacility.R= UNTIME_TYPES.TIMESTAMP); //$NON-NLS-1$ + = + } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.DATE)) { + // BEFORE: convert(EXPR, timestamp) + // AFTER: timestamp(EXPR, '00:00:00') + ILiteral timeString =3D this.langFactory.createLiteral("00:00:= 00", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ + return this.langFactory.createFunction("timestamp", Arrays.asL= ist(expression, timeString), TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ + = + } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.TIME)) { + // BEFORE: convert(EXPR, timestamp) + // AFTER: timestamp('1970-01-01', EXPR) + ILiteral dateString =3D this.langFactory.createLiteral("1970-0= 1-01", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ + return this.langFactory.createFunction("timestamp", Arrays.asL= ist(dateString, expression), TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ + } + = + return null; + } + = + /** = + * @param expression + * @param functionName + * @param outputType + * @return + * @since 4.2 + */ + private IFunction wrapNewFunction(IExpression expression, + String functionName, + Class outputType) { + return langFactory.createFunction(functionName, = + Arrays.asList(expression), + outputType); + } + +} Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/db2/DB2SQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/db2/DB2SQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2SQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,87 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.db2; - -import java.util.Arrays; - -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.translator.AliasModifier; -import com.metamatrix.connector.jdbc.translator.Translator; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IJoin; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.ICompareCriteria.Operator; -import com.metamatrix.connector.language.IJoin.JoinType; -import com.metamatrix.connector.visitor.framework.HierarchyVisitor; - -/** - */ -public class DB2SQLTranslator extends Translator { - - @Override - public void initialize(ConnectorEnvironment env) throws ConnectorExceptio= n { - super.initialize(env); - registerFunctionModifier(SourceSystemFunctions.CONVERT, new DB2Con= vertModifier(getLanguageFactory())); //$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.CHAR, new AliasModi= fier("chr")); //$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new Ali= asModifier("day")); //$NON-NLS-1$ //$NON-NLS-2$ = - registerFunctionModifier(SourceSystemFunctions.IFNULL, new AliasMo= difier("coalesce")); //$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.SUBSTRING, new Alia= sModifier("substr")); //$NON-NLS-1$ //$NON-NLS-2$ - } - = - @Override - public String addLimitString(String queryCommand, ILimit limit) { - return queryCommand + " FETCH FIRST " + limit.getRowLimit() + " ROWS ONL= Y"; //$NON-NLS-1$ - } - = - @Override - public ICommand modifyCommand(ICommand command, ExecutionContext context) - throws ConnectorException { - HierarchyVisitor hierarchyVisitor =3D new HierarchyVisitor() { - @Override - public void visit(IJoin obj) { - if (obj.getJoinType() !=3D JoinType.CROSS_JOIN) { - return; - } - ILiteral one =3D getLanguageFactory().createLiteral(1, TypeFacility.RU= NTIME_TYPES.INTEGER); - obj.setCriteria(Arrays.asList(getLanguageFactory().createCompareCriter= ia(Operator.EQ, one, one))); - obj.setJoinType(JoinType.INNER_JOIN); - } - }; - = - command.acceptVisitor(hierarchyVisitor); - return command; - } - = - @Override - public String getDefaultConnectionTestQuery() { - return "Select 'x' from sysibm.systables where 1 =3D 2"; //$NON-NLS-1$ - } - = -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/db2/DB2SQLTranslator.java (from rev 488, trunk/connectors/connector-jdb= c/src/main/java/com/metamatrix/connector/jdbc/db2/DB2SQLTranslator.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2SQLTranslator.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2SQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ +package org.teiid.connector.jdbc.db2; + +import org.teiid.connector.jdbc.translator.AliasModifier; +import org.teiid.connector.jdbc.translator.Translator; + +import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.SourceSystemFunctions; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.ICommand; +import com.metamatrix.connector.language.IJoin; +import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.ICompareCriteria.Operator; +import com.metamatrix.connector.language.IJoin.JoinType; +import com.metamatrix.connector.visitor.framework.HierarchyVisitor; + +/** + */ +public class DB2SQLTranslator extends Translator { + + @Override + public void initialize(ConnectorEnvironment env) throws ConnectorExceptio= n { + super.initialize(env); + registerFunctionModifier(SourceSystemFunctions.CONVERT, new DB2Con= vertModifier(getLanguageFactory())); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.CHAR, new AliasModi= fier("chr")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new Ali= asModifier("day")); //$NON-NLS-1$ //$NON-NLS-2$ = + registerFunctionModifier(SourceSystemFunctions.IFNULL, new AliasMo= difier("coalesce")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.SUBSTRING, new Alia= sModifier("substr")); //$NON-NLS-1$ //$NON-NLS-2$ + } + = + @Override + public String addLimitString(String queryCommand, ILimit limit) { + return queryCommand + " FETCH FIRST " + limit.getRowLimit() + " ROWS ONL= Y"; //$NON-NLS-1$ + } + = + @Override + public ICommand modifyCommand(ICommand command, ExecutionContext context) + throws ConnectorException { + HierarchyVisitor hierarchyVisitor =3D new HierarchyVisitor() { + @Override + public void visit(IJoin obj) { + if (obj.getJoinType() !=3D JoinType.CROSS_JOIN) { + return; + } + ILiteral one =3D getLanguageFactory().createLiteral(1, TypeFacility.RU= NTIME_TYPES.INTEGER); + obj.getCriteria().add(getLanguageFactory().createCompareCriteria(Opera= tor.EQ, one, one)); + obj.setJoinType(JoinType.INNER_JOIN); + } + }; + = + command.acceptVisitor(hierarchyVisitor); + return command; + } + = + @Override + public String getDefaultConnectionTestQuery() { + return "Select 'x' from sysibm.systables where 1 =3D 2"; //$NON-NLS-1$ + } + = +} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/derby (from rev 486, trunk/connectors/connector-jdbc/src/main/java/com/= metamatrix/connector/jdbc/derby) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/derby ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/derby/DerbyCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyCapabilities.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbyCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,12 +20,13 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.derby; +package org.teiid.connector.jdbc.derby; = import java.util.ArrayList; import java.util.List; + +import org.teiid.connector.jdbc.JDBCCapabilities; = -import com.metamatrix.connector.jdbc.JDBCCapabilities; = = /** = Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/derby/DerbyConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbyConvertModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbyConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,370 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.derby; - -import java.util.ArrayList; -import java.util.List; - -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; -import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.*; -import com.metamatrix.connector.language.ICompareCriteria.Operator; - -/** - */ -public class DerbyConvertModifier extends BasicFunctionModifier implements= FunctionModifier { - - private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); - - private ILanguageFactory langFactory; - = - public DerbyConvertModifier(ILanguageFactory langFactory) { - this.langFactory =3D langFactory; - } - - /** = - * @see com.metamatrix.connector.jdbc.translator.BasicFunctionModifier= #translate(com.metamatrix.connector.language.IFunction) - * @since 5.0 - */ - public List translate(IFunction function) { - // For anything that doesn't get modified to some other function, = translate the convert(expr, type) - // to cast(expr as type). - = - List parts =3D new ArrayList(); - parts.add("cast("); //$NON-NLS-1$ - parts.add(function.getParameters()[0]); - parts.add(" as "); //$NON-NLS-1$ - ILiteral type =3D (ILiteral) function.getParameters()[1]; = - parts.add(type.getValue()); - parts.add(")"); //$NON-NLS-1$ - = - return parts; - } - = - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - Class sourceType =3D args[0].getType(); - String targetTypeString =3D getTargetType(args[1]); - Class targetType =3D TypeFacility.getDataTypeClass(targetTypeStrin= g); - IExpression returnExpr =3D null; - = - if(targetType !=3D null) { - = - // targetType is always lower-case due to getTargetType implem= entation - if(targetType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { = - returnExpr =3D convertToString(args[0], sourceType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.TIMESTA= MP)) { = - returnExpr =3D convertToTimestamp(args[0], sourceType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.DATE)) = { = - returnExpr =3D convertToDate(args[0], sourceType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.TIME)) = { = - returnExpr =3D convertToTime(args[0], sourceType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN= ) || = - targetType.equals(TypeFacility.RUNTIME_TYPES.B= YTE) || = - targetType.equals(TypeFacility.RUNTIME_TYPES.S= HORT)) { = - returnExpr =3D convertToSmallInt(args[0], sourceType, targ= etType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.INTEGER= )) { = - returnExpr =3D convertToInteger(args[0], sourceType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.LONG) |= | = - targetType.equals(TypeFacility.RUNTIME_TYPES.B= IG_INTEGER)) { = - returnExpr =3D convertToBigInt(args[0], sourceType); - = - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.FLOAT))= { = - returnExpr =3D convertToFloat(args[0], sourceType); - - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.DOUBLE)= ) { = - returnExpr =3D convertToDouble(args[0], sourceType); - - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.BIG_DEC= IMAL)) { = - returnExpr =3D convertToBigDecimal(args[0], sourceType); - - } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.CHAR)) = { = - returnExpr =3D convertToChar(args[0], sourceType); - } = - = - if(returnExpr !=3D null) { - return returnExpr; - } - } - = - // Last resort - just drop the convert and let the db figure it out - return DROP_MODIFIER.modify(function); = - } - - /** = - * @param expression - * @return - * @since 4.2 - */ - private String getTargetType(IExpression expression) { - if(expression !=3D null && expression instanceof ILiteral) { - String target =3D (String) ((ILiteral)expression).getValue(); - return target.toLowerCase(); - } = - = - return null; = - } - = - - /** = - * @param expression - * @param sourceType - * @return - * @since 4.2 - */ - private IExpression convertToString(IExpression expression, - Class sourceType) { - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { - // BEFORE: convert(booleanExpression, string) - // AFTER: CASE WHEN booleanExpression =3D 0 THEN 'false' ELSE= 'true' END - - ILiteral literalZero =3D this.langFactory.createLiteral(new In= teger(0), TypeFacility.RUNTIME_TYPES.INTEGER); - ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(Operator.EQ, expression, literalZero); - List whens =3D new ArrayList(1); - whens.add(when); - = - ILiteral literalFalse =3D this.langFactory.createLiteral("fals= e", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - List thens =3D new ArrayList(1); - thens.add(literalFalse); - = - ILiteral literalTrue =3D this.langFactory.createLiteral("true"= , TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - = - return this.langFactory.createSearchedCaseExpression(whens, th= ens, literalTrue, TypeFacility.RUNTIME_TYPES.STRING); - = - } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.CHAR)) { - // Drop convert entirely for char - return null; - = - } else { - // BEFORE: convert(EXPR, string) = - // AFTER: char(EXPR) = - return wrapNewFunction(expression, "char", TypeFacility.RUNTIM= E_TYPES.STRING); //$NON-NLS-1$ = - } - } - = - private IExpression convertToChar(IExpression expression, - Class sourceType) { - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { - ILiteral literalOne =3D this.langFactory.createLiteral(new Int= eger(1), TypeFacility.RUNTIME_TYPES.INTEGER); - return this.langFactory.createFunction("char", new IExpression= [] { expression, literalOne }, TypeFacility.RUNTIME_TYPES.CHAR); //$NON-NLS= -1$ - } = - = - return null; - } - - private IExpression convertToSmallInt(IExpression expression, - Class sourceType, Class targetType= ) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING) && targetT= ype.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { = - // BEFORE: convert(stringExpression, boolean) - // AFTER: CASE WHEN stringExpression =3D 'true' THEN 1 ELSE 0= END - ILiteral literalTrue =3D this.langFactory.createLiteral("true"= , TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(Operator.EQ, expression, literalTrue); - List whens =3D new ArrayList(1); - whens.add(when); - = - ILiteral literalOne =3D this.langFactory.createLiteral(new Int= eger(1), TypeFacility.RUNTIME_TYPES.INTEGER); - List thens =3D new ArrayList(1); - thens.add(literalOne); - = - ILiteral literalZero =3D this.langFactory.createLiteral(new In= teger(0), TypeFacility.RUNTIME_TYPES.INTEGER); - = - return this.langFactory.createSearchedCaseExpression(whens, th= ens, literalZero, TypeFacility.RUNTIME_TYPES.STRING); - = - } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN) || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.BYTE)= || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.SHORT= )){ - = - // Just drop these - return null; - } - - // BEFORE: convert(expression, [boolean,byte,short]) - // AFTER: smallint(expression) - return wrapNewFunction(expression, "smallint", targetType); //$NON= -NLS-1$ - } - - private IExpression convertToInteger(IExpression expression, Class sou= rceType) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN) || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.BYT= E) || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.SHO= RT)){ - = - // Just drop these - return null; - } = - - // BEFORE: convert(expression, integer) - // AFTER: integer(expression) - return wrapNewFunction(expression, "integer", TypeFacility.RUNTI= ME_TYPES.INTEGER); //$NON-NLS-1$ - } - - private IExpression convertToBigInt(IExpression expression, Class sour= ceType) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING) || - sourceType.equals(TypeFacility.RUNTIME_TYPES.FLOAT= ) || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.DOUBL= E) || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.BIG_D= ECIMAL)){ - - // BEFORE: convert(expression, [long, biginteger]) - // AFTER: bigint(expression) - return wrapNewFunction(expression, "bigint", TypeFacility.RUNT= IME_TYPES.LONG); //$NON-NLS-1$ - - } = - - // Just drop anything else - return null; - } - - private IExpression convertToFloat(IExpression expression, Class sourc= eType) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)){ - - // BEFORE: convert(string_expr, float) - // AFTER: cast(cast(string_expr as decimal) as float) - IFunction inner =3D langFactory.createFunction("convert", //$= NON-NLS-1$ - new IExpression[] { expression, langFactory.createLiteral(= "decimal", TypeFacility.RUNTIME_TYPES.STRING) }, //$NON-NLS-1$ - TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); - - IFunction outer =3D langFactory.createFunction("convert", //$= NON-NLS-1$ - new IExpression[] { inner, langFactory.createLiteral("floa= t", TypeFacility.RUNTIME_TYPES.STRING) }, //$NON-NLS-1$ - TypeFacility.RUNTIME_TYPES.FLOAT); - - return outer; = - - } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.DOUBLE) || = - sourceType.equals(TypeFacility.RUNTIME_TYPES.BIG_D= ECIMAL)) { - = - // BEFORE: convert(num_expr, float) - // AFTER: cast(num_expr as float) - return langFactory.createFunction("convert", //$NON-NLS-1$ - new IExpression[] { expression, langFactory.createLiteral(= "float", TypeFacility.RUNTIME_TYPES.STRING) }, //$NON-NLS-1$ - TypeFacility.RUNTIME_TYPES.FLOAT); - } - - // Just drop anything else - return null; - } - - private IExpression convertToDouble(IExpression expression, Class sour= ceType) { - - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)){ - // BEFORE: convert(string_expr, double) - // AFTER: cast(cast(string_expr as decimal) as double) - IFunction inner =3D langFactory.createFunction("convert", //$= NON-NLS-1$ - new IExpression[] { expression, langFactory.createLiteral(= "decimal", TypeFacility.RUNTIME_TYPES.STRING) }, //$NON-NLS-1$ - TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); - - return langFactory.createFunction("convert", //$NON-NLS-1$ - new IExpression[] { inner, langFactory.createLiteral("doub= le", TypeFacility.RUNTIME_TYPES.STRING) }, //$NON-NLS-1$ - TypeFacility.RUNTIME_TYPES.DOUBLE); - } - - // Just drop anything else - return null; - } - - private IExpression convertToBigDecimal(IExpression expression, Class = sourceType) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)){ - // BEFORE: convert(string_expr, bigdecimal) - // AFTER: cast(string_expr as decimal) - return langFactory.createFunction("convert", //$NON-NLS-1$ - new IExpression[] { expression, langFactory.createLiteral(= "decimal", TypeFacility.RUNTIME_TYPES.STRING) }, //$NON-NLS-1$ - TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); - } - - // Just drop anything else - return null; - } - - /** = - * @param expression - * @param sourceType - * @return - * @since 4.2 - */ - private IExpression convertToDate(IExpression expression, - Class sourceType) { - = - // BEFORE: convert(EXPR, date) = - // AFTER: date(EXPR) = - return wrapNewFunction(expression, "date", TypeFacility.RUNTIME_TY= PES.DATE); //$NON-NLS-1$ - } - - private IExpression convertToTime(IExpression expression, - Class sourceType) { - = - // BEFORE: convert(EXPR, time) = - // AFTER: time(EXPR) = - return wrapNewFunction(expression, "time", TypeFacility.RUNTIME_TY= PES.DATE); //$NON-NLS-1$ - } - - private IExpression convertToTimestamp(IExpression expression, - Class sourceType) { - = - if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { - // BEFORE: convert(EXPR, timestamp) - // AFTER: timestamp(expr) - return wrapNewFunction(expression, "timestamp", TypeFacility.R= UNTIME_TYPES.TIMESTAMP); //$NON-NLS-1$ - = - } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.DATE)) { - // BEFORE: convert(EXPR, timestamp) - // AFTER: timestamp(EXPR, '00:00:00') - ILiteral timeString =3D this.langFactory.createLiteral("00:00:= 00", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - return this.langFactory.createFunction("timestamp", new IExpre= ssion[] {expression, timeString}, TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ - = - } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.TIME)) { - // BEFORE: convert(EXPR, timestamp) - // AFTER: timestamp(EXPR, '1970-01-01', EXPR) - ILiteral dateString =3D this.langFactory.createLiteral("1970-0= 1-01", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ - return this.langFactory.createFunction("timestamp", new IExpre= ssion[] {dateString, expression}, TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ - } - = - return null; - } - = - /** = - * @param expression - * @param functionName - * @param outputType - * @return - * @since 4.2 - */ - private IFunction wrapNewFunction(IExpression expression, - String functionName, - Class outputType) { - return langFactory.createFunction(functionName, = - new IExpression[] { expression }, - outputType); - } - -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/derby/DerbyConvertModifier.java (from rev 488, trunk/connectors/connect= or-jdbc/src/main/java/com/metamatrix/connector/jdbc/derby/DerbyConvertModif= ier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbyConvertModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbyConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,372 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.derby; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.DropFunctionModifier; +import org.teiid.connector.jdbc.translator.FunctionModifier; + +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.*; +import com.metamatrix.connector.language.ICompareCriteria.Operator; + +/** + */ +public class DerbyConvertModifier extends BasicFunctionModifier implements= FunctionModifier { + + private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); + + private ILanguageFactory langFactory; + = + public DerbyConvertModifier(ILanguageFactory langFactory) { + this.langFactory =3D langFactory; + } + + /** = + * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#tran= slate(com.metamatrix.connector.language.IFunction) + * @since 5.0 + */ + public List translate(IFunction function) { + // For anything that doesn't get modified to some other function, = translate the convert(expr, type) + // to cast(expr as type). + = + List parts =3D new ArrayList(); + parts.add("cast("); //$NON-NLS-1$ + parts.add(function.getParameters().get(0)); + parts.add(" as "); //$NON-NLS-1$ + ILiteral type =3D (ILiteral) function.getParameters().get(1); = = + parts.add(type.getValue()); + parts.add(")"); //$NON-NLS-1$ + = + return parts; + } + = + public IExpression modify(IFunction function) { + List args =3D function.getParameters(); + Class sourceType =3D args.get(0).getType(); + String targetTypeString =3D getTargetType(args.get(1)); + Class targetType =3D TypeFacility.getDataTypeClass(targetTypeStrin= g); + IExpression returnExpr =3D null; + = + if(targetType !=3D null) { + = + // targetType is always lower-case due to getTargetType implem= entation + if(targetType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { = + returnExpr =3D convertToString(args.get(0), sourceType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.TIMESTA= MP)) { = + returnExpr =3D convertToTimestamp(args.get(0), sourceType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.DATE)) = { = + returnExpr =3D convertToDate(args.get(0), sourceType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.TIME)) = { = + returnExpr =3D convertToTime(args.get(0), sourceType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN= ) || = + targetType.equals(TypeFacility.RUNTIME_TYPES.B= YTE) || = + targetType.equals(TypeFacility.RUNTIME_TYPES.S= HORT)) { = + returnExpr =3D convertToSmallInt(args.get(0), sourceType, = targetType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.INTEGER= )) { = + returnExpr =3D convertToInteger(args.get(0), sourceType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.LONG) |= | = + targetType.equals(TypeFacility.RUNTIME_TYPES.B= IG_INTEGER)) { = + returnExpr =3D convertToBigInt(args.get(0), sourceType); + = + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.FLOAT))= { = + returnExpr =3D convertToFloat(args.get(0), sourceType); + + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.DOUBLE)= ) { = + returnExpr =3D convertToDouble(args.get(0), sourceType); + + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.BIG_DEC= IMAL)) { = + returnExpr =3D convertToBigDecimal(args.get(0), sourceType= ); + + } else if(targetType.equals(TypeFacility.RUNTIME_TYPES.CHAR)) = { = + returnExpr =3D convertToChar(args.get(0), sourceType); + } = + = + if(returnExpr !=3D null) { + return returnExpr; + } + } + = + // Last resort - just drop the convert and let the db figure it out + return DROP_MODIFIER.modify(function); = + } + + /** = + * @param expression + * @return + * @since 4.2 + */ + private String getTargetType(IExpression expression) { + if(expression !=3D null && expression instanceof ILiteral) { + String target =3D (String) ((ILiteral)expression).getValue(); + return target.toLowerCase(); + } = + = + return null; = + } + = + + /** = + * @param expression + * @param sourceType + * @return + * @since 4.2 + */ + private IExpression convertToString(IExpression expression, + Class sourceType) { + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { + // BEFORE: convert(booleanExpression, string) + // AFTER: CASE WHEN booleanExpression =3D 0 THEN 'false' ELSE= 'true' END + + ILiteral literalZero =3D this.langFactory.createLiteral(new In= teger(0), TypeFacility.RUNTIME_TYPES.INTEGER); + ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(Operator.EQ, expression, literalZero); + List whens =3D new ArrayList(1); + whens.add(when); + = + ILiteral literalFalse =3D this.langFactory.createLiteral("fals= e", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ + List thens =3D new ArrayList(1); + thens.add(literalFalse); + = + ILiteral literalTrue =3D this.langFactory.createLiteral("true"= , TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ + = + return this.langFactory.createSearchedCaseExpression(whens, th= ens, literalTrue, TypeFacility.RUNTIME_TYPES.STRING); + = + } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.CHAR)) { + // Drop convert entirely for char + return null; + = + } else { + // BEFORE: convert(EXPR, string) = + // AFTER: char(EXPR) = + return wrapNewFunction(expression, "char", TypeFacility.RUNTIM= E_TYPES.STRING); //$NON-NLS-1$ = + } + } + = + private IExpression convertToChar(IExpression expression, + Class sourceType) { + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { + ILiteral literalOne =3D this.langFactory.createLiteral(new Int= eger(1), TypeFacility.RUNTIME_TYPES.INTEGER); + return this.langFactory.createFunction("char", Arrays.asList( = expression, literalOne ), TypeFacility.RUNTIME_TYPES.CHAR); //$NON-NLS-1$ + } = + = + return null; + } + + private IExpression convertToSmallInt(IExpression expression, + Class sourceType, Class targetType= ) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING) && targetT= ype.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { = + // BEFORE: convert(stringExpression, boolean) + // AFTER: CASE WHEN stringExpression =3D 'true' THEN 1 ELSE 0= END + ILiteral literalTrue =3D this.langFactory.createLiteral("true"= , TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ + ICompareCriteria when =3D this.langFactory.createCompareCriter= ia(Operator.EQ, expression, literalTrue); + List whens =3D new ArrayList(1); + whens.add(when); + = + ILiteral literalOne =3D this.langFactory.createLiteral(new Int= eger(1), TypeFacility.RUNTIME_TYPES.INTEGER); + List thens =3D new ArrayList(1); + thens.add(literalOne); + = + ILiteral literalZero =3D this.langFactory.createLiteral(new In= teger(0), TypeFacility.RUNTIME_TYPES.INTEGER); + = + return this.langFactory.createSearchedCaseExpression(whens, th= ens, literalZero, TypeFacility.RUNTIME_TYPES.STRING); + = + } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN) || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.BYTE)= || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.SHORT= )){ + = + // Just drop these + return null; + } + + // BEFORE: convert(expression, [boolean,byte,short]) + // AFTER: smallint(expression) + return wrapNewFunction(expression, "smallint", targetType); //$NON= -NLS-1$ + } + + private IExpression convertToInteger(IExpression expression, Class sou= rceType) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN) || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.BYT= E) || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.SHO= RT)){ + = + // Just drop these + return null; + } = + + // BEFORE: convert(expression, integer) + // AFTER: integer(expression) + return wrapNewFunction(expression, "integer", TypeFacility.RUNTI= ME_TYPES.INTEGER); //$NON-NLS-1$ + } + + private IExpression convertToBigInt(IExpression expression, Class sour= ceType) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING) || + sourceType.equals(TypeFacility.RUNTIME_TYPES.FLOAT= ) || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.DOUBL= E) || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.BIG_D= ECIMAL)){ + + // BEFORE: convert(expression, [long, biginteger]) + // AFTER: bigint(expression) + return wrapNewFunction(expression, "bigint", TypeFacility.RUNT= IME_TYPES.LONG); //$NON-NLS-1$ + + } = + + // Just drop anything else + return null; + } + + private IExpression convertToFloat(IExpression expression, Class sourc= eType) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)){ + + // BEFORE: convert(string_expr, float) + // AFTER: cast(cast(string_expr as decimal) as float) + IFunction inner =3D langFactory.createFunction("convert", //$= NON-NLS-1$ + Arrays.asList( expression, langFactory.createLiteral("deci= mal", TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ + TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); + + IFunction outer =3D langFactory.createFunction("convert", //$= NON-NLS-1$ + Arrays.asList( inner, langFactory.createLiteral("float", T= ypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ + TypeFacility.RUNTIME_TYPES.FLOAT); + + return outer; = + + } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.DOUBLE) || = + sourceType.equals(TypeFacility.RUNTIME_TYPES.BIG_D= ECIMAL)) { + = + // BEFORE: convert(num_expr, float) + // AFTER: cast(num_expr as float) + return langFactory.createFunction("convert", //$NON-NLS-1$ + Arrays.asList( expression, langFactory.createLiteral("floa= t", TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ + TypeFacility.RUNTIME_TYPES.FLOAT); + } + + // Just drop anything else + return null; + } + + private IExpression convertToDouble(IExpression expression, Class sour= ceType) { + + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)){ + // BEFORE: convert(string_expr, double) + // AFTER: cast(cast(string_expr as decimal) as double) + IFunction inner =3D langFactory.createFunction("convert", //$= NON-NLS-1$ + Arrays.asList( expression, langFactory.createLiteral("deci= mal", TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ + TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); + + return langFactory.createFunction("convert", //$NON-NLS-1$ + Arrays.asList( inner, langFactory.createLiteral("double", = TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ + TypeFacility.RUNTIME_TYPES.DOUBLE); + } + + // Just drop anything else + return null; + } + + private IExpression convertToBigDecimal(IExpression expression, Class = sourceType) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)){ + // BEFORE: convert(string_expr, bigdecimal) + // AFTER: cast(string_expr as decimal) + return langFactory.createFunction("convert", //$NON-NLS-1$ + Arrays.asList( expression, langFactory.createLiteral("deci= mal", TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ + TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); + } + + // Just drop anything else + return null; + } + + /** = + * @param expression + * @param sourceType + * @return + * @since 4.2 + */ + private IExpression convertToDate(IExpression expression, + Class sourceType) { + = + // BEFORE: convert(EXPR, date) = + // AFTER: date(EXPR) = + return wrapNewFunction(expression, "date", TypeFacility.RUNTIME_TY= PES.DATE); //$NON-NLS-1$ + } + + private IExpression convertToTime(IExpression expression, + Class sourceType) { + = + // BEFORE: convert(EXPR, time) = + // AFTER: time(EXPR) = + return wrapNewFunction(expression, "time", TypeFacility.RUNTIME_TY= PES.DATE); //$NON-NLS-1$ + } + + private IExpression convertToTimestamp(IExpression expression, + Class sourceType) { + = + if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)) { + // BEFORE: convert(EXPR, timestamp) + // AFTER: timestamp(expr) + return wrapNewFunction(expression, "timestamp", TypeFacility.R= UNTIME_TYPES.TIMESTAMP); //$NON-NLS-1$ + = + } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.DATE)) { + // BEFORE: convert(EXPR, timestamp) + // AFTER: timestamp(EXPR, '00:00:00') + ILiteral timeString =3D this.langFactory.createLiteral("00:00:= 00", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ + return this.langFactory.createFunction("timestamp", Arrays.asL= ist(expression, timeString), TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ + = + } else if(sourceType.equals(TypeFacility.RUNTIME_TYPES.TIME)) { + // BEFORE: convert(EXPR, timestamp) + // AFTER: timestamp(EXPR, '1970-01-01', EXPR) + ILiteral dateString =3D this.langFactory.createLiteral("1970-0= 1-01", TypeFacility.RUNTIME_TYPES.STRING); //$NON-NLS-1$ + return this.langFactory.createFunction("timestamp", Arrays.asL= ist(dateString, expression), TypeFacility.RUNTIME_TYPES.TIMESTAMP); = //$NON-NLS-1$ + } + = + return null; + } + = + /** = + * @param expression + * @param functionName + * @param outputType + * @return + * @since 4.2 + */ + private IFunction wrapNewFunction(IExpression expression, + String functionName, + Class outputType) { + return langFactory.createFunction(functionName, = + Arrays.asList( expression ), + outputType); + } + +} Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/derby/DerbySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/derby/DerbySQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbySQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,14 +20,15 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.derby; +package org.teiid.connector.jdbc.derby; = +import org.teiid.connector.jdbc.translator.AliasModifier; +import org.teiid.connector.jdbc.translator.EscapeSyntaxModifier; +import org.teiid.connector.jdbc.translator.Translator; + import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.jdbc.translator.AliasModifier; -import com.metamatrix.connector.jdbc.translator.EscapeSyntaxModifier; -import com.metamatrix.connector.jdbc.translator.Translator; = = /** = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/informix (from rev 486, trunk/connectors/connector-jdbc/src/main/java/c= om/metamatrix/connector/jdbc/informix) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/informix ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/informix/InformixCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixCapabilities.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= informix/InformixCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,12 +22,13 @@ = /* */ -package com.metamatrix.connector.jdbc.informix; +package org.teiid.connector.jdbc.informix; = import java.util.*; = -import com.metamatrix.connector.jdbc.JDBCCapabilities; +import org.teiid.connector.jdbc.JDBCCapabilities; = + /** */ public class InformixCapabilities extends JDBCCapabilities { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/informix/InformixSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/informix/InformixSQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= informix/InformixSQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,13 +22,14 @@ = /* */ -package com.metamatrix.connector.jdbc.informix; +package org.teiid.connector.jdbc.informix; = +import org.teiid.connector.jdbc.translator.DropFunctionModifier; +import org.teiid.connector.jdbc.translator.Translator; + import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; -import com.metamatrix.connector.jdbc.translator.Translator; = /** */ Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/mm (from rev 486, trunk/connectors/connector-jdbc/src/main/java/com/met= amatrix/connector/jdbc/mm) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/mm ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/mm/MMCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mm/MMCapabilities.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mm/MMCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,13 +22,14 @@ = /* */ -package com.metamatrix.connector.jdbc.mm; +package org.teiid.connector.jdbc.mm; = import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.jdbc.JDBCCapabilities; +import org.teiid.connector.jdbc.JDBCCapabilities; = + /** = * @since 4.3 */ Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/mysql (from rev 486, trunk/connectors/connector-jdbc/src/main/java/com/= metamatrix/connector/jdbc/mysql) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/mysql ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/mysql/MySQLCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLCapabilities.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mysql/MySQLCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,12 +20,13 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.mysql; +package org.teiid.connector.jdbc.mysql; = import java.util.ArrayList; import java.util.List; + +import org.teiid.connector.jdbc.JDBCCapabilities; = -import com.metamatrix.connector.jdbc.JDBCCapabilities; = = /** = Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/mysql/MySQLConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLConvertModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mysql/MySQLConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,184 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.mysql; - -import java.util.Arrays; -import java.util.List; - -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.ICompareCriteria.Operator; - - -/** = - * @since 4.3 - */ -class MySQLConvertModifier extends BasicFunctionModifier { - = - private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); - = - private ILanguageFactory langFactory; - = - MySQLConvertModifier(ILanguageFactory langFactory) { - this.langFactory =3D langFactory; - } - - public List translate(IFunction function) { - return null; - } - - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - - if (args[0] !=3D null && args[0] instanceof ILiteral && ((ILiteral= )args[0]).getValue() =3D=3D null ) { - if (args[1] !=3D null && args[1] instanceof ILiteral) { - // This is a convert(null, ...) or cast(null as ...) - return DROP_MODIFIER.modify(function); - } - } = - = - if (args[1] !=3D null && args[1] instanceof ILiteral) { - String target =3D ((String)((ILiteral)args[1]).getValue()).toL= owerCase(); - if (target.equals("string")) { //$NON-NLS-1$ = - return convertToString(function); - } else if (target.equals("byte") || //$NON-NLS-1$ - target.equals("short") || //$NON-NLS-1$ - target.equals("integer")) { //$NON-NLS-1$ = - return convertToNativeType(function, "SIGNED INTEGER"); //= $NON-NLS-1$ - } else if (target.equals("long") || //$NON-NLS-1$ - target.equals("biginteger")) { //$NON-NLS-1$ = - return convertToNativeType(function, "SIGNED"); //$NON-NLS= -1$ - } else if (target.equals("float") || //$NON-NLS-1$ - target.equals("double") || //$NON-NLS-1$ - target.equals("bigdecimal")) { //$NON-NLS-1$ = - return convertToNumeric(function); = - } else if (target.equals("date")) { //$NON-NLS-1$ = - return convertToDateTime("DATE", args[0], java.sql.Date.cl= ass); //$NON-NLS-1$ - } else if (target.equals("time")) { //$NON-NLS-1$ = - return convertToDateTime("TIME", args[0], java.sql.Time.cl= ass); //$NON-NLS-1$ - } else if (target.equals("timestamp")) { //$NON-NLS-1$ = - return convertToDateTime("TIMESTAMP", args[0], java.sql.Ti= mestamp.class); //$NON-NLS-1$ - } else if (target.equals("char")) { //$NON-NLS-1$ = - return convertToNativeType(function, "CHAR (1)"); //$NON-N= LS-1$ - } else if (target.equals("boolean")) { //$NON-NLS-1$ = - return convertToBoolean(function); - } - } - return DROP_MODIFIER.modify(function); = - } - = - private IExpression convertToString(IFunction function) { - int srcCode =3D getSrcCode(function); - switch(srcCode) { - case BOOLEAN: - // convert(booleanSrc, string) --> CASE WHEN booleanSrc TH= EN '1' ELSE '0' END - List when =3D Arrays.asList(langFactory.createCompareCrite= ria(Operator.EQ, function.getParameters()[0], langFactory.createLiteral(Boo= lean.TRUE, Boolean.class))); - List then =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral("1", String.class)}); //$NON-NLS-1$ - IExpression elseExpr =3D langFactory.createLiteral("0", St= ring.class); //$NON-NLS-1$ - return langFactory.createSearchedCaseExpression(when, then= , elseExpr, String.class); - case BYTE: - case SHORT: - case INTEGER: - case LONG: - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - // convert(src, string) --> convert(src, CHAR) - return convertToNativeType(function, "CHAR"); //$NON-NLS-1$ - case DATE: - // convert (dateSrc, string) --> date_format(dateSrc, '%Y-= %m-%d') - return convertDateTimeToString(function, "%Y-%m-%d"); //$N= ON-NLS-1$ - case TIME: - // convert (timeSrc, string) --> date_format(timeSrc, '%H:= %i:%S') - return convertDateTimeToString(function, "%H:%i:%S"); //$N= ON-NLS-1$ - case TIMESTAMP: = - // convert (tsSrc, string) --> date_format(tsSrc, '%Y-%m-%= d %H:%i:%S.%f') - return convertDateTimeToString(function, "%Y-%m-%d %H:%i:%= S.%f"); //$NON-NLS-1$ - default: - return DROP_MODIFIER.modify(function); - } - } - = - private IExpression convertToNativeType(IFunction function, String tar= getType) { - IExpression[] args =3D function.getParameters(); - function.setName("convert"); //$NON-NLS-1$ - args[1] =3D langFactory.createLiteral(targetType, String.class); - function.setParameters(args); - return function; - } - = - /** - * In version 5.1 and after, we can simple use convert(x, DECIMAL), bu= t for backward compatibility we must do (x + 0.0) - * @param function - * @return - * @since 4.3 - */ - private IExpression convertToNumeric(IFunction function) { - // convert(x, float/double/bigdecimal) --> (x + 0.0) - return langFactory.createFunction("+", //$NON-NLS-1$ - new IExpression[] {function.getP= arameters()[0], - langFactory.c= reateLiteral(new Double(0.0), Double.class)}, - Double.class); - } - = - private IExpression convertToDateTime(String functionName, IExpression= value, Class targetType) { - return langFactory.createFunction(functionName, - new IExpression[] {value}, - targetType); - } - = - private IExpression convertToBoolean(IFunction function) { - int srcCode =3D getSrcCode(function); - switch(srcCode) { - case STRING: - // convert(src, boolean) --> CASE src WHEN 'true' THEN 1 E= LSE 0 END - // convert(booleanSrc, string) --> CASE WHEN booleanSrc TH= EN '1' ELSE '0' END - List when =3D Arrays.asList(langFactory.createCompareCrite= ria(Operator.EQ, function.getParameters()[0], langFactory.createLiteral("tr= ue", String.class))); - List then =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral(Integer.valueOf(1), Integer.class)}); //$NON-NLS-1$ - IExpression elseExpr =3D langFactory.createLiteral(Integer= .valueOf(0), Integer.class); //$NON-NLS-1$ - return langFactory.createSearchedCaseExpression(when, then= , elseExpr, String.class); - default: - return DROP_MODIFIER.modify(function); - } - } - = - private IFunction convertDateTimeToString(IFunction function, String f= ormat) { - // convert (date, string) --> date_format(date, format) - IExpression[] args =3D function.getParameters(); - function.setName("date_format"); //$NON-NLS-1$ - args[1] =3D langFactory.createLiteral(format, String.class); = - function.setParameters(args); - return function; - } - = - private int getSrcCode(IFunction function) { - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); - return ((Integer) typeMap.get(srcType)).intValue(); - } = -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/mysql/MySQLConvertModifier.java (from rev 488, trunk/connectors/connect= or-jdbc/src/main/java/com/metamatrix/connector/jdbc/mysql/MySQLConvertModif= ier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mysql/MySQLConvertModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mysql/MySQLConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,185 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.mysql; + +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.DropFunctionModifier; + +import com.metamatrix.connector.language.ICompareCriteria; +import com.metamatrix.connector.language.ICriteria; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.ICompareCriteria.Operator; + + +/** = + * @since 4.3 + */ +class MySQLConvertModifier extends BasicFunctionModifier { + = + private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); + = + private ILanguageFactory langFactory; + = + MySQLConvertModifier(ILanguageFactory langFactory) { + this.langFactory =3D langFactory; + } + + public List translate(IFunction function) { + return null; + } + + public IExpression modify(IFunction function) { + List args =3D function.getParameters(); + + if (args.get(0) !=3D null && args.get(0) instanceof ILiteral && ((= ILiteral)args.get(0)).getValue() =3D=3D null ) { + if (args.get(1) !=3D null && args.get(1) instanceof ILiteral) { + // This is a convert(null, ...) or cast(null as ...) + return DROP_MODIFIER.modify(function); + } + } = + = + if (args.get(1) !=3D null && args.get(1) instanceof ILiteral) { + String target =3D ((String)((ILiteral)args.get(1)).getValue())= .toLowerCase(); + if (target.equals("string")) { //$NON-NLS-1$ = + return convertToString(function); + } else if (target.equals("byte") || //$NON-NLS-1$ + target.equals("short") || //$NON-NLS-1$ + target.equals("integer")) { //$NON-NLS-1$ = + return convertToNativeType(function, "SIGNED INTEGER"); //= $NON-NLS-1$ + } else if (target.equals("long") || //$NON-NLS-1$ + target.equals("biginteger")) { //$NON-NLS-1$ = + return convertToNativeType(function, "SIGNED"); //$NON-NLS= -1$ + } else if (target.equals("float") || //$NON-NLS-1$ + target.equals("double") || //$NON-NLS-1$ + target.equals("bigdecimal")) { //$NON-NLS-1$ = + return convertToNumeric(function); = + } else if (target.equals("date")) { //$NON-NLS-1$ = + return convertToDateTime("DATE", args.get(0), java.sql.Dat= e.class); //$NON-NLS-1$ + } else if (target.equals("time")) { //$NON-NLS-1$ = + return convertToDateTime("TIME", args.get(0), java.sql.Tim= e.class); //$NON-NLS-1$ + } else if (target.equals("timestamp")) { //$NON-NLS-1$ = + return convertToDateTime("TIMESTAMP", args.get(0), java.sq= l.Timestamp.class); //$NON-NLS-1$ + } else if (target.equals("char")) { //$NON-NLS-1$ = + return convertToNativeType(function, "CHAR (1)"); //$NON-N= LS-1$ + } else if (target.equals("boolean")) { //$NON-NLS-1$ = + return convertToBoolean(function); + } + } + return DROP_MODIFIER.modify(function); = + } + = + private IExpression convertToString(IFunction function) { + int srcCode =3D getSrcCode(function); + switch(srcCode) { + case BOOLEAN: + // convert(booleanSrc, string) --> CASE WHEN booleanSrc TH= EN '1' ELSE '0' END + List when =3D Arrays.asList(langFactory.= createCompareCriteria(Operator.EQ, function.getParameters().get(0), langFac= tory.createLiteral(Boolean.TRUE, Boolean.class))); + List then =3D Arrays.asList(langFactory.createLi= teral("1", String.class)); //$NON-NLS-1$ + IExpression elseExpr =3D langFactory.createLiteral("0", St= ring.class); //$NON-NLS-1$ + return langFactory.createSearchedCaseExpression(when, then= , elseExpr, String.class); + case BYTE: + case SHORT: + case INTEGER: + case LONG: + case BIGINTEGER: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + // convert(src, string) --> convert(src, CHAR) + return convertToNativeType(function, "CHAR"); //$NON-NLS-1$ + case DATE: + // convert (dateSrc, string) --> date_format(dateSrc, '%Y-= %m-%d') + return convertDateTimeToString(function, "%Y-%m-%d"); //$N= ON-NLS-1$ + case TIME: + // convert (timeSrc, string) --> date_format(timeSrc, '%H:= %i:%S') + return convertDateTimeToString(function, "%H:%i:%S"); //$N= ON-NLS-1$ + case TIMESTAMP: = + // convert (tsSrc, string) --> date_format(tsSrc, '%Y-%m-%= d %H:%i:%S.%f') + return convertDateTimeToString(function, "%Y-%m-%d %H:%i:%= S.%f"); //$NON-NLS-1$ + default: + return DROP_MODIFIER.modify(function); + } + } + = + private IExpression convertToNativeType(IFunction function, String tar= getType) { + List args =3D function.getParameters(); + function.setName("convert"); //$NON-NLS-1$ + args.set(1, langFactory.createLiteral(targetType, String.class)); + return function; + } + = + /** + * In version 5.1 and after, we can simple use convert(x, DECIMAL), bu= t for backward compatibility we must do (x + 0.0) + * @param function + * @return + * @since 4.3 + */ + private IExpression convertToNumeric(IFunction function) { + // convert(x, float/double/bigdecimal) --> (x + 0.0) + return langFactory.createFunction("+", //$NON-NLS-1$ + Arrays.asList(function.getParame= ters().get(0), + langFactory.c= reateLiteral(new Double(0.0), Double.class)), + Double.class); + } + = + private IExpression convertToDateTime(String functionName, IExpression= value, Class targetType) { + return langFactory.createFunction(functionName, + Arrays.asList(value), + targetType); + } + = + private IExpression convertToBoolean(IFunction function) { + int srcCode =3D getSrcCode(function); + switch(srcCode) { + case STRING: + // convert(src, boolean) --> CASE src WHEN 'true' THEN 1 E= LSE 0 END + // convert(booleanSrc, string) --> CASE WHEN booleanSrc TH= EN '1' ELSE '0' END + List when =3D Arrays.asList(langFactory.= createCompareCriteria(Operator.EQ, function.getParameters().get(0), langFac= tory.createLiteral("true", String.class))); + List then =3D Arrays.asList(langFactory.createLi= teral(Integer.valueOf(1), Integer.class)); //$NON-NLS-1$ + IExpression elseExpr =3D langFactory.createLiteral(Integer= .valueOf(0), Integer.class); //$NON-NLS-1$ + return langFactory.createSearchedCaseExpression(when, then= , elseExpr, String.class); + default: + return DROP_MODIFIER.modify(function); + } + } + = + private IFunction convertDateTimeToString(IFunction function, String f= ormat) { + // convert (date, string) --> date_format(date, format) + List args =3D function.getParameters(); + function.setName("date_format"); //$NON-NLS-1$ + args.set(1, langFactory.createLiteral(format, String.class)); = + return function; + } + = + private int getSrcCode(IFunction function) { + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); + return ((Integer) typeMap.get(srcType)).intValue(); + } = +} Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/mysql/MySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/mysql/MySQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mysql/MySQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.mysql; +package org.teiid.connector.jdbc.mysql; = import java.sql.Connection; import java.sql.Date; @@ -29,10 +29,11 @@ import java.sql.Time; import java.sql.Timestamp; = +import org.teiid.connector.jdbc.translator.Translator; + import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.jdbc.translator.Translator; = = /** = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/oracle (from rev 486, trunk/connectors/connector-jdbc/src/main/java/com= /metamatrix/connector/jdbc/oracle) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/oracle ___________________________________________________________________ Name: svn:mergeinfo + = Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/oracle/ConcatFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ConcatFunctionModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/ConcatFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,119 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.ICompoundCriteria.Operator; - - -/** - * This Function modifier used to support ANSI concat on Oracle 9i. - * TODO: this is no longer necessary on Oracle 10g and later. = - * - * CONCAT(a, b) =3D=3D> CASE WHEN (a is NULL OR b is NULL) THEN NULL ELSE = CONCAT(a, b) - * = - */ -public class ConcatFunctionModifier extends BasicFunctionModifier { - private ILanguageFactory langFactory; - = - /** = - * @param langFactory - */ - public ConcatFunctionModifier(ILanguageFactory langFactory) { - this.langFactory =3D langFactory; - } - - /** = - * @see com.metamatrix.connector.jdbc.translator.BasicFunctionModifier= #modify(com.metamatrix.connector.language.IFunction) - */ - public IExpression modify(IFunction function) { - List when =3D new ArrayList(); - IExpression a =3D function.getParameters()[0]; - IExpression b =3D function.getParameters()[1]; - List crits =3D new ArrayList(); - = - ILiteral nullValue =3D langFactory.createLiteral(null, TypeFacilit= y.RUNTIME_TYPES.STRING); - if (isNull(a)) { - return nullValue; - } else if (!isNotNull(a)) { - crits.add(langFactory.createIsNullCriteria(a, false)); - } - if (isNull(b)) { - return nullValue; - } else if (!isNotNull(b)) { - crits.add(langFactory.createIsNullCriteria(b, false)); - } - = - ICriteria crit =3D null; - = - if (crits.isEmpty()) { - return function; - } else if (crits.size() =3D=3D 1) { - crit =3D (ICriteria)crits.get(0); - } else { - crit =3D langFactory.createCompoundCriteria(Operator.OR, crits); - } - when.add(crit); - List then =3D Arrays.asList(new IExpression[] {nullValue}); = - return langFactory.createSearchedCaseExpression(when, then, functi= on, TypeFacility.RUNTIME_TYPES.STRING); - } - = - private boolean isNotNull(IExpression expr) { - if (expr instanceof ILiteral) { - ILiteral literal =3D (ILiteral)expr; - return literal.getValue() !=3D null; - } - if (expr instanceof IFunction) { - IFunction function =3D (IFunction)expr; - if (function.getName().equalsIgnoreCase("NVL") || function.getName()= .equalsIgnoreCase("IFNULL")) { //$NON-NLS-1$ //$NON-NLS-2$ - return isNotNull(function.getParameters()[1]); - } - } - return false; - } - = - private boolean isNull(IExpression expr) { - if (expr instanceof ILiteral) { - ILiteral literal =3D (ILiteral)expr; - return literal.getValue() =3D=3D null; - } - return false; - } - = - /** = - * @see com.metamatrix.connector.jdbc.translator.BasicFunctionModifier= #translate(com.metamatrix.connector.language.IFunction) - */ - public List translate(IFunction function) { - return null; //allow default translation - } -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/oracle/ConcatFunctionModifier.java (from rev 488, trunk/connectors/conn= ector-jdbc/src/main/java/com/metamatrix/connector/jdbc/oracle/ConcatFunctio= nModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/ConcatFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/ConcatFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,121 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; + +import com.metamatrix.connector.api.SourceSystemFunctions; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.ICriteria; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.ICompoundCriteria.Operator; + + +/** + * This Function modifier used to support ANSI concat on Oracle 9i. + * TODO: this is no longer necessary on Oracle 10g and later. = + * + * CONCAT(a, b) =3D=3D> CASE WHEN (a is NULL OR b is NULL) THEN NULL ELSE = CONCAT(a, b) + * = + */ +public class ConcatFunctionModifier extends BasicFunctionModifier { + private ILanguageFactory langFactory; + = + /** = + * @param langFactory + */ + public ConcatFunctionModifier(ILanguageFactory langFactory) { + this.langFactory =3D langFactory; + } + + /** = + * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#modi= fy(com.metamatrix.connector.language.IFunction) + */ + public IExpression modify(IFunction function) { + List when =3D new ArrayList(); + IExpression a =3D function.getParameters().get(0); + IExpression b =3D function.getParameters().get(1); + List crits =3D new ArrayList(); + = + ILiteral nullValue =3D langFactory.createLiteral(null, TypeFacilit= y.RUNTIME_TYPES.STRING); + if (isNull(a)) { + return nullValue; + } else if (!isNotNull(a)) { + crits.add(langFactory.createIsNullCriteria(a, false)); + } + if (isNull(b)) { + return nullValue; + } else if (!isNotNull(b)) { + crits.add(langFactory.createIsNullCriteria(b, false)); + } + = + ICriteria crit =3D null; + = + if (crits.isEmpty()) { + return function; + } else if (crits.size() =3D=3D 1) { + crit =3D (ICriteria)crits.get(0); + } else { + crit =3D langFactory.createCompoundCriteria(Operator.OR, crits); + } + when.add(crit); + List then =3D Arrays.asList(new IExpression[] {nullValue}); = + return langFactory.createSearchedCaseExpression(when, then, functi= on, TypeFacility.RUNTIME_TYPES.STRING); + } + = + private boolean isNotNull(IExpression expr) { + if (expr instanceof ILiteral) { + ILiteral literal =3D (ILiteral)expr; + return literal.getValue() !=3D null; + } + if (expr instanceof IFunction) { + IFunction function =3D (IFunction)expr; + if (function.getName().equalsIgnoreCase("NVL") || function.getName()= .equalsIgnoreCase(SourceSystemFunctions.IFNULL)) { //$NON-NLS-1$ + return isNotNull(function.getParameters().get(0)); + } + } + return false; + } + = + private boolean isNull(IExpression expr) { + if (expr instanceof ILiteral) { + ILiteral literal =3D (ILiteral)expr; + return literal.getValue() =3D=3D null; + } + return false; + } + = + /** = + * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#tran= slate(com.metamatrix.connector.language.IFunction) + */ + public List translate(IFunction function) { + return null; //allow default translation + } +} Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/oracle/DayWeekQuarterFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/DayWeekQuarterFunctionModifier.java 2009-02-24 14:21:49 UTC (re= v 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/DayWeekQuarterFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,65 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.*; - -/** - * This a method for multiple use. It can be used for: - * 1) dayofyear - * 2) dayofmonth - * 3) dayofweek - * 4) week - * 5) quarter - */ -public class DayWeekQuarterFunctionModifier extends BasicFunctionModifier = implements FunctionModifier { - private ILanguageFactory langFactory; - private String format; - = - public DayWeekQuarterFunctionModifier(ILanguageFactory langFactory, St= ring format) { - this.langFactory =3D langFactory; - this.format =3D format; - } - = - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) - */ - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - - IFunction inner =3D langFactory.createFunction("TO_CHAR", //$NON-= NLS-1$ - new IExpression[] { = - args[0], = - langFactory.createLiteral(format, String.class)}, = - String.class); - = - IFunction outer =3D langFactory.createFunction("TO_NUMBER", //$NO= N-NLS-1$ - new IExpression[] {inner}, = - Integer.class); - = - return outer; = - } -} - Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/oracle/DayWeekQuarterFunctionModifier.java (from rev 488, trunk/connect= ors/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/oracle/DayWe= ekQuarterFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/DayWeekQuarterFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/DayWeekQuarterFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.FunctionModifier; + +import com.metamatrix.connector.language.*; + +/** + * This a method for multiple use. It can be used for: + * 1) dayofyear + * 2) dayofmonth + * 3) dayofweek + * 4) week + * 5) quarter + */ +public class DayWeekQuarterFunctionModifier extends BasicFunctionModifier = implements FunctionModifier { + private ILanguageFactory langFactory; + private String format; + = + public DayWeekQuarterFunctionModifier(ILanguageFactory langFactory, St= ring format) { + this.langFactory =3D langFactory; + this.format =3D format; + } + = + /* = + * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) + */ + public IExpression modify(IFunction function) { + List args =3D function.getParameters(); + + IFunction inner =3D langFactory.createFunction("TO_CHAR", //$NON-= NLS-1$ + Arrays.asList( = + args.get(0), = + langFactory.createLiteral(format, String.class)), = + String.class); + = + IFunction outer =3D langFactory.createFunction("TO_NUMBER", //$NO= N-NLS-1$ + Arrays.asList(inner), = + Integer.class); + = + return outer; = + } +} + Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/oracle/ExtractFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/ExtractFunctionModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/ExtractFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.util.ArrayList; -import java.util.List; - -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; - -/** - * Convert the YEAR/MONTH/DAY etc. function into an equivalent Oracle func= tion. = - * Format: EXTRACT(YEAR from Element) or EXTRACT(YEAR from DATE '2004-03-0= 3') - */ -public class ExtractFunctionModifier extends BasicFunctionModifier impleme= nts FunctionModifier { - public static final String SPACE =3D " "; //$NON-NLS-1$ - = - private String target; - = - public ExtractFunctionModifier(String target) { - this.target =3D target; - } - = - public List translate(IFunction function) { - StringBuffer buffer =3D new StringBuffer(); - IExpression[] args =3D function.getParameters(); - = - List objs =3D new ArrayList(); - buffer.append("EXTRACT("); //$NON-NLS-1$ - buffer.append(target); - buffer.append(SPACE); - buffer.append("FROM"); //$NON-NLS-1$ - - buffer.append(SPACE); = - buffer.append(args[0]); - buffer.append(")"); //$NON-NLS-1$ - objs.add(buffer.toString()); - return objs; - } = -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/oracle/ExtractFunctionModifier.java (from rev 488, trunk/connectors/con= nector-jdbc/src/main/java/com/metamatrix/connector/jdbc/oracle/ExtractFunct= ionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/ExtractFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/ExtractFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.util.ArrayList; +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.FunctionModifier; + +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; + +/** + * Convert the YEAR/MONTH/DAY etc. function into an equivalent Oracle func= tion. = + * Format: EXTRACT(YEAR from Element) or EXTRACT(YEAR from DATE '2004-03-0= 3') + */ +public class ExtractFunctionModifier extends BasicFunctionModifier impleme= nts FunctionModifier { + public static final String SPACE =3D " "; //$NON-NLS-1$ + = + private String target; + = + public ExtractFunctionModifier(String target) { + this.target =3D target; + } + = + public List translate(IFunction function) { + StringBuffer buffer =3D new StringBuffer(); + List args =3D function.getParameters(); + = + List objs =3D new ArrayList(); + buffer.append("EXTRACT("); //$NON-NLS-1$ + buffer.append(target); + buffer.append(SPACE); + buffer.append("FROM"); //$NON-NLS-1$ + + buffer.append(SPACE); = + buffer.append(args.get(0)); + buffer.append(")"); //$NON-NLS-1$ + objs.add(buffer.toString()); + return objs; + } = +} Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/oracle/LeftOrRightFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LeftOrRightFunctionModifier.java 2009-02-24 14:21:49 UTC (rev 4= 86) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/LeftOrRightFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.*; - -/** - * Convert left(string, count) --> substr(string, 1, count) - * or right(string, count) --> substr(string, -1 * count) - we lack a way = to express a unary negation - */ -public class LeftOrRightFunctionModifier extends BasicFunctionModifier imp= lements FunctionModifier { - private ILanguageFactory langFactory; - = - public LeftOrRightFunctionModifier(ILanguageFactory langFactory) { - this.langFactory =3D langFactory; - } - = - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) - */ - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - IFunction func =3D null; - = - if (function.getName().equalsIgnoreCase("left")) { //$NON-NLS-1$ - func =3D langFactory.createFunction("SUBSTR", //$NON-NLS-1$ - new IExpression[] { - args[0], = - langFactory.createLiteral(Integer.valueOf(1), TypeFaci= lity.RUNTIME_TYPES.INTEGER), - args[1]}, - String.class); = - } else if (function.getName().equalsIgnoreCase("right")) { //$NON-= NLS-1$ - IFunction negIndex =3D langFactory.createFunction("*", //$NON= -NLS-1$ - new IExpression[] {langFactory.createLiteral(Integer.value= Of(-1), TypeFacility.RUNTIME_TYPES.INTEGER), args[1]}, - Integer.class); - = - func =3D langFactory.createFunction("SUBSTR", //$NON-NLS-1$ - new IExpression[] { - args[0], = - negIndex}, - String.class); = - } - - return func; = - } -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/oracle/LeftOrRightFunctionModifier.java (from rev 488, trunk/connectors= /connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/oracle/LeftOrRi= ghtFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/LeftOrRightFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/LeftOrRightFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.FunctionModifier; + +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.*; + +/** + * Convert left(string, count) --> substr(string, 1, count) + * or right(string, count) --> substr(string, -1 * count) - we lack a way = to express a unary negation + */ +public class LeftOrRightFunctionModifier extends BasicFunctionModifier imp= lements FunctionModifier { + private ILanguageFactory langFactory; + = + public LeftOrRightFunctionModifier(ILanguageFactory langFactory) { + this.langFactory =3D langFactory; + } + = + /* = + * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) + */ + public IExpression modify(IFunction function) { + List args =3D function.getParameters(); + IFunction func =3D null; + = + if (function.getName().equalsIgnoreCase("left")) { //$NON-NLS-1$ + func =3D langFactory.createFunction("SUBSTR", //$NON-NLS-1$ + Arrays.asList( + args.get(0), = + langFactory.createLiteral(Integer.valueOf(1), TypeFaci= lity.RUNTIME_TYPES.INTEGER), + args.get(1)), + String.class); = + } else if (function.getName().equalsIgnoreCase("right")) { //$NON-= NLS-1$ + IFunction negIndex =3D langFactory.createFunction("*", //$NON= -NLS-1$ + Arrays.asList(langFactory.createLiteral(Integer.valueOf(-1= ), TypeFacility.RUNTIME_TYPES.INTEGER), args.get(1)), + Integer.class); + = + func =3D langFactory.createFunction("SUBSTR", //$NON-NLS-1$ + Arrays.asList( + args.get(0), = + negIndex), + String.class); = + } + + return func; = + } +} Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/oracle/LocateFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/LocateFunctionModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/LocateFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,77 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.*; - -/** - * Modify the locate function to use the Oracle instr function. - * = - * locate(sub, str) -> instr(str, sub) - * = - * locate(sub, str, start) -> instr(str, sub, start+1) - */ -public class LocateFunctionModifier extends BasicFunctionModifier implemen= ts FunctionModifier { - - private ILanguageFactory langFactory; - = - public LocateFunctionModifier(ILanguageFactory langFactory) { - this.langFactory =3D langFactory; - } - - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) - */ - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); = - IExpression[] instrArgs =3D new IExpression[args.length]; - instrArgs[0] =3D args[1]; - instrArgs[1] =3D args[0]; - = - if(args.length =3D=3D 3) { - if(args[2] instanceof ILiteral) { - ILiteral indexConst =3D (ILiteral)args[2]; - if(indexConst.getValue() =3D=3D null) { - instrArgs[2] =3D args[2]; - } else { - // Just modify the constant - Integer index =3D (Integer) ((ILiteral)args[2]).getVal= ue(); - instrArgs[2] =3D langFactory.createLiteral(new Integer= (index.intValue()+1), Integer.class); - } - } else { - // Make plus function since this involves an element or fu= nction - IFunction plusFunction =3D langFactory.createFunction("+",= //$NON-NLS-1$ - new IExpression[] { args[2], langFactory.createLiteral= (new Integer(1), Integer.class) }, - Integer.class); - instrArgs[2] =3D plusFunction; - } = - } - = - IFunction instrFunction =3D langFactory.createFunction("instr", in= strArgs, Integer.class); //$NON-NLS-1$ - = - return instrFunction; = - } - -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/oracle/LocateFunctionModifier.java (from rev 488, trunk/connectors/conn= ector-jdbc/src/main/java/com/metamatrix/connector/jdbc/oracle/LocateFunctio= nModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/LocateFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/LocateFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.FunctionModifier; + +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILiteral; + +/** + * Modify the locate function to use the Oracle instr function. + * = + * locate(sub, str) -> instr(str, sub) + * = + * locate(sub, str, start) -> instr(str, sub, start+1) + */ +public class LocateFunctionModifier extends BasicFunctionModifier implemen= ts FunctionModifier { + + private ILanguageFactory langFactory; + = + public LocateFunctionModifier(ILanguageFactory langFactory) { + this.langFactory =3D langFactory; + } + + /* = + * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) + */ + public IExpression modify(IFunction function) { + function.setName("instr"); //$NON-NLS-1$ + List args =3D function.getParameters(); = + IExpression expr =3D args.get(0); + args.set(0, args.get(1)); + args.set(1, expr); + if(args.size() =3D=3D 3) { + if(args.get(2) instanceof ILiteral) { + ILiteral indexConst =3D (ILiteral)args.get(2); + if(indexConst.getValue() !=3D null) { + // Just modify the constant + Integer index =3D (Integer) indexConst.getValue(); + args.set(2, langFactory.createLiteral(new Integer(inde= x.intValue()+1), Integer.class)); + } + } else { + // Make plus function since this involves an element or fu= nction + IFunction plusFunction =3D langFactory.createFunction("+",= //$NON-NLS-1$ + Arrays.asList( args.get(2), langFactory.createLiteral(= new Integer(1), Integer.class) ), + Integer.class); + args.set(2, plusFunction); + } = + } = + return function; = + } + +} Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/oracle/Log10FunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/Log10FunctionModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/Log10FunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.*; - -public class Log10FunctionModifier extends BasicFunctionModifier implement= s FunctionModifier { - = - private ILanguageFactory languageFactory; - - public Log10FunctionModifier(ILanguageFactory languageFactory) { - this.languageFactory =3D languageFactory; - } - - public IExpression modify(IFunction function) { - function.setName("log"); //$NON-NLS-1$ - = - IExpression[] args =3D function.getParameters(); - IExpression[] newArgs =3D new IExpression[args.length+1]; - newArgs[1] =3D args[0]; - newArgs[0] =3D languageFactory.createLiteral(new Integer(10), Inte= ger.class); - function.setParameters(newArgs); = - = - return function; - } - -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/oracle/Log10FunctionModifier.java (from rev 488, trunk/connectors/conne= ctor-jdbc/src/main/java/com/metamatrix/connector/jdbc/oracle/Log10FunctionM= odifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/Log10FunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/Log10FunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.FunctionModifier; + +import com.metamatrix.connector.language.*; + +public class Log10FunctionModifier extends BasicFunctionModifier implement= s FunctionModifier { + = + private ILanguageFactory languageFactory; + + public Log10FunctionModifier(ILanguageFactory languageFactory) { + this.languageFactory =3D languageFactory; + } + + public IExpression modify(IFunction function) { + function.setName("log"); //$NON-NLS-1$ + = + List args =3D function.getParameters(); + args.add(args.get(0)); + args.set(0, languageFactory.createLiteral(new Integer(10), Integer= .class)); + return function; + } + +} Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/oracle/MonthOrDayNameFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/MonthOrDayNameFunctionModifier.java 2009-02-24 14:21:49 UTC (re= v 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/MonthOrDayNameFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,60 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.*; - -/** - * Convert the MONTHNAME etc. function into an equivalent Oracle function.= = - * Format: to_char(timestampvalue/dayvalue, 'Month'/'Day') = - */ -public class MonthOrDayNameFunctionModifier extends BasicFunctionModifier = implements FunctionModifier { - private ILanguageFactory langFactory; - private String format; - = - public MonthOrDayNameFunctionModifier(ILanguageFactory langFactory, St= ring format) { - this.langFactory =3D langFactory; - this.format =3D format; - } - = - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) - */ - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - = - IFunction func =3D langFactory.createFunction("TO_CHAR", //$NON-N= LS-1$ - new IExpression[] { = - args[0], = - langFactory.createLiteral(format, String.class)}, = - String.class); - = - // For some reason, these values have trailing spaces - IFunction trimFunc =3D langFactory.createFunction("RTRIM", //$NON= -NLS-1$ - new IExpression[] { func }, String.class); - = - return trimFunc; = - } -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/oracle/MonthOrDayNameFunctionModifier.java (from rev 488, trunk/connect= ors/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/oracle/Month= OrDayNameFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/MonthOrDayNameFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/MonthOrDayNameFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.FunctionModifier; + +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; + +/** + * Convert the MONTHNAME etc. function into an equivalent Oracle function.= = + * Format: to_char(timestampvalue/dayvalue, 'Month'/'Day') = + */ +public class MonthOrDayNameFunctionModifier extends BasicFunctionModifier = implements FunctionModifier { + private ILanguageFactory langFactory; + private String format; + = + public MonthOrDayNameFunctionModifier(ILanguageFactory langFactory, St= ring format) { + this.langFactory =3D langFactory; + this.format =3D format; + } + = + /* = + * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#modif= y(com.metamatrix.data.language.IFunction) + */ + public IExpression modify(IFunction function) { + List args =3D function.getParameters(); + = + IFunction func =3D langFactory.createFunction("TO_CHAR", //$NON-N= LS-1$ + Arrays.asList( = + args.get(0), = + langFactory.createLiteral(format, String.class)), = + String.class); + = + // For some reason, these values have trailing spaces + IFunction trimFunc =3D langFactory.createFunction("RTRIM", //$NON= -NLS-1$ + Arrays.asList( func ), String.class); + = + return trimFunc; = + } +} Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/OracleCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleCapabilities.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,11 +22,12 @@ = /* */ -package com.metamatrix.connector.jdbc.oracle; +package org.teiid.connector.jdbc.oracle; = import java.util.*; + +import org.teiid.connector.jdbc.JDBCCapabilities; = -import com.metamatrix.connector.jdbc.JDBCCapabilities; = /** */ Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/oracle/OracleConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleConvertModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,541 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.util.List; - -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; -import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; - -/** - */ -public class OracleConvertModifier extends BasicFunctionModifier implement= s FunctionModifier { = - private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); - private ILanguageFactory langFactory; - = - public OracleConvertModifier(ILanguageFactory langFactory, ConnectorLo= gger logger) { - this.langFactory =3D langFactory; - } - - /** - * Intentionally return null, rely on the SQLStringVisitor being used = by caller - * (Oracle or Oracle8 SQLConversionVisitor (SQLConversionVisitor)) - * @see com.metamatrix.connector.jdbc.translator.FunctionModifier#tran= slate(com.metamatrix.connector.language.IFunction) - */ - public List translate(IFunction function) { - return null; - } = - = - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - IExpression modified =3D null; - - String target =3D ((String)((ILiteral)args[1]).getValue()).toLower= Case(); - if (target.equals("string")) { //$NON-NLS-1$ = - modified =3D convertToString(function); - } else if (target.equals("short")) { //$NON-NLS-1$ = - modified =3D convertToShort(function); - } else if (target.equals("integer")) { //$NON-NLS-1$ = - modified =3D convertToInteger(function); - } else if (target.equals("long")) { //$NON-NLS-1$ = - modified =3D convertToLong(function); - } else if (target.equals("biginteger")) { //$NON-NLS-1$ = - modified =3D convertToBigInteger(function); - } else if (target.equals("float")) { //$NON-NLS-1$ = - modified =3D convertToFloat(function); - } else if (target.equals("double")) { //$NON-NLS-1$ = - modified =3D convertToDouble(function); - } else if (target.equals("bigdecimal")) { //$NON-NLS-1$ = - modified =3D convertToBigDecimal(function); - } else if (target.equals("date")) { //$NON-NLS-1$ = - modified =3D convertToDate(function); - } else if (target.equals("time")) { //$NON-NLS-1$ = - modified =3D convertToTime(function); - } else if (target.equals("timestamp")) { //$NON-NLS-1$ = - modified =3D convertToTimestamp(function); - } else if (target.equals("char")) { //$NON-NLS-1$ = - modified =3D convertToChar(function); - } else if (target.equals("boolean")) { //$NON-NLS-1$ = - modified =3D convertToBoolean(function); - } else if (target.equals("byte")) { //$NON-NLS-1$ = - modified =3D convertToByte(function); - } else { - modified =3D DROP_MODIFIER.modify(function); = - } - return modified; - } - = - private IExpression convertToDate(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); - int srcCode =3D getSrcCode(srcType); - - switch(srcCode) { - case STRING: - // convert(STRING, date) --> to_date(STRING, format) - String format =3D "YYYY-MM-DD"; //$NON-NLS-1$ = - convert =3D dateTypeHelper("to_date", new IExpression[] {a= rgs[0], //$NON-NLS-1$ = - langFactory.createLiteral(format, String.class)}, java= .sql.Date.class); - break; - case TIMESTAMP: - // convert(TSELEMENT, date) --> trunc(TSELEMENT) = - convert =3D dateTypeHelper("trunc", new IExpression[] {arg= s[0]}, java.sql.Date.class); //$NON-NLS-1$ = - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - - /** - * TODO: need to remove the prepend 1970-01-01 and the {ts''} - * @param function - * @return IExpression - */ - private IExpression convertToTime(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); - String format =3D "YYYY-MM-DD HH24:MI:SS"; //$NON-NLS-1$ = - = - int srcCode =3D getSrcCode(srcType); - switch(srcCode) { - case STRING: - //convert(STRING, time) --> to_date('1970-01-01 ' || to_ch= ar(timevalue, 'HH24:MI:SS'), 'YYYY-MM-DD HH24:MI:SS') - IFunction inner0 =3D langFactory.createFunction("to_char",= //$NON-NLS-1$ - new IExpression[] { = - args[0], - langFactory.createLiteral("HH24:MI:SS", String.cla= ss)}, //$NON-NLS-1$ - String.class); = - = - IExpression prependedPart0 =3D langFactory.createFunction(= "||", //$NON-NLS-1$ - new IExpression[] { - langFactory.createLiteral("1970-01-01 ", String.class)= , //$NON-NLS-1$ - inner0}, - String.class); = - = - convert =3D langFactory.createFunction("to_date", //$NON-= NLS-1$ - new IExpression[] {prependedPart0, - langFactory.createLiteral(format, String.class)}, = - java.sql.Time.class); = - break; = = - case TIMESTAMP: - // convert(timestamp, time) = - // --> to_date(('1970-01-01 ' || to_char(timestampvalue, '= HH24:MI:SS'))), = - // 'YYYY-MM-DD HH24:MI:SS') = - IFunction inner =3D langFactory.createFunction("to_char", = //$NON-NLS-1$ - new IExpression[] { = - args[0], - langFactory.createLiteral("HH24:MI:SS", String.cla= ss)}, //$NON-NLS-1$ - String.class); = - = - IExpression prependedPart =3D langFactory.createFunction(= "||", //$NON-NLS-1$ - new IExpression[] { - langFactory.createLiteral("1970-01-01 ", String.cl= ass), //$NON-NLS-1$ - inner}, - String.class); - = - convert =3D langFactory.createFunction("to_date", //$NON-= NLS-1$ - new IExpression[] {prependedPart, - langFactory.createLiteral(format, String.class)}, = - java.sql.Time.class); = = - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } = - = - private IExpression convertToTimestamp(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); - int srcCode =3D getSrcCode(srcType); - switch(srcCode) { - case STRING: - // convert(STRING, timestamp) --> to_date(timestampvalue, = 'YYYY-MM-DD HH24:MI:SS.FF'))) = - String format =3D "YYYY-MM-DD HH24:MI:SS.FF"; //$NON-NLS-= 1$ - convert =3D dateTypeHelper("to_timestamp", new IExpression= [] {args[0], //$NON-NLS-1$ = - langFactory.createLiteral(format, String.class)}, java= .sql.Timestamp.class); - break; - case TIME: - case DATE: - convert =3D dateTypeHelper("cast", new IExpression[] {args[0]= , //$NON-NLS-1$ = - langFactory.createLiteral("timestamp", String.clas= s)}, java.sql.Timestamp.class); //$NON-NLS-1$ - break; = - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToChar(IFunction function) { - // two cases: = - // 1) 2-byte: convert(string, char) --> cast(stringkey AS= char(2)) - // 2) single bit: just drop - // TODO: case 1) - return DROP_MODIFIER.modify(function); = - } - - private IExpression convertToString(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - String format =3D null; - - int srcCode =3D getSrcCode(function); - switch(srcCode) { // convert(input, string) --> to_char(input) - case BOOLEAN: - convert =3D langFactory.createFunction("decode", new IExpr= ession[] //$NON-NLS-1$ - { args[0], - langFactory.createLiteral(new Integer(0), Integer.= class), - langFactory.createLiteral("false", String.class), = //$NON-NLS-1$ - langFactory.createLiteral(new Integer(1), Integer.= class), - langFactory.createLiteral("true", String.class) },= //$NON-NLS-1$ - String.class); - = - break; - case BYTE: - case SHORT: - case INTEGER: - case LONG: - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - convert =3D createStringFunction(args[0]); - break; - // convert(input, string) --> to_char(input, format) - case DATE: - format =3D "YYYY-MM-DD"; //$NON-NLS-1$ - convert =3D createStringFunction(args[0], format); = - break; - case TIME: - format =3D "HH24:MI:SS"; //$NON-NLS-1$ - convert =3D createStringFunction(args[0], format); = - break; - case TIMESTAMP: - convert =3D createStringFunction(args[0], "YYYY-MM-DD HH24= :MI:SS.FF"); //$NON-NLS-1$ = - break; - default: - convert =3D DROP_MODIFIER.modify(function); - break; - } - = - return convert; - } - = - private IExpression convertToBoolean(IFunction function) { - IExpression convert =3D null; - int srcCode =3D getSrcCode(function); - switch(srcCode) { - case STRING: - // convert(src, boolean) --> decode(string, 'true', 1, 'fa= lse', 0) - convert =3D booleanHelper(function); = - break; = - case BYTE: - case SHORT: - case INTEGER: - case LONG: - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - default: - convert =3D DROP_MODIFIER.modify(function); - break; - } - = - return convert; - } - = - private IExpression convertToByte(IFunction function) { - IExpression convert =3D null; - int srcCode =3D getSrcCode(function); - - switch(srcCode) { - case STRING: - convert =3D stringSrcHelper(function); - break; = - case BOOLEAN: - case SHORT: = - case INTEGER: - case LONG: - case BIGINTEGER: = - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToShort(IFunction function) { - IExpression convert =3D null; - int srcCode =3D getSrcCode(function); - - switch(srcCode) { - case STRING: - convert =3D stringSrcHelper(function); - break; = - case BOOLEAN: - case BYTE: - case INTEGER: - case LONG: - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToInteger(IFunction function) { - IExpression convert =3D null; - int srcCode =3D getSrcCode(function); - - switch(srcCode) { - case STRING: - convert =3D stringSrcHelper(function); - break; = - case BOOLEAN: - case LONG: - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - - private IExpression convertToLong(IFunction function) { - IExpression convert =3D null; - int srcCode =3D getSrcCode(function); - - switch(srcCode) { - case STRING: - convert =3D stringSrcHelper(function); - break; = - case BOOLEAN: - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToBigInteger(IFunction function) { - IExpression convert =3D null; - int srcCode =3D getSrcCode(function); - - switch(srcCode) { - case STRING: - convert =3D stringSrcHelper(function); - break; = - case BOOLEAN: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToFloat(IFunction function) { - IExpression convert =3D null; - int srcCode =3D getSrcCode(function); - - switch(srcCode) { - case STRING: - convert =3D stringSrcHelper(function); - break; = - case BOOLEAN: - case DOUBLE: = - case BIGDECIMAL: - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } = - = - private IExpression convertToDouble(IFunction function) { - IExpression convert =3D null; - int srcCode =3D getSrcCode(function); - - switch(srcCode) { - case STRING: - convert =3D stringSrcHelper(function); - break; = - case BOOLEAN: - case BIGDECIMAL: = - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToBigDecimal(IFunction function) { - IExpression convert =3D null; - int srcCode =3D getSrcCode(function); - - switch(srcCode) { - case STRING: - convert =3D stringSrcHelper(function); - break; = - case BOOLEAN: - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } = - - private IFunction dateTypeHelper(String functionName, IExpression[] ar= gs, Class target) { - IFunction convert =3D langFactory.createFunction(functionName, = - args, target); - return convert; = - } - = - private IFunction booleanHelper(IFunction function) { - // using decode(value, 'true', 1, 'false', 0) - IExpression[] args =3D function.getParameters(); - = - IExpression[] modified =3D new IExpression[] { - args[0], - langFactory.createLiteral("true", String.class), //$NON-NLS-1$ = - langFactory.createLiteral(new Byte((byte)1), Byte.class), - langFactory.createLiteral("false", String.class), //$NON-NLS-1= $ = - langFactory.createLiteral(new Byte((byte)0), Byte.class) = = - }; - = - return langFactory.createFunction("decode", //$NON-NLS-1$ - modified, java.lang.Boolean.class); = - } - = - private IExpression stringSrcHelper(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - // switch the target type - String functionName =3D "to_number"; //$NON-NLS-1$ - int targetCode =3D getTargetCode(function.getType()); - switch(targetCode) { - case BYTE: - convert =3D createFunction(functionName, args[0], Byte.cla= ss); - break; - case SHORT: - convert =3D createFunction(functionName, args[0], Short.cl= ass); - break; = - case INTEGER: - convert =3D createFunction(functionName, args[0], Integer.= class); - break; - case LONG: - convert =3D createFunction(functionName, args[0], Long.cla= ss); - break; = - case BIGINTEGER: - convert =3D createFunction(functionName, args[0], java.mat= h.BigInteger.class); - break; = - case FLOAT: - convert =3D createFunction(functionName, args[0], Float.cl= ass); - break; - case DOUBLE: - convert =3D createFunction(functionName, args[0], Double.c= lass); - break; - case BIGDECIMAL: - convert =3D createFunction(functionName, args[0], java.mat= h.BigDecimal.class); - break; = - default: - convert =3D DROP_MODIFIER.modify(function); - break; = - } = - return convert; - } = - = - private IFunction createFunction(String functionName, IExpression args= 0, Class targetClass) { - IFunction created =3D langFactory.createFunction(functionName, - new IExpression[] {args0}, targetClass); - return created; = - } - - private IFunction createStringFunction(IExpression args0, String forma= t) { - IFunction created =3D langFactory.createFunction("to_char", //$NON= -NLS-1$ = - new IExpression[] {args0, langFactory.createLiteral(format, St= ring.class)}, = - String.class); - return created; = - } - = - private IFunction createStringFunction(IExpression args) { - IFunction created =3D langFactory.createFunction("to_char", //$NON= -NLS-1$ = - new IExpression[] { args }, String.class); = - return created; - } - = - private int getSrcCode(IFunction function) { - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); - return ((Integer) typeMap.get(srcType)).intValue(); - } - = - private int getSrcCode(Class source) { - return ((Integer) typeMap.get(source)).intValue(); - } - = - private int getTargetCode(Class target) { - return ((Integer) typeMap.get(target)).intValue(); - } = -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/oracle/OracleConvertModifier.java (from rev 488, trunk/connectors/conne= ctor-jdbc/src/main/java/com/metamatrix/connector/jdbc/oracle/OracleConvertM= odifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleConvertModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,541 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.DropFunctionModifier; +import org.teiid.connector.jdbc.translator.FunctionModifier; + +import com.metamatrix.connector.api.ConnectorLogger; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILiteral; + +/** + */ +public class OracleConvertModifier extends BasicFunctionModifier implement= s FunctionModifier { = + private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); + private ILanguageFactory langFactory; + = + public OracleConvertModifier(ILanguageFactory langFactory, ConnectorLo= gger logger) { + this.langFactory =3D langFactory; + } + + /** + * Intentionally return null, rely on the SQLStringVisitor being used = by caller + * (Oracle or Oracle8 SQLConversionVisitor (SQLConversionVisitor)) + * @see org.teiid.connector.jdbc.translator.FunctionModifier#translate= (com.metamatrix.connector.language.IFunction) + */ + public List translate(IFunction function) { + return null; + } = + = + public IExpression modify(IFunction function) { + List args =3D function.getParameters(); + IExpression modified =3D null; + + String target =3D ((String)((ILiteral)args.get(1)).getValue()).toL= owerCase(); + if (target.equals("string")) { //$NON-NLS-1$ = + modified =3D convertToString(function); + } else if (target.equals("short")) { //$NON-NLS-1$ = + modified =3D convertToShort(function); + } else if (target.equals("integer")) { //$NON-NLS-1$ = + modified =3D convertToInteger(function); + } else if (target.equals("long")) { //$NON-NLS-1$ = + modified =3D convertToLong(function); + } else if (target.equals("biginteger")) { //$NON-NLS-1$ = + modified =3D convertToBigInteger(function); + } else if (target.equals("float")) { //$NON-NLS-1$ = + modified =3D convertToFloat(function); + } else if (target.equals("double")) { //$NON-NLS-1$ = + modified =3D convertToDouble(function); + } else if (target.equals("bigdecimal")) { //$NON-NLS-1$ = + modified =3D convertToBigDecimal(function); + } else if (target.equals("date")) { //$NON-NLS-1$ = + modified =3D convertToDate(function); + } else if (target.equals("time")) { //$NON-NLS-1$ = + modified =3D convertToTime(function); + } else if (target.equals("timestamp")) { //$NON-NLS-1$ = + modified =3D convertToTimestamp(function); + } else if (target.equals("char")) { //$NON-NLS-1$ = + modified =3D convertToChar(function); + } else if (target.equals("boolean")) { //$NON-NLS-1$ = + modified =3D convertToBoolean(function); + } else if (target.equals("byte")) { //$NON-NLS-1$ = + modified =3D convertToByte(function); + } else { + modified =3D DROP_MODIFIER.modify(function); = + } + return modified; + } + = + private IExpression convertToDate(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); + int srcCode =3D getSrcCode(srcType); + + switch(srcCode) { + case STRING: + // convert(STRING, date) --> to_date(STRING, format) + String format =3D "YYYY-MM-DD"; //$NON-NLS-1$ = + convert =3D dateTypeHelper("to_date", Arrays.asList(args.g= et(0), //$NON-NLS-1$ = + langFactory.createLiteral(format, String.class)), java= .sql.Date.class); + break; + case TIMESTAMP: + // convert(TSELEMENT, date) --> trunc(TSELEMENT) = + convert =3D dateTypeHelper("trunc", Arrays.asList(args.get= (0)), java.sql.Date.class); //$NON-NLS-1$ = + break; + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + + /** + * TODO: need to remove the prepend 1970-01-01 and the {ts''} + * @param function + * @return IExpression + */ + private IExpression convertToTime(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); + String format =3D "YYYY-MM-DD HH24:MI:SS"; //$NON-NLS-1$ = + = + int srcCode =3D getSrcCode(srcType); + switch(srcCode) { + case STRING: + //convert(STRING, time) --> to_date('1970-01-01 ' || to_ch= ar(timevalue, 'HH24:MI:SS'), 'YYYY-MM-DD HH24:MI:SS') + IFunction inner0 =3D langFactory.createFunction("to_char",= //$NON-NLS-1$ + Arrays.asList( = + args.get(0), + langFactory.createLiteral("HH24:MI:SS", String.cla= ss)), //$NON-NLS-1$ + String.class); = + = + IExpression prependedPart0 =3D langFactory.createFunction(= "||", //$NON-NLS-1$ + Arrays.asList( + langFactory.createLiteral("1970-01-01 ", String.class)= , //$NON-NLS-1$ + inner0), + String.class); = + = + convert =3D langFactory.createFunction("to_date", //$NON-= NLS-1$ + Arrays.asList(prependedPart0, + langFactory.createLiteral(format, String.class)), = + java.sql.Time.class); = + break; = = + case TIMESTAMP: + // convert(timestamp, time) = + // --> to_date(('1970-01-01 ' || to_char(timestampvalue, '= HH24:MI:SS'))), = + // 'YYYY-MM-DD HH24:MI:SS') = + IFunction inner =3D langFactory.createFunction("to_char", = //$NON-NLS-1$ + Arrays.asList( = + args.get(0), + langFactory.createLiteral("HH24:MI:SS", String.cla= ss)), //$NON-NLS-1$ + String.class); = + = + IExpression prependedPart =3D langFactory.createFunction(= "||", //$NON-NLS-1$ + Arrays.asList( + langFactory.createLiteral("1970-01-01 ", String.cl= ass), //$NON-NLS-1$ + inner), + String.class); + = + convert =3D langFactory.createFunction("to_date", //$NON-= NLS-1$ + Arrays.asList(prependedPart, + langFactory.createLiteral(format, String.class)), = + java.sql.Time.class); = = + break; + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } = + = + private IExpression convertToTimestamp(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); + int srcCode =3D getSrcCode(srcType); + switch(srcCode) { + case STRING: + // convert(STRING, timestamp) --> to_date(timestampvalue, = 'YYYY-MM-DD HH24:MI:SS.FF'))) = + String format =3D "YYYY-MM-DD HH24:MI:SS.FF"; //$NON-NLS-= 1$ + convert =3D dateTypeHelper("to_timestamp", Arrays.asList(a= rgs.get(0), //$NON-NLS-1$ = + langFactory.createLiteral(format, String.class)), java= .sql.Timestamp.class); + break; + case TIME: + case DATE: + convert =3D dateTypeHelper("cast", Arrays.asList(args.get(0),= //$NON-NLS-1$ = + langFactory.createLiteral("timestamp", String.clas= s)), java.sql.Timestamp.class); //$NON-NLS-1$ + break; = + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IExpression convertToChar(IFunction function) { + // two cases: = + // 1) 2-byte: convert(string, char) --> cast(stringkey AS= char(2)) + // 2) single bit: just drop + // TODO: case 1) + return DROP_MODIFIER.modify(function); = + } + + private IExpression convertToString(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + String format =3D null; + + int srcCode =3D getSrcCode(function); + switch(srcCode) { // convert(input, string) --> to_char(input) + case BOOLEAN: + convert =3D langFactory.createFunction("decode", Arrays.as= List( //$NON-NLS-1$ + args.get(0), + langFactory.createLiteral(new Integer(0), Integer.= class), + langFactory.createLiteral("false", String.class), = //$NON-NLS-1$ + langFactory.createLiteral(new Integer(1), Integer.= class), + langFactory.createLiteral("true", String.class) ),= //$NON-NLS-1$ + String.class); + = + break; + case BYTE: + case SHORT: + case INTEGER: + case LONG: + case BIGINTEGER: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + convert =3D createStringFunction(args.get(0)); + break; + // convert(input, string) --> to_char(input, format) + case DATE: + format =3D "YYYY-MM-DD"; //$NON-NLS-1$ + convert =3D createStringFunction(args.get(0), format); = + break; + case TIME: + format =3D "HH24:MI:SS"; //$NON-NLS-1$ + convert =3D createStringFunction(args.get(0), format); = + break; + case TIMESTAMP: + convert =3D createStringFunction(args.get(0), "YYYY-MM-DD = HH24:MI:SS.FF"); //$NON-NLS-1$ = + break; + default: + convert =3D DROP_MODIFIER.modify(function); + break; + } + = + return convert; + } + = + private IExpression convertToBoolean(IFunction function) { + IExpression convert =3D null; + int srcCode =3D getSrcCode(function); + switch(srcCode) { + case STRING: + // convert(src, boolean) --> decode(string, 'true', 1, 'fa= lse', 0) + convert =3D booleanHelper(function); = + break; = + case BYTE: + case SHORT: + case INTEGER: + case LONG: + case BIGINTEGER: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + default: + convert =3D DROP_MODIFIER.modify(function); + break; + } + = + return convert; + } + = + private IExpression convertToByte(IFunction function) { + IExpression convert =3D null; + int srcCode =3D getSrcCode(function); + + switch(srcCode) { + case STRING: + convert =3D stringSrcHelper(function); + break; = + case BOOLEAN: + case SHORT: = + case INTEGER: + case LONG: + case BIGINTEGER: = + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IExpression convertToShort(IFunction function) { + IExpression convert =3D null; + int srcCode =3D getSrcCode(function); + + switch(srcCode) { + case STRING: + convert =3D stringSrcHelper(function); + break; = + case BOOLEAN: + case BYTE: + case INTEGER: + case LONG: + case BIGINTEGER: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IExpression convertToInteger(IFunction function) { + IExpression convert =3D null; + int srcCode =3D getSrcCode(function); + + switch(srcCode) { + case STRING: + convert =3D stringSrcHelper(function); + break; = + case BOOLEAN: + case LONG: + case BIGINTEGER: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + + private IExpression convertToLong(IFunction function) { + IExpression convert =3D null; + int srcCode =3D getSrcCode(function); + + switch(srcCode) { + case STRING: + convert =3D stringSrcHelper(function); + break; = + case BOOLEAN: + case BIGINTEGER: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IExpression convertToBigInteger(IFunction function) { + IExpression convert =3D null; + int srcCode =3D getSrcCode(function); + + switch(srcCode) { + case STRING: + convert =3D stringSrcHelper(function); + break; = + case BOOLEAN: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IExpression convertToFloat(IFunction function) { + IExpression convert =3D null; + int srcCode =3D getSrcCode(function); + + switch(srcCode) { + case STRING: + convert =3D stringSrcHelper(function); + break; = + case BOOLEAN: + case DOUBLE: = + case BIGDECIMAL: + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } = + = + private IExpression convertToDouble(IFunction function) { + IExpression convert =3D null; + int srcCode =3D getSrcCode(function); + + switch(srcCode) { + case STRING: + convert =3D stringSrcHelper(function); + break; = + case BOOLEAN: + case BIGDECIMAL: = + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IExpression convertToBigDecimal(IFunction function) { + IExpression convert =3D null; + int srcCode =3D getSrcCode(function); + + switch(srcCode) { + case STRING: + convert =3D stringSrcHelper(function); + break; = + case BOOLEAN: + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } = + + private IFunction dateTypeHelper(String functionName, List args, Class target) { + IFunction convert =3D langFactory.createFunction(functionName, = + args, target); + return convert; = + } + = + private IFunction booleanHelper(IFunction function) { + // using decode(value, 'true', 1, 'false', 0) + List args =3D function.getParameters(); + = + return langFactory.createFunction("decode", //$NON-NLS-1$ + Arrays.asList( + args.get(0), + langFactory.createLiteral("true", String.class), //$N= ON-NLS-1$ = + langFactory.createLiteral(new Byte((byte)1), Byte.cla= ss), + langFactory.createLiteral("false", String.class), //$= NON-NLS-1$ = + langFactory.createLiteral(new Byte((byte)0), Byte.cla= ss) = + ), java.lang.Boolean.class); = + } + = + private IExpression stringSrcHelper(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + // switch the target type + String functionName =3D "to_number"; //$NON-NLS-1$ + int targetCode =3D getTargetCode(function.getType()); + switch(targetCode) { + case BYTE: + convert =3D createFunction(functionName, args.get(0), Byte= .class); + break; + case SHORT: + convert =3D createFunction(functionName, args.get(0), Shor= t.class); + break; = + case INTEGER: + convert =3D createFunction(functionName, args.get(0), Inte= ger.class); + break; + case LONG: + convert =3D createFunction(functionName, args.get(0), Long= .class); + break; = + case BIGINTEGER: + convert =3D createFunction(functionName, args.get(0), java= .math.BigInteger.class); + break; = + case FLOAT: + convert =3D createFunction(functionName, args.get(0), Floa= t.class); + break; + case DOUBLE: + convert =3D createFunction(functionName, args.get(0), Doub= le.class); + break; + case BIGDECIMAL: + convert =3D createFunction(functionName, args.get(0), java= .math.BigDecimal.class); + break; = + default: + convert =3D DROP_MODIFIER.modify(function); + break; = + } = + return convert; + } = + = + private IFunction createFunction(String functionName, IExpression args= 0, Class targetClass) { + IFunction created =3D langFactory.createFunction(functionName, + Arrays.asList(args0), targetClass); + return created; = + } + + private IFunction createStringFunction(IExpression args0, String forma= t) { + IFunction created =3D langFactory.createFunction("to_char", //$NON= -NLS-1$ = + Arrays.asList(args0, langFactory.createLiteral(format, String.= class)), = + String.class); + return created; = + } + = + private IFunction createStringFunction(IExpression args) { + IFunction created =3D langFactory.createFunction("to_char", //$NON= -NLS-1$ = + Arrays.asList( args ), String.class); = + return created; + } + = + private int getSrcCode(IFunction function) { + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); + return ((Integer) typeMap.get(srcType)).intValue(); + } + = + private int getSrcCode(Class source) { + return ((Integer) typeMap.get(source)).intValue(); + } + = + private int getTargetCode(Class target) { + return ((Integer) typeMap.get(target)).intValue(); + } = +} Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/oracle/OracleSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/oracle/OracleSQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleSQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,281 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.oracle; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Types; -import java.util.List; - -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.jdbc.JDBCPlugin; -import com.metamatrix.connector.jdbc.translator.AliasModifier; -import com.metamatrix.connector.jdbc.translator.Translator; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ISetQuery.Operation; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataID; -import com.metamatrix.connector.visitor.util.SQLReservedWords; - -/** - */ -public class OracleSQLTranslator extends Translator { - - public final static String HINT_PREFIX =3D "/*+"; //$NON-NLS-1$ - public final static String DUAL =3D "DUAL"; //$NON-NLS-1$ - public final static String ROWNUM =3D "ROWNUM"; //$NON-NLS-1$ - public final static String SEQUENCE =3D ":SEQUENCE=3D"; //$NON-NLS-1$ - = - public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { - super.initialize(env); - registerFunctionModifier(SourceSystemFunctions.CHAR, new AliasModi= fier("chr")); //$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.LCASE, new AliasMod= ifier("lower")); //$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.UCASE, new AliasMod= ifier("upper")); //$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.IFNULL, new AliasMo= difier("nvl")); //$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.LOG, new AliasModif= ier("ln")); //$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.CEILING, new AliasM= odifier("ceil")); //$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.LOG10, new Log10Fun= ctionModifier(getLanguageFactory())); //$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.CONVERT, new Oracle= ConvertModifier(getLanguageFactory(), getEnvironment().getLogger())); //$NO= N-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.HOUR, new ExtractFu= nctionModifier("HOUR"));//$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.YEAR, new ExtractFu= nctionModifier("YEAR"));//$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.MINUTE, new Extract= FunctionModifier("MINUTE"));//$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.SECOND, new Extract= FunctionModifier("SECOND"));//$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.MONTH, new ExtractF= unctionModifier("MONTH"));//$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new Ext= ractFunctionModifier("DAY"));//$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.MONTHNAME, new Mont= hOrDayNameFunctionModifier(getLanguageFactory(), "Month"));//$NON-NLS-1$ //= $NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.DAYNAME, new MonthO= rDayNameFunctionModifier(getLanguageFactory(), "Day"));//$NON-NLS-1$ //$NON= -NLS-2$ - registerFunctionModifier(SourceSystemFunctions.WEEK, new DayWeekQu= arterFunctionModifier(getLanguageFactory(), "WW"));//$NON-NLS-1$ //$NON-NLS= -2$ - registerFunctionModifier(SourceSystemFunctions.QUARTER, new DayWee= kQuarterFunctionModifier(getLanguageFactory(), "Q"));//$NON-NLS-1$ //$NON-N= LS-2$ - registerFunctionModifier(SourceSystemFunctions.DAYOFWEEK, new DayW= eekQuarterFunctionModifier(getLanguageFactory(), "D"));//$NON-NLS-1$ //$NON= -NLS-2$ - registerFunctionModifier(SourceSystemFunctions.DAYOFYEAR, new DayW= eekQuarterFunctionModifier(getLanguageFactory(), "DDD"));//$NON-NLS-1$ //$N= ON-NLS-2$ = - registerFunctionModifier(SourceSystemFunctions.LOCATE, new LocateF= unctionModifier(getLanguageFactory()));//$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.SUBSTRING, new Alia= sModifier("substr"));//$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.LEFT, new LeftOrRig= htFunctionModifier(getLanguageFactory()));//$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.RIGHT, new LeftOrRi= ghtFunctionModifier(getLanguageFactory()));//$NON-NLS-1$ //$NON-NLS-2$ - registerFunctionModifier(SourceSystemFunctions.CONCAT, new ConcatF= unctionModifier(getLanguageFactory())); //$NON-NLS-1$ - } - = - @Override - public ICommand modifyCommand(ICommand command, ExecutionContext conte= xt) - throws ConnectorException { - if (!(command instanceof IInsert)) { - return command; - } - = - /* = - * If a missing auto_increment column is modeled with name in sour= ce indicating that an Oracle Sequence = - * then pull the Sequence name out of the name in source of the co= lumn. - */ - IInsert insert =3D (IInsert)command; - List allElements =3D insert.getGroup().getMetadataID().ge= tChildIDs(); - if (allElements.size() =3D=3D insert.getValues().size()) { - return command; - } - = - int index =3D 0; - List elements =3D insert.getElements(); - = - for (MetadataID metadataID : allElements) { - Element element =3D (Element)metadataID.getMetadataObject(); - if (!element.isAutoIncremented()) { - continue; - } - String name =3D element.getNameInSource(); - int seqIndex =3D name.indexOf(SEQUENCE); - if (seqIndex =3D=3D -1) { - continue; - } - boolean found =3D false; - while (index < elements.size()) { - if (metadataID.equals(elements.get(index).getMetadataID())) { - found =3D true; - break; - } - index++; - } - if (found) { - continue; - } - = - String sequence =3D name.substring(seqIndex + SEQUENCE.length(= )); - = - int delimiterIndex =3D sequence.indexOf(SQLReservedWords.DOT); - if (delimiterIndex =3D=3D -1) { - throw new ConnectorException("Invalid name in source sequence= format. Expected " + SEQUENCE + "., but was " + name); - } - String sequenceGroupName =3D sequence.substring(0, delimiterIn= dex); - String sequenceElementName =3D sequence.substring(delimiterInd= ex + 1); - = - IGroup sequenceGroup =3D this.getLanguageFactory().createGroup= (sequenceGroupName, null, null); - IElement sequenceElement =3D this.getLanguageFactory().createE= lement(sequenceElementName, sequenceGroup, null, element.getJavaType()); - insert.getElements().add(index, this.getLanguageFactory().crea= teElement(element.getMetadataID().getName(), insert.getGroup(), metadataID,= element.getJavaType())); - insert.getValues().add(index, sequenceElement); - } - return command; - } - - @Override - public String addLimitString(String queryCommand, ILimit limit) { - StringBuffer limitQuery =3D new StringBuffer(queryCommand.length()); - if (limit.getRowOffset() > 0) { - limitQuery.append("SELECT * FROM (SELECT VIEW_FOR_LIMIT.*, ROWNUM ROWNU= M_ FROM ("); - } else { - limitQuery.append("SELECT * FROM ("); - } - limitQuery.append(queryCommand); - if (limit.getRowOffset() > 0) { - limitQuery.append(") VIEW_FOR_LIMIT WHERE ROWNUM <=3D ").append( - limit.getRowLimit()).append(") WHERE ROWNUM_ > ").append( - limit.getRowOffset()); - } else { - limitQuery.append(") WHERE ROWNUM <=3D ").append( - limit.getRowLimit()); - } - return limitQuery.toString(); - } - = - @Override - public boolean useAsInGroupAlias(){ - return false; - } - = - @Override - public String getSetOperationString(Operation operation) { - if (operation =3D=3D Operation.EXCEPT) { - return "MINUS"; //$NON-NLS-1$ - } - return super.getSetOperationString(operation); - } - = - @Override - public String getSourceComment(ExecutionContext context, ICommand comm= and) { - String comment =3D super.getSourceComment(context, command); - = - if (context !=3D null) { - // Check for db hints - Object payload =3D context.getExecutionPayload(); - if (payload instanceof String) { - String payloadString =3D (String)payload; - if (payloadString.startsWith(HINT_PREFIX)) { - comment +=3D payloadString + " "; //$NON-NLS-1$ - } - } - } - return comment; - } - = - /** - * Don't fully qualify elements if table =3D DUAL or element =3D ROWNU= M or special stuff is packed into name in source value. - * = - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#skipGro= upInElement(java.lang.String, java.lang.String) - * @since 5.0 - */ - @Override - public String replaceElementName(String group, String element) { = = - - // Check if the element was modeled as using a Sequence - int useIndex =3D element.indexOf(SEQUENCE); - if (useIndex >=3D 0) { - String name =3D element.substring(0, useIndex); - if (group !=3D null) { - return group + SQLReservedWords.DOT + name; - } - return name; - } - - // Check if the group name should be discarded - if((group !=3D null && group.equalsIgnoreCase(DUAL)) || element.eq= ualsIgnoreCase(ROWNUM)) { - // Strip group if group or element are pseudo-columns - return element; - } - = - return null; - } - = - @Override - public boolean hasTimeType() { - return false; - } - = - @Override - public String getDefaultConnectionTestQuery() { - return "Select 'x' from DUAL"; //$NON-NLS-1$ - } - = - @Override - public void bindValue(PreparedStatement stmt, Object param, Class para= mType, int i) throws SQLException { - if(param =3D=3D null && Object.class.equals(paramType)){ - //Oracle drive does not support JAVA_OBJECT type - stmt.setNull(i, Types.LONGVARBINARY); - return; - } - super.bindValue(stmt, param, paramType, i); - } - = - @Override - public void afterInitialConnectionCreation(Connection connection) { - String errorStr =3D JDBCPlugin.Util.getString("ConnectionListener.fai= led_to_report_oracle_connection_details"); //$NON-NLS-1$ - ResultSet rs =3D null; - Statement stmt =3D null; - try { = - stmt =3D connection.createStatement(); - rs =3D stmt.executeQuery("select * from v$instance"); = - = - int columnCount =3D rs.getMetaData().getColumnCount(); - while (rs.next()) { - StringBuffer sb =3D new StringBuffer(); - for (int i =3D 1; i <=3D columnCount; i++) { - sb.append(rs.getMetaData().getColumnName(i)).append("= =3D").append(rs.getString(i)).append(";"); //$NON-NLS-1$ //$NON-NLS-2$ - } = - // log the queried information - getEnvironment().getLogger().logInfo(sb.toString()); = = - } = - = - } catch (SQLException e) { - getEnvironment().getLogger().logInfo(errorStr); = - }finally { - try { - if (rs !=3D null) { - rs.close(); - } = - if (stmt !=3D null) { - stmt.close(); - } - } catch (SQLException e1) { - getEnvironment().getLogger().logInfo(errorStr); - } - } - } -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/oracle/OracleSQLTranslator.java (from rev 488, trunk/connectors/connect= or-jdbc/src/main/java/com/metamatrix/connector/jdbc/oracle/OracleSQLTransla= tor.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleSQLTranslator.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleSQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,280 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ +package org.teiid.connector.jdbc.oracle; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Types; +import java.util.List; + +import org.teiid.connector.jdbc.JDBCPlugin; +import org.teiid.connector.jdbc.translator.AliasModifier; +import org.teiid.connector.jdbc.translator.Translator; + +import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.SourceSystemFunctions; +import com.metamatrix.connector.language.ICommand; +import com.metamatrix.connector.language.IElement; +import com.metamatrix.connector.language.IGroup; +import com.metamatrix.connector.language.IInsert; +import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.ISetQuery.Operation; +import com.metamatrix.connector.metadata.runtime.Element; +import com.metamatrix.connector.visitor.util.SQLReservedWords; + +/** + */ +public class OracleSQLTranslator extends Translator { + + public final static String HINT_PREFIX =3D "/*+"; //$NON-NLS-1$ + public final static String DUAL =3D "DUAL"; //$NON-NLS-1$ + public final static String ROWNUM =3D "ROWNUM"; //$NON-NLS-1$ + public final static String SEQUENCE =3D ":SEQUENCE=3D"; //$NON-NLS-1$ + = + public void initialize(ConnectorEnvironment env) throws ConnectorExcep= tion { + super.initialize(env); + registerFunctionModifier(SourceSystemFunctions.CHAR, new AliasModi= fier("chr")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LCASE, new AliasMod= ifier("lower")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.UCASE, new AliasMod= ifier("upper")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.IFNULL, new AliasMo= difier("nvl")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LOG, new AliasModif= ier("ln")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.CEILING, new AliasM= odifier("ceil")); //$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LOG10, new Log10Fun= ctionModifier(getLanguageFactory())); //$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.CONVERT, new Oracle= ConvertModifier(getLanguageFactory(), getEnvironment().getLogger())); //$NO= N-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.HOUR, new ExtractFu= nctionModifier("HOUR"));//$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.YEAR, new ExtractFu= nctionModifier("YEAR"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.MINUTE, new Extract= FunctionModifier("MINUTE"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.SECOND, new Extract= FunctionModifier("SECOND"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.MONTH, new ExtractF= unctionModifier("MONTH"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new Ext= ractFunctionModifier("DAY"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.MONTHNAME, new Mont= hOrDayNameFunctionModifier(getLanguageFactory(), "Month"));//$NON-NLS-1$ //= $NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYNAME, new MonthO= rDayNameFunctionModifier(getLanguageFactory(), "Day"));//$NON-NLS-1$ //$NON= -NLS-2$ + registerFunctionModifier(SourceSystemFunctions.WEEK, new DayWeekQu= arterFunctionModifier(getLanguageFactory(), "WW"));//$NON-NLS-1$ //$NON-NLS= -2$ + registerFunctionModifier(SourceSystemFunctions.QUARTER, new DayWee= kQuarterFunctionModifier(getLanguageFactory(), "Q"));//$NON-NLS-1$ //$NON-N= LS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYOFWEEK, new DayW= eekQuarterFunctionModifier(getLanguageFactory(), "D"));//$NON-NLS-1$ //$NON= -NLS-2$ + registerFunctionModifier(SourceSystemFunctions.DAYOFYEAR, new DayW= eekQuarterFunctionModifier(getLanguageFactory(), "DDD"));//$NON-NLS-1$ //$N= ON-NLS-2$ = + registerFunctionModifier(SourceSystemFunctions.LOCATE, new LocateF= unctionModifier(getLanguageFactory()));//$NON-NLS-1$ + registerFunctionModifier(SourceSystemFunctions.SUBSTRING, new Alia= sModifier("substr"));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.LEFT, new LeftOrRig= htFunctionModifier(getLanguageFactory()));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.RIGHT, new LeftOrRi= ghtFunctionModifier(getLanguageFactory()));//$NON-NLS-1$ //$NON-NLS-2$ + registerFunctionModifier(SourceSystemFunctions.CONCAT, new ConcatF= unctionModifier(getLanguageFactory())); //$NON-NLS-1$ + } + = + @Override + public ICommand modifyCommand(ICommand command, ExecutionContext conte= xt) + throws ConnectorException { + if (!(command instanceof IInsert)) { + return command; + } + = + /* = + * If a missing auto_increment column is modeled with name in sour= ce indicating that an Oracle Sequence = + * then pull the Sequence name out of the name in source of the co= lumn. + */ + IInsert insert =3D (IInsert)command; + List allElements =3D insert.getGroup().getMetadataObject().g= etChildren(); + if (allElements.size() =3D=3D insert.getValues().size()) { + return command; + } + = + int index =3D 0; + List elements =3D insert.getElements(); + = + for (Element element : allElements) { + if (!element.isAutoIncremented()) { + continue; + } + String name =3D element.getNameInSource(); + int seqIndex =3D name.indexOf(SEQUENCE); + if (seqIndex =3D=3D -1) { + continue; + } + boolean found =3D false; + while (index < elements.size()) { + if (element.equals(elements.get(index).getMetadataObject())) { + found =3D true; + break; + } + index++; + } + if (found) { + continue; + } + = + String sequence =3D name.substring(seqIndex + SEQUENCE.length(= )); + = + int delimiterIndex =3D sequence.indexOf(SQLReservedWords.DOT); + if (delimiterIndex =3D=3D -1) { + throw new ConnectorException("Invalid name in source sequence= format. Expected " + SEQUENCE + "., but was " + name); + } + String sequenceGroupName =3D sequence.substring(0, delimiterIn= dex); + String sequenceElementName =3D sequence.substring(delimiterInd= ex + 1); + = + IGroup sequenceGroup =3D this.getLanguageFactory().createGroup= (sequenceGroupName, null, null); + IElement sequenceElement =3D this.getLanguageFactory().createE= lement(sequenceElementName, sequenceGroup, null, element.getJavaType()); + insert.getElements().add(index, this.getLanguageFactory().crea= teElement(element.getName(), insert.getGroup(), element, element.getJavaTyp= e())); + insert.getValues().add(index, sequenceElement); + } + return command; + } + + @Override + public String addLimitString(String queryCommand, ILimit limit) { + StringBuffer limitQuery =3D new StringBuffer(queryCommand.length()); + if (limit.getRowOffset() > 0) { + limitQuery.append("SELECT * FROM (SELECT VIEW_FOR_LIMIT.*, ROWNUM ROWNU= M_ FROM ("); + } else { + limitQuery.append("SELECT * FROM ("); + } + limitQuery.append(queryCommand); + if (limit.getRowOffset() > 0) { + limitQuery.append(") VIEW_FOR_LIMIT WHERE ROWNUM <=3D ").append( + limit.getRowLimit()).append(") WHERE ROWNUM_ > ").append( + limit.getRowOffset()); + } else { + limitQuery.append(") WHERE ROWNUM <=3D ").append( + limit.getRowLimit()); + } + return limitQuery.toString(); + } + = + @Override + public boolean useAsInGroupAlias(){ + return false; + } + = + @Override + public String getSetOperationString(Operation operation) { + if (operation =3D=3D Operation.EXCEPT) { + return "MINUS"; //$NON-NLS-1$ + } + return super.getSetOperationString(operation); + } + = + @Override + public String getSourceComment(ExecutionContext context, ICommand comm= and) { + String comment =3D super.getSourceComment(context, command); + = + if (context !=3D null) { + // Check for db hints + Object payload =3D context.getExecutionPayload(); + if (payload instanceof String) { + String payloadString =3D (String)payload; + if (payloadString.startsWith(HINT_PREFIX)) { + comment +=3D payloadString + " "; //$NON-NLS-1$ + } + } + } + return comment; + } + = + /** + * Don't fully qualify elements if table =3D DUAL or element =3D ROWNU= M or special stuff is packed into name in source value. + * = + * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#skipGro= upInElement(java.lang.String, java.lang.String) + * @since 5.0 + */ + @Override + public String replaceElementName(String group, String element) { = = + + // Check if the element was modeled as using a Sequence + int useIndex =3D element.indexOf(SEQUENCE); + if (useIndex >=3D 0) { + String name =3D element.substring(0, useIndex); + if (group !=3D null) { + return group + SQLReservedWords.DOT + name; + } + return name; + } + + // Check if the group name should be discarded + if((group !=3D null && group.equalsIgnoreCase(DUAL)) || element.eq= ualsIgnoreCase(ROWNUM)) { + // Strip group if group or element are pseudo-columns + return element; + } + = + return null; + } + = + @Override + public boolean hasTimeType() { + return false; + } + = + @Override + public String getDefaultConnectionTestQuery() { + return "Select 'x' from DUAL"; //$NON-NLS-1$ + } + = + @Override + public void bindValue(PreparedStatement stmt, Object param, Class para= mType, int i) throws SQLException { + if(param =3D=3D null && Object.class.equals(paramType)){ + //Oracle drive does not support JAVA_OBJECT type + stmt.setNull(i, Types.LONGVARBINARY); + return; + } + super.bindValue(stmt, param, paramType, i); + } + = + @Override + public void afterInitialConnectionCreation(Connection connection) { + String errorStr =3D JDBCPlugin.Util.getString("ConnectionListener.fai= led_to_report_oracle_connection_details"); //$NON-NLS-1$ + ResultSet rs =3D null; + Statement stmt =3D null; + try { = + stmt =3D connection.createStatement(); + rs =3D stmt.executeQuery("select * from v$instance"); = + = + int columnCount =3D rs.getMetaData().getColumnCount(); + while (rs.next()) { + StringBuffer sb =3D new StringBuffer(); + for (int i =3D 1; i <=3D columnCount; i++) { + sb.append(rs.getMetaData().getColumnName(i)).append("= =3D").append(rs.getString(i)).append(";"); //$NON-NLS-1$ //$NON-NLS-2$ + } = + // log the queried information + getEnvironment().getLogger().logInfo(sb.toString()); = = + } = + = + } catch (SQLException e) { + getEnvironment().getLogger().logInfo(errorStr); = + }finally { + try { + if (rs !=3D null) { + rs.close(); + } = + if (stmt !=3D null) { + stmt.close(); + } + } catch (SQLException e1) { + getEnvironment().getLogger().logInfo(errorStr); + } + } + } +} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/postgresql (from rev 486, trunk/connectors/connector-jdbc/src/main/java= /com/metamatrix/connector/jdbc/postgresql) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/postgresql ___________________________________________________________________ Name: svn:mergeinfo + = Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/postgresql/DatePartFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/DatePartFunctionModifier.java 2009-02-24 14:21:49 UTC (rev = 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/DatePartFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,49 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.postgresql; - -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; - - -/** = - * @since 4.3 - */ -class DatePartFunctionModifier extends BasicFunctionModifier { - = - protected ILanguageFactory factory; - private String part; - - DatePartFunctionModifier(ILanguageFactory langFactory, String partName= ) { - this.factory =3D langFactory; - this.part =3D partName; - } - - public IExpression modify(IFunction function) { - return factory.createFunction("date_part", //$NON-NLS-1$ - new IExpression[] {factory.createLi= teral(part, String.class), function.getParameters()[0]}, - Integer.class); - } -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/postgresql/DatePartFunctionModifier.java (from rev 488, trunk/connector= s/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/postgresql/Dat= ePartFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/DatePartFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/DatePartFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.postgresql; + +import java.util.Arrays; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; + +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; + + +/** = + * @since 4.3 + */ +class DatePartFunctionModifier extends BasicFunctionModifier { + = + protected ILanguageFactory factory; + private String part; + + DatePartFunctionModifier(ILanguageFactory langFactory, String partName= ) { + this.factory =3D langFactory; + this.part =3D partName; + } + + public IExpression modify(IFunction function) { + return factory.createFunction("date_part", //$NON-NLS-1$ + Arrays.asList(factory.createLiteral= (part, String.class), function.getParameters().get(0)), + Integer.class); + } +} Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/postgresql/ModifiedDatePartFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/ModifiedDatePartFunctionModifier.java 2009-02-24 14:21:49 U= TC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/ModifiedDatePartFunctionModifier.java 2009-02-24 18:28:11 UTC (r= ev 491) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.postgresql; - -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; - - -/** = - * @since 4.3 - */ -class ModifiedDatePartFunctionModifier extends DatePartFunctionModifier { - = - private String modifier; - private Object arg; - - ModifiedDatePartFunctionModifier(ILanguageFactory factory, String part= Name, String modifierFunctionName, Object modifierArgument) { - super(factory, partName); - this.modifier =3D modifierFunctionName; - this.arg =3D modifierArgument; - } - - public IExpression modify(IFunction function) { - IExpression expr =3D super.modify(function); - return factory.createFunction(modifier, - new IExpression[] {expr, factory.cr= eateLiteral(arg, arg.getClass())}, - arg.getClass()); - } - = - = -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/postgresql/ModifiedDatePartFunctionModifier.java (from rev 488, trunk/c= onnectors/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/postgr= esql/ModifiedDatePartFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/ModifiedDatePartFunctionModifier.java (r= ev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/ModifiedDatePartFunctionModifier.java 2009-02-24 18:28:11 UTC (r= ev 491) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.postgresql; + +import java.util.Arrays; + +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; + + +/** = + * @since 4.3 + */ +class ModifiedDatePartFunctionModifier extends DatePartFunctionModifier { + = + private String modifier; + private Object arg; + + ModifiedDatePartFunctionModifier(ILanguageFactory factory, String part= Name, String modifierFunctionName, Object modifierArgument) { + super(factory, partName); + this.modifier =3D modifierFunctionName; + this.arg =3D modifierArgument; + } + + public IExpression modify(IFunction function) { + IExpression expr =3D super.modify(function); + return factory.createFunction(modifier, + Arrays.asList(expr, factory.createL= iteral(arg, arg.getClass())), + arg.getClass()); + } + = + = +} Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/postgresql/PostgreSQLCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLCapabilities.java 2009-02-24 14:21:49 UTC (rev 48= 6) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,12 +20,13 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.postgresql; +package org.teiid.connector.jdbc.postgresql; = import java.util.ArrayList; import java.util.List; + +import org.teiid.connector.jdbc.JDBCCapabilities; = -import com.metamatrix.connector.jdbc.JDBCCapabilities; = = /** = @@ -241,7 +242,7 @@ * 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 com.metamatrix.connector.jdbc.JDBCCapabilities#supportsInlineV= iews() + * @see org.teiid.connector.jdbc.JDBCCapabilities#supportsInlineViews() */ public boolean supportsInlineViews() { return true; Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/postgresql/PostgreSQLConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLConvertModifier.java 2009-02-24 14:21:49 UTC (rev= 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,204 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.postgresql; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Arrays; -import java.util.List; - -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; -import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.ICompareCriteria.Operator; - -/** - */ -class PostgreSQLConvertModifier extends BasicFunctionModifier implements F= unctionModifier { = - private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); - private ILanguageFactory langFactory; - = - PostgreSQLConvertModifier(ILanguageFactory langFactory) { - this.langFactory =3D langFactory; - } - - public List translate(IFunction function) { - return null; - } = - = - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - - if (args[0] !=3D null && args[0] instanceof ILiteral && ((ILiteral= )args[0]).getValue() =3D=3D null ) { - if (args[1] !=3D null && args[1] instanceof ILiteral) { - // This is a convert(null, ...) or cast(null as ...) - return DROP_MODIFIER.modify(function); - } - } = - = - if (args[1] !=3D null && args[1] instanceof ILiteral) { - String target =3D ((String)((ILiteral)args[1]).getValue()).toL= owerCase(); - if (target.equals("string")) { //$NON-NLS-1$ = - return convertToString(function); - } else if (target.equals("short")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "smallint", Short.class= ); //$NON-NLS-1$ - } else if (target.equals("integer")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "integer", Integer.clas= s); //$NON-NLS-1$ - } else if (target.equals("long")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "bigint", Long.class); = //$NON-NLS-1$ - } else if (target.equals("biginteger")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "numeric", BigInteger.c= lass); //$NON-NLS-1$ - } else if (target.equals("float")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "real", Float.class); /= /$NON-NLS-1$ - } else if (target.equals("double")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "float8", Double.class)= ; //$NON-NLS-1$ - } else if (target.equals("bigdecimal")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "decimal", BigDecimal.c= lass); //$NON-NLS-1$ - } else if (target.equals("date")) { //$NON-NLS-1$ = - return convertToDate(function); - } else if (target.equals("time")) { //$NON-NLS-1$ = - return convertToTime(function); - } else if (target.equals("timestamp")) { //$NON-NLS-1$ = - return convertToTimestamp(function); - } else if (target.equals("char")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "varchar", String.class= ); //$NON-NLS-1$ - } else if (target.equals("boolean")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "boolean", Boolean.clas= s); //$NON-NLS-1$ - } else if (target.equals("byte")) { //$NON-NLS-1$ = - return createCastFunction(args[0], "smallint", Byte.class)= ; //$NON-NLS-1$ - } - } - return DROP_MODIFIER.modify(function); = - } - = - private IExpression convertToDate(IFunction function) { - IExpression[] args =3D function.getParameters(); - int srcCode =3D getSrcCode(function); - - switch(srcCode) { - case STRING: - return createConversionFunction("to_date", args[0], "YYYY-= MM-DD", java.sql.Date.class); //$NON-NLS-1$//$NON-NLS-2$ - case TIMESTAMP: - return createCastFunction(args[0], "date", java.sql.Date.c= lass); //$NON-NLS-1$ - default: - return DROP_MODIFIER.modify(function); - } - } - - private IExpression convertToTime(IFunction function) { - IExpression[] args =3D function.getParameters(); - = - int srcCode =3D getSrcCode(function); - switch(srcCode) { - case STRING: - //convert(STRING, time) --> to_timestamp('1970-01-01 ' || = timevalue, 'YYYY-MM-DD HH24:MI:SS') - IExpression prependedPart0 =3D langFactory.createFunction(= "||", //$NON-NLS-1$ - = new IExpression[] {langFactory.createLiteral("1970-01-01 ", String.class), = args[0]}, //$NON-NLS-1$ - = String.class); = - = - return createConversionFunction("to_timestamp", prependedP= art0, "YYYY-MM-DD HH24:MI:SS", java.sql.Time.class); //$NON-NLS-1$ //$NON-N= LS-2$ - case TIMESTAMP: - return createCastFunction(args[0], "time", java.sql.Time.c= lass); //$NON-NLS-1$ - default: - return DROP_MODIFIER.modify(function); - } - } = - = - /** - * This works only for Oracle 9i. - * @param src - * @return IFunction - */ - private IExpression convertToTimestamp(IFunction function) { - IExpression[] args =3D function.getParameters(); - int srcCode =3D getSrcCode(function); - switch(srcCode) { - case STRING: - // convert(STRING, timestamp) --> to_date(timestampvalue, = 'YYYY-MM-DD HH24:MI:SS'))) from smalla = - return createConversionFunction("to_timestamp", args[0], "= YYYY-MM-DD HH24:MI:SS.UF", java.sql.Timestamp.class); //$NON-NLS-1$ //$NON-= NLS-2$ - case TIME: - case DATE: - // convert(DATE, timestamp) --> to_date(to_char(DATE, 'YYY= Y-MM-DD HH24:MI:SS'), 'YYYY-MM-DD HH24:MI:SS') - IFunction inner =3D createStringFunction(args[0], "YYYY-MM= -DD HH24:MI:SS"); //$NON-NLS-1$ - = - return createConversionFunction("to_timestamp", inner, "YY= YY-MM-DD HH24:MI:SS", java.sql.Timestamp.class); //$NON-NLS-1$ //$NON-NLS-2$ - default: - return DROP_MODIFIER.modify(function); - } - } - = - private IExpression convertToString(IFunction function) { - IExpression[] args =3D function.getParameters(); - - int srcCode =3D getSrcCode(function); - switch(srcCode) { = - case BOOLEAN: - // convert(booleanSrc, string) --> CASE WHEN booleanSrc TH= EN '1' ELSE '0' END - List when =3D Arrays.asList(langFactory.createCompareCrite= ria(Operator.EQ, function.getParameters()[0], langFactory.createLiteral(Boo= lean.TRUE, Boolean.class))); - List then =3D Arrays.asList(new IExpression[] {langFactory= .createLiteral("1", String.class)}); //$NON-NLS-1$ - IExpression elseExpr =3D langFactory.createLiteral("0", St= ring.class); //$NON-NLS-1$ - return langFactory.createSearchedCaseExpression(when, then= , elseExpr, String.class); - case BYTE: - case SHORT: - case INTEGER: - case LONG: - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - // convert(src, string) --> cast (src AS varchar) - return createCastFunction(args[0], "varchar", String.class= ); //$NON-NLS-1$ - // convert(input, string) --> to_char(input, format) - case DATE: - return createStringFunction(args[0], "YYYY-MM-DD"); //$NON= -NLS-1$ - case TIME: - return createStringFunction(args[0], "HH24:MI:SS"); //$NON= -NLS-1$ - case TIMESTAMP: - return createStringFunction(args[0], "YYYY-MM-DD HH24:MI:S= S.US"); //$NON-NLS-1$ - default: - return DROP_MODIFIER.modify(function); - } - } - - private IFunction createStringFunction(IExpression args0, String forma= t) { - return createConversionFunction("to_char", args0, format, String.c= lass); //$NON-NLS-1$ = - } - = - private IFunction createCastFunction(IExpression value, String typeNam= e, Class targetClass) { - return createConversionFunction("cast", value, typeName, targetCla= ss); //$NON-NLS-1$ - } - - private IFunction createConversionFunction(String functionName, IExpre= ssion value, String target, Class targetClass) { - return langFactory.createFunction(functionName, new IExpression[] = {value, langFactory.createLiteral(target, String.class)}, targetClass); - } - = - private int getSrcCode(IFunction function) { - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); - return ((Integer) typeMap.get(srcType)).intValue(); - } -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/postgresql/PostgreSQLConvertModifier.java (from rev 488, trunk/connecto= rs/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/postgresql/Po= stgreSQLConvertModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLConvertModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,205 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.postgresql; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.DropFunctionModifier; +import org.teiid.connector.jdbc.translator.FunctionModifier; + +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.ICompareCriteria.Operator; + +/** + */ +class PostgreSQLConvertModifier extends BasicFunctionModifier implements F= unctionModifier { = + private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); + private ILanguageFactory langFactory; + = + PostgreSQLConvertModifier(ILanguageFactory langFactory) { + this.langFactory =3D langFactory; + } + + public List translate(IFunction function) { + return null; + } = + = + public IExpression modify(IFunction function) { + List args =3D function.getParameters(); + + if (args.get(0) !=3D null && args.get(0) instanceof ILiteral && ((= ILiteral)args.get(0)).getValue() =3D=3D null ) { + if (args.get(1) !=3D null && args.get(1) instanceof ILiteral) { + // This is a convert(null, ...) or cast(null as ...) + return DROP_MODIFIER.modify(function); + } + } = + = + if (args.get(1) !=3D null && args.get(1) instanceof ILiteral) { + String target =3D ((String)((ILiteral)args.get(1)).getValue())= .toLowerCase(); + if (target.equals("string")) { //$NON-NLS-1$ = + return convertToString(function); + } else if (target.equals("short")) { //$NON-NLS-1$ = + return createCastFunction(args.get(0), "smallint", Short.c= lass); //$NON-NLS-1$ + } else if (target.equals("integer")) { //$NON-NLS-1$ = + return createCastFunction(args.get(0), "integer", Integer.= class); //$NON-NLS-1$ + } else if (target.equals("long")) { //$NON-NLS-1$ = + return createCastFunction(args.get(0), "bigint", Long.clas= s); //$NON-NLS-1$ + } else if (target.equals("biginteger")) { //$NON-NLS-1$ = + return createCastFunction(args.get(0), "numeric", BigInteg= er.class); //$NON-NLS-1$ + } else if (target.equals("float")) { //$NON-NLS-1$ = + return createCastFunction(args.get(0), "real", Float.class= ); //$NON-NLS-1$ + } else if (target.equals("double")) { //$NON-NLS-1$ = + return createCastFunction(args.get(0), "float8", Double.cl= ass); //$NON-NLS-1$ + } else if (target.equals("bigdecimal")) { //$NON-NLS-1$ = + return createCastFunction(args.get(0), "decimal", BigDecim= al.class); //$NON-NLS-1$ + } else if (target.equals("date")) { //$NON-NLS-1$ = + return convertToDate(function); + } else if (target.equals("time")) { //$NON-NLS-1$ = + return convertToTime(function); + } else if (target.equals("timestamp")) { //$NON-NLS-1$ = + return convertToTimestamp(function); + } else if (target.equals("char")) { //$NON-NLS-1$ = + return createCastFunction(args.get(0), "varchar", String.c= lass); //$NON-NLS-1$ + } else if (target.equals("boolean")) { //$NON-NLS-1$ = + return createCastFunction(args.get(0), "boolean", Boolean.= class); //$NON-NLS-1$ + } else if (target.equals("byte")) { //$NON-NLS-1$ = + return createCastFunction(args.get(0), "smallint", Byte.cl= ass); //$NON-NLS-1$ + } + } + return DROP_MODIFIER.modify(function); = + } + = + private IExpression convertToDate(IFunction function) { + List args =3D function.getParameters(); + int srcCode =3D getSrcCode(function); + + switch(srcCode) { + case STRING: + return createConversionFunction("to_date", args.get(0), "Y= YYY-MM-DD", java.sql.Date.class); //$NON-NLS-1$//$NON-NLS-2$ + case TIMESTAMP: + return createCastFunction(args.get(0), "date", java.sql.Da= te.class); //$NON-NLS-1$ + default: + return DROP_MODIFIER.modify(function); + } + } + + private IExpression convertToTime(IFunction function) { + List args =3D function.getParameters(); + = + int srcCode =3D getSrcCode(function); + switch(srcCode) { + case STRING: + //convert(STRING, time) --> to_timestamp('1970-01-01 ' || = timevalue, 'YYYY-MM-DD HH24:MI:SS') + IExpression prependedPart0 =3D langFactory.createFunction(= "||", //$NON-NLS-1$ + = Arrays.asList(langFactory.createLiteral("1970-01-01 ", String.class), args.= get(0)), //$NON-NLS-1$ + = String.class); = + = + return createConversionFunction("to_timestamp", prependedP= art0, "YYYY-MM-DD HH24:MI:SS", java.sql.Time.class); //$NON-NLS-1$ //$NON-N= LS-2$ + case TIMESTAMP: + return createCastFunction(args.get(0), "time", java.sql.Ti= me.class); //$NON-NLS-1$ + default: + return DROP_MODIFIER.modify(function); + } + } = + = + /** + * This works only for Oracle 9i. + * @param src + * @return IFunction + */ + private IExpression convertToTimestamp(IFunction function) { + List args =3D function.getParameters(); + int srcCode =3D getSrcCode(function); + switch(srcCode) { + case STRING: + // convert(STRING, timestamp) --> to_date(timestampvalue, = 'YYYY-MM-DD HH24:MI:SS'))) from smalla = + return createConversionFunction("to_timestamp", args.get(0= ), "YYYY-MM-DD HH24:MI:SS.UF", java.sql.Timestamp.class); //$NON-NLS-1$ //$= NON-NLS-2$ + case TIME: + case DATE: + // convert(DATE, timestamp) --> to_date(to_char(DATE, 'YYY= Y-MM-DD HH24:MI:SS'), 'YYYY-MM-DD HH24:MI:SS') + IFunction inner =3D createStringFunction(args.get(0), "YYY= Y-MM-DD HH24:MI:SS"); //$NON-NLS-1$ + = + return createConversionFunction("to_timestamp", inner, "YY= YY-MM-DD HH24:MI:SS", java.sql.Timestamp.class); //$NON-NLS-1$ //$NON-NLS-2$ + default: + return DROP_MODIFIER.modify(function); + } + } + = + private IExpression convertToString(IFunction function) { + List args =3D function.getParameters(); + + int srcCode =3D getSrcCode(function); + switch(srcCode) { = + case BOOLEAN: + // convert(booleanSrc, string) --> CASE WHEN booleanSrc TH= EN '1' ELSE '0' END + List when =3D Arrays.asList(langFactory.createCompareCrite= ria(Operator.EQ, function.getParameters().get(0), langFactory.createLiteral= (Boolean.TRUE, Boolean.class))); + List then =3D Arrays.asList(langFactory.createLiteral("1",= String.class)); //$NON-NLS-1$ + IExpression elseExpr =3D langFactory.createLiteral("0", St= ring.class); //$NON-NLS-1$ + return langFactory.createSearchedCaseExpression(when, then= , elseExpr, String.class); + case BYTE: + case SHORT: + case INTEGER: + case LONG: + case BIGINTEGER: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + // convert(src, string) --> cast (src AS varchar) + return createCastFunction(args.get(0), "varchar", String.c= lass); //$NON-NLS-1$ + // convert(input, string) --> to_char(input, format) + case DATE: + return createStringFunction(args.get(0), "YYYY-MM-DD"); //= $NON-NLS-1$ + case TIME: + return createStringFunction(args.get(0), "HH24:MI:SS"); //= $NON-NLS-1$ + case TIMESTAMP: + return createStringFunction(args.get(0), "YYYY-MM-DD HH24:= MI:SS.US"); //$NON-NLS-1$ + default: + return DROP_MODIFIER.modify(function); + } + } + + private IFunction createStringFunction(IExpression args0, String forma= t) { + return createConversionFunction("to_char", args0, format, String.c= lass); //$NON-NLS-1$ = + } + = + private IFunction createCastFunction(IExpression value, String typeNam= e, Class targetClass) { + return createConversionFunction("cast", value, typeName, targetCla= ss); //$NON-NLS-1$ + } + + private IFunction createConversionFunction(String functionName, IExpre= ssion value, String target, Class targetClass) { + return langFactory.createFunction(functionName, Arrays.asList(valu= e, langFactory.createLiteral(target, String.class)), targetClass); + } + = + private int getSrcCode(IFunction function) { + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); + return ((Integer) typeMap.get(srcType)).intValue(); + } +} Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/postgresql/PostgreSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/postgresql/PostgreSQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,21 +20,22 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.postgresql; +package org.teiid.connector.jdbc.postgresql; = import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; = +import org.teiid.connector.jdbc.oracle.LeftOrRightFunctionModifier; +import org.teiid.connector.jdbc.oracle.MonthOrDayNameFunctionModifier; +import org.teiid.connector.jdbc.translator.AliasModifier; +import org.teiid.connector.jdbc.translator.Translator; + import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.SourceSystemFunctions; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.oracle.LeftOrRightFunctionModifier; -import com.metamatrix.connector.jdbc.oracle.MonthOrDayNameFunctionModifier; -import com.metamatrix.connector.jdbc.translator.AliasModifier; -import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.IAggregate; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ILimit; Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/sqlserver (from rev 486, trunk/connectors/connector-jdbc/src/main/java/= com/metamatrix/connector/jdbc/sqlserver) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/sqlserver ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/sqlserver/SqlServerCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerCapabilities.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sqlserver/SqlServerCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,11 +22,12 @@ = /* */ -package com.metamatrix.connector.jdbc.sqlserver; +package org.teiid.connector.jdbc.sqlserver; = import java.util.*; + +import org.teiid.connector.jdbc.JDBCCapabilities; = -import com.metamatrix.connector.jdbc.JDBCCapabilities; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/sqlserver/SqlServerSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sqlserver/SqlServerSQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sqlserver/SqlServerSQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,13 +22,14 @@ = /* */ -package com.metamatrix.connector.jdbc.sqlserver; +package org.teiid.connector.jdbc.sqlserver; = +import org.teiid.connector.jdbc.sybase.SybaseSQLTranslator; +import org.teiid.connector.jdbc.translator.AliasModifier; + import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.jdbc.sybase.SybaseSQLTranslator; -import com.metamatrix.connector.jdbc.translator.AliasModifier; = /** */ Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/ssl (from rev 486, trunk/connectors/connector-jdbc/src/main/java/com/me= tamatrix/connector/jdbc/ssl) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/ssl ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/ssl/SequeLinkOracleCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/ssl/SequeLinkOracleCapabilities.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= ssl/SequeLinkOracleCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,9 +20,9 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.ssl; +package org.teiid.connector.jdbc.ssl; = -import com.metamatrix.connector.jdbc.oracle.OracleCapabilities; +import org.teiid.connector.jdbc.oracle.OracleCapabilities; = = /** = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/sybase (from rev 486, trunk/connectors/connector-jdbc/src/main/java/com= /metamatrix/connector/jdbc/sybase) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/sybase ___________________________________________________________________ Name: svn:mergeinfo + = Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/sybase/ModFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/ModFunctionModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/ModFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.sybase; - -import java.util.List; - -import com.metamatrix.connector.api.TypeFacility.RUNTIME_TYPES; -import com.metamatrix.connector.jdbc.translator.AliasModifier; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; - -public class ModFunctionModifier extends AliasModifier { - - private ILanguageFactory langFactory; - = - public ModFunctionModifier(ILanguageFactory langFactory) { - super("%"); //$NON-NLS-1$ - this.langFactory =3D langFactory; - } - = - @Override - public IExpression modify(IFunction function) { - IExpression[] expressions =3D function.getParameters(); - if (RUNTIME_TYPES.INTEGER.equals(expressions[0].getType())) { - return super.modify(function); - } - //x % y =3D> x - floor(x / y) * y - IExpression[] divideArgs =3D new IExpression[2]; - System.arraycopy(expressions, 0, divideArgs, 0, 2); - IFunction divide =3D langFactory.createFunction("/", divideArgs, divideA= rgs[0].getType()); //$NON-NLS-1$ - = - IFunction floor =3D langFactory.createFunction("floor", new IExpression[= ] {divide}, divide.getType()); //$NON-NLS-1$ - = - IExpression[] multArgs =3D new IExpression[] { - floor, expressions[1] - }; - IFunction mult =3D langFactory.createFunction("*", multArgs, multArgs[1]= .getType()); //$NON-NLS-1$ - = - IExpression[] minusArgs =3D new IExpression[] { - expressions[0], mult - }; - return langFactory.createFunction("-", minusArgs, minusArgs[0].getType()= ); //$NON-NLS-1$ - } - = - @Override - public List translate(IFunction function) { - return null; - } - -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/sybase/ModFunctionModifier.java (from rev 488, trunk/connectors/connect= or-jdbc/src/main/java/com/metamatrix/connector/jdbc/sybase/ModFunctionModif= ier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/ModFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/ModFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.sybase; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.AliasModifier; + +import com.metamatrix.connector.api.TypeFacility.RUNTIME_TYPES; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; + +public class ModFunctionModifier extends AliasModifier { + + private ILanguageFactory langFactory; + = + public ModFunctionModifier(ILanguageFactory langFactory) { + super("%"); //$NON-NLS-1$ + this.langFactory =3D langFactory; + } + = + @Override + public IExpression modify(IFunction function) { + List expressions =3D function.getParameters(); + if (RUNTIME_TYPES.INTEGER.equals(expressions.get(0).getType())) { + return super.modify(function); + } + //x % y =3D> x - floor(x / y) * y + IFunction divide =3D langFactory.createFunction("/", new ArrayList(expressions), expressions.get(0).getType()); //$NON-NLS-1$ + = + IFunction floor =3D langFactory.createFunction("floor", Arrays.asList(di= vide), divide.getType()); //$NON-NLS-1$ + = + List multArgs =3D Arrays.asList(floor, expressions.get(1)); + IFunction mult =3D langFactory.createFunction("*", multArgs, multArgs.ge= t(1).getType()); //$NON-NLS-1$ + + List minusArgs =3D Arrays.asList(expressions.get(0), mult); + = + return langFactory.createFunction("-", minusArgs, minusArgs.get(0).getTy= pe()); //$NON-NLS-1$ + } + = + @Override + public List translate(IFunction function) { + return null; + } + +} Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/sybase/SybaseCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseCapabilities.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,12 +22,13 @@ = /* */ -package com.metamatrix.connector.jdbc.sybase; +package org.teiid.connector.jdbc.sybase; = import java.util.ArrayList; import java.util.List; + +import org.teiid.connector.jdbc.JDBCCapabilities; = -import com.metamatrix.connector.jdbc.JDBCCapabilities; = /** */ Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/sybase/SybaseConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseConvertModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,509 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.sybase; - -import java.util.ArrayList; -import java.util.List; - -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; -import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; -import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.language.*; - -/** - */ -public class SybaseConvertModifier extends BasicFunctionModifier implement= s FunctionModifier { - - private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); - static { - // index of expressions in convert functions in Sybase is one, not= zero - DROP_MODIFIER.setReplaceIndex(1); - } - - private ILanguageFactory langFactory; - = - public SybaseConvertModifier(ILanguageFactory langFactory) { - this.langFactory =3D langFactory; - } - - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - IExpression modified =3D null; - = - if (args[1] !=3D null && args[1] instanceof ILiteral) { - String target =3D ((String)((ILiteral)args[1]).getValue()).toL= owerCase(); - if (target.equals("string")) { //$NON-NLS-1$ = - modified =3D convertToString(function); - } else if (target.equals("short")) { //$NON-NLS-1$ = - modified =3D convertToShort(function); - } else if (target.equals("integer")) { //$NON-NLS-1$ = - modified =3D convertToInteger(function); - } else if (target.equals("long")) { //$NON-NLS-1$ = - modified =3D convertToLong(function); - } else if (target.equals("biginteger")) { //$NON-NLS-1$ = - modified =3D convertToBigInteger(function); - } else if (target.equals("float")) { //$NON-NLS-1$ = - modified =3D convertToFloat(function); - } else if (target.equals("double")) { //$NON-NLS-1$ = - modified =3D convertToDouble(function); - } else if (target.equals("bigdecimal")) { //$NON-NLS-1$ = - modified =3D convertToBigDecimal(function); - } else if (target.equals("date")) { //$NON-NLS-1$ = - modified =3D convertToDate(function); - } else if (target.equals("time")) { //$NON-NLS-1$ = - modified =3D convertToTime(function); - } else if (target.equals("timestamp")) { //$NON-NLS-1$ = - modified =3D convertToTimestamp(function); - } else if (target.equals("char")) { //$NON-NLS-1$ = - modified =3D convertToChar(function); - } else if (target.equals("boolean")) { //$NON-NLS-1$ = - modified =3D convertToBoolean(function); - } else if (target.equals("byte")) { //$NON-NLS-1$ = - modified =3D convertToByte(function); - } else { - modified =3D DROP_MODIFIER.modify(function); = - } - return modified; - = - } - return DROP_MODIFIER.modify(function); = - } - = - /* = - * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#trans= late(com.metamatrix.data.language.IFunction) - */ - public List translate(IFunction function) { = - List parts =3D new ArrayList(); - parts.add("convert("); //$NON-NLS-1$ - = - IExpression[] args =3D function.getParameters(); - = - if(args !=3D null && args.length > 0) { - ILiteral type =3D (ILiteral) args[0]; - String typeStr =3D type.getValue().toString(); - = - parts.add(typeStr); - = - for(int i=3D1; i convert(varchar, date,= 112) = - //TODO: what is the best format 111/110/101? - convert =3D createFunction(args[0], 101, String.class); - break; - case TIME: // convert(time, string) --> convert(varchar, time,= 108) - convert =3D createFunction(args[0], 108, String.class); = = - break; - case TIMESTAMP: // convert(time, string) --> convert(varchar,= timestamp, 109) = - convert =3D createFunction(args[0], 109, String.class); = = - break; - default: - convert =3D DROP_MODIFIER.modify(function); - break; - } - = - return convert; - } - - private IExpression convertToShort(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: - case BOOLEAN: = - case BYTE: = - case INTEGER: - case LONG: - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - convert =3D createFunction(args[0], "smallint", Short.clas= s); //$NON-NLS-1$ - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToInteger(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: = - case BOOLEAN: = - case BYTE: - case SHORT: - case LONG: - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - convert =3D createFunction(args[0], "int", Integer.class);= //$NON-NLS-1$ - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToLong(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: - case BOOLEAN: - case BYTE: - case SHORT: - case INTEGER: = - case BIGINTEGER: - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - convert =3D createFunction(args[0], "numeric", Long.class)= ; //$NON-NLS-1$ - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToBigInteger(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: - case BOOLEAN: - case BYTE: - case SHORT: - case INTEGER: - case LONG: = - case FLOAT: - case DOUBLE: - case BIGDECIMAL: - convert =3D createFunction(args[0], "numeric", java.math.B= igInteger.class); //$NON-NLS-1$ - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - - private IExpression convertToFloat(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: - case BOOLEAN: = - case BYTE: - case SHORT: - case INTEGER: - case LONG: = - case BIGINTEGER: = - case DOUBLE: = - case BIGDECIMAL: - convert =3D createFunction(args[0], "real", Float.class); = //$NON-NLS-1$ - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } = - = - private IExpression convertToDouble(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: - case BOOLEAN: = - case BYTE: - case SHORT: - case INTEGER: - case LONG: = - case BIGINTEGER: = - case FLOAT: = - case BIGDECIMAL: = - convert =3D createFunction(args[0], "float", Double.class)= ; //$NON-NLS-1$ - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToBigDecimal(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class src =3D args[0].getType(); - int srcCode =3D getSrcCode(src); - - switch(srcCode) { - case STRING: - case BOOLEAN: = - case BYTE: - case SHORT: - case INTEGER: - case LONG: = - case BIGINTEGER: = - case FLOAT: = - case DOUBLE: - convert =3D createFunction(args[0], "float", java.math.Big= Decimal.class); //$NON-NLS-1$ - break; = - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IExpression convertToChar(IFunction function) { - IExpression[] args =3D function.getParameters(); - return createFunction(args[0], "char", Character.class); //$NON-NL= S-1$ - } = - = - private IExpression convertToDate(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); - int srcCode =3D getSrcCode(srcType); - - switch(srcCode) { - case STRING: - // convert(STRING, date) --> convert(datetime, STRING) - convert =3D createFunction(args[0], "datetime", java.sql.D= ate.class); //$NON-NLS-1$ - break; - case TIMESTAMP: - // convert(TIMESTAMP, date) --> convert(datetime, convert(= varchar, TIMESTAMP, 1/101)) - // Build inner convert - IFunction innerConvert =3D langFactory.createFunction("con= vert", //$NON-NLS-1$ - new IExpression[] { = - langFactory.createLiteral("varchar", String.class)= , //$NON-NLS-1$ - args[0], - langFactory.createLiteral(new Integer(109), Intege= r.class) }, - String.class); - = - // Build outer convert - convert =3D langFactory.createFunction("convert", //$NON-= NLS-1$ - new IExpression[] { = - langFactory.createLiteral("datetime", String.class= ), //$NON-NLS-1$ - innerConvert }, - java.sql.Timestamp.class); - = - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - - private IExpression convertToTime(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); - = - int srcCode =3D getSrcCode(srcType); - switch(srcCode) { - case STRING: - //convert(STRING, time) --> convert(datetime, STRING) - convert =3D createFunction(args[0], "datetime", java.sql.T= ime.class); //$NON-NLS-1$ - break; = = - case TIMESTAMP: - // convert(TIMESTAMP, time) --> convert(datetime, convert(= varchar, TIMESTAMP, 108/8) = - // Build inner convert - IFunction innerConvert =3D langFactory.createFunction("con= vert", //$NON-NLS-1$ - new IExpression[] { = - langFactory.createLiteral("varchar", String.class)= , //$NON-NLS-1$ - args[0], - langFactory.createLiteral(new Integer(108), Intege= r.class) }, - String.class); - = - // Build outer convert - convert =3D langFactory.createFunction("convert", //$NON-= NLS-1$ - new IExpression[] { = - langFactory.createLiteral("datetime", String.class= ), //$NON-NLS-1$ - innerConvert }, - java.sql.Time.class); - = - break; - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } = - = - private IExpression convertToTimestamp(IFunction function) { - IExpression convert =3D null; - IExpression[] args =3D function.getParameters(); - Class srcType =3D args[0].getType(); - int srcCode =3D getSrcCode(srcType); - switch(srcCode) { - case STRING: - case TIME: = - case DATE: - // convert(DATE/TIME/STRING, timestamp) --> convert(dateti= me, DATE) - convert =3D createFunction(args[0], "datetime", java.sql.T= imestamp.class); //$NON-NLS-1$ = - break; = - default: - convert =3D DROP_MODIFIER.modify(function); = - break; - } - = - return convert; - } - = - private IFunction createFunction(IExpression args0, String targetType,= Class targetClass) { - IFunction created =3D langFactory.createFunction("convert", //$NON= -NLS-1$ - new IExpression[] { - langFactory.createLiteral(targetType, String.class), - args0}, = - targetClass); - return created; = - } - = - private IFunction createFunction(IExpression args0, int formatNumber, = Class targetClass) { - IFunction created =3D langFactory.createFunction("convert", //$NO= N-NLS-1$ - new IExpression[] { langFactory.createLiteral("varchar", Strin= g.class), //$NON-NLS-1$ = - args0, - langFactory.createLiteral(new Integer(formatNumber), Integ= er.class) }, = - targetClass); - return created; = - } - = - private int getSrcCode(Class source) { - return ((Integer) typeMap.get(source)).intValue(); - } - -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/sybase/SybaseConvertModifier.java (from rev 488, trunk/connectors/conne= ctor-jdbc/src/main/java/com/metamatrix/connector/jdbc/sybase/SybaseConvertM= odifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseConvertModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,514 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.sybase; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.DropFunctionModifier; +import org.teiid.connector.jdbc.translator.FunctionModifier; + +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILiteral; + +/** + */ +public class SybaseConvertModifier extends BasicFunctionModifier implement= s FunctionModifier { + + private static DropFunctionModifier DROP_MODIFIER =3D new DropFunction= Modifier(); + static { + // index of expressions in convert functions in Sybase is one, not= zero + DROP_MODIFIER.setReplaceIndex(1); + } + + private ILanguageFactory langFactory; + = + public SybaseConvertModifier(ILanguageFactory langFactory) { + this.langFactory =3D langFactory; + } + + public IExpression modify(IFunction function) { + List args =3D function.getParameters(); + IExpression modified =3D null; + = + if (args.get(1) !=3D null && args.get(1) instanceof ILiteral) { + String target =3D ((String)((ILiteral)args.get(1)).getValue())= .toLowerCase(); + if (target.equals("string")) { //$NON-NLS-1$ = + modified =3D convertToString(function); + } else if (target.equals("short")) { //$NON-NLS-1$ = + modified =3D convertToShort(function); + } else if (target.equals("integer")) { //$NON-NLS-1$ = + modified =3D convertToInteger(function); + } else if (target.equals("long")) { //$NON-NLS-1$ = + modified =3D convertToLong(function); + } else if (target.equals("biginteger")) { //$NON-NLS-1$ = + modified =3D convertToBigInteger(function); + } else if (target.equals("float")) { //$NON-NLS-1$ = + modified =3D convertToFloat(function); + } else if (target.equals("double")) { //$NON-NLS-1$ = + modified =3D convertToDouble(function); + } else if (target.equals("bigdecimal")) { //$NON-NLS-1$ = + modified =3D convertToBigDecimal(function); + } else if (target.equals("date")) { //$NON-NLS-1$ = + modified =3D convertToDate(function); + } else if (target.equals("time")) { //$NON-NLS-1$ = + modified =3D convertToTime(function); + } else if (target.equals("timestamp")) { //$NON-NLS-1$ = + modified =3D convertToTimestamp(function); + } else if (target.equals("char")) { //$NON-NLS-1$ = + modified =3D convertToChar(function); + } else if (target.equals("boolean")) { //$NON-NLS-1$ = + modified =3D convertToBoolean(function); + } else if (target.equals("byte")) { //$NON-NLS-1$ = + modified =3D convertToByte(function); + } else { + modified =3D DROP_MODIFIER.modify(function); = + } + return modified; + = + } + return DROP_MODIFIER.modify(function); = + } + = + /* = + * @see com.metamatrix.connector.jdbc.extension.FunctionModifier#trans= late(com.metamatrix.data.language.IFunction) + */ + public List translate(IFunction function) { = + List parts =3D new ArrayList(); + parts.add("convert("); //$NON-NLS-1$ + = + List args =3D function.getParameters(); + = + if(args !=3D null && args.size() > 0) { + ILiteral type =3D (ILiteral) args.get(0); + String typeStr =3D type.getValue().toString(); + = + parts.add(typeStr); + = + for(int i=3D1; i args =3D function.getParameters(); + Class src =3D args.get(0).getType(); + int srcCode =3D getSrcCode(src); + = + switch(srcCode) { + case STRING: + //TODO: how to map the 'true' to '1' before it is translat= ed to bit + case BYTE: + case SHORT: + case INTEGER: + case LONG: + case BIGINTEGER: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + convert =3D createFunction(args.get(0), "bit", Boolean.cla= ss); //$NON-NLS-1$ = + break; = + default: + convert =3D DROP_MODIFIER.modify(function); + break; + } + = + return convert; + } + = + private IExpression convertToByte(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); + int srcCode =3D getSrcCode(src); + = + switch(srcCode) { + case STRING: + case BOOLEAN: + case SHORT: = + case INTEGER: + case LONG: + case BIGINTEGER: = + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + convert =3D createFunction(args.get(0), "tinyint", String.= class); //$NON-NLS-1$ = + break; = + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IExpression convertToString(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); + int srcCode =3D getSrcCode(src); + = + switch(srcCode) { = + case CHAR: + case BOOLEAN: + case BYTE: = + case SHORT: + case INTEGER: + case LONG: + case BIGINTEGER: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: = + convert =3D createFunction(args.get(0), "varchar", String.= class); //$NON-NLS-1$ = + break; = + case DATE: // convert(date, string) --> convert(varchar, date,= 112) = + //TODO: what is the best format 111/110/101? + convert =3D createFunction(args.get(0), 101, String.class); + break; + case TIME: // convert(time, string) --> convert(varchar, time,= 108) + convert =3D createFunction(args.get(0), 108, String.class)= ; = + break; + case TIMESTAMP: // convert(time, string) --> convert(varchar,= timestamp, 109) = + convert =3D createFunction(args.get(0), 109, String.class)= ; = + break; + default: + convert =3D DROP_MODIFIER.modify(function); + break; + } + = + return convert; + } + + private IExpression convertToShort(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); + int srcCode =3D getSrcCode(src); + + switch(srcCode) { + case STRING: + case BOOLEAN: = + case BYTE: = + case INTEGER: + case LONG: + case BIGINTEGER: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + convert =3D createFunction(args.get(0), "smallint", Short.= class); //$NON-NLS-1$ + break; + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IExpression convertToInteger(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); + int srcCode =3D getSrcCode(src); + + switch(srcCode) { + case STRING: = + case BOOLEAN: = + case BYTE: + case SHORT: + case LONG: + case BIGINTEGER: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + convert =3D createFunction(args.get(0), "int", Integer.cla= ss); //$NON-NLS-1$ + break; + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IExpression convertToLong(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); + int srcCode =3D getSrcCode(src); + + switch(srcCode) { + case STRING: + case BOOLEAN: + case BYTE: + case SHORT: + case INTEGER: = + case BIGINTEGER: + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + convert =3D createFunction(args.get(0), "numeric", Long.cl= ass); //$NON-NLS-1$ + break; + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IExpression convertToBigInteger(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); + int srcCode =3D getSrcCode(src); + + switch(srcCode) { + case STRING: + case BOOLEAN: + case BYTE: + case SHORT: + case INTEGER: + case LONG: = + case FLOAT: + case DOUBLE: + case BIGDECIMAL: + convert =3D createFunction(args.get(0), "numeric", java.ma= th.BigInteger.class); //$NON-NLS-1$ + break; + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + + private IExpression convertToFloat(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); + int srcCode =3D getSrcCode(src); + + switch(srcCode) { + case STRING: + case BOOLEAN: = + case BYTE: + case SHORT: + case INTEGER: + case LONG: = + case BIGINTEGER: = + case DOUBLE: = + case BIGDECIMAL: + convert =3D createFunction(args.get(0), "real", Float.clas= s); //$NON-NLS-1$ + break; + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } = + = + private IExpression convertToDouble(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); + int srcCode =3D getSrcCode(src); + + switch(srcCode) { + case STRING: + case BOOLEAN: = + case BYTE: + case SHORT: + case INTEGER: + case LONG: = + case BIGINTEGER: = + case FLOAT: = + case BIGDECIMAL: = + convert =3D createFunction(args.get(0), "float", Double.cl= ass); //$NON-NLS-1$ + break; + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IExpression convertToBigDecimal(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class src =3D args.get(0).getType(); + int srcCode =3D getSrcCode(src); + + switch(srcCode) { + case STRING: + case BOOLEAN: = + case BYTE: + case SHORT: + case INTEGER: + case LONG: = + case BIGINTEGER: = + case FLOAT: = + case DOUBLE: + convert =3D createFunction(args.get(0), "float", java.math= .BigDecimal.class); //$NON-NLS-1$ + break; = + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IExpression convertToChar(IFunction function) { + List args =3D function.getParameters(); + return createFunction(args.get(0), "char", Character.class); //$NO= N-NLS-1$ + } = + = + private IExpression convertToDate(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); + int srcCode =3D getSrcCode(srcType); + + switch(srcCode) { + case STRING: + // convert(STRING, date) --> convert(datetime, STRING) + convert =3D createFunction(args.get(0), "datetime", java.s= ql.Date.class); //$NON-NLS-1$ + break; + case TIMESTAMP: + // convert(TIMESTAMP, date) --> convert(datetime, convert(= varchar, TIMESTAMP, 1/101)) + // Build inner convert + IFunction innerConvert =3D langFactory.createFunction("con= vert", //$NON-NLS-1$ + Arrays.asList( = + langFactory.createLiteral("varchar", String.class)= , //$NON-NLS-1$ + args.get(0), + langFactory.createLiteral(new Integer(109), Intege= r.class) ), + String.class); + = + // Build outer convert + convert =3D langFactory.createFunction("convert", //$NON-= NLS-1$ + Arrays.asList( = + langFactory.createLiteral("datetime", String.class= ), //$NON-NLS-1$ + innerConvert ), + java.sql.Timestamp.class); + = + break; + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + + private IExpression convertToTime(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); + = + int srcCode =3D getSrcCode(srcType); + switch(srcCode) { + case STRING: + //convert(STRING, time) --> convert(datetime, STRING) + convert =3D createFunction(args.get(0), "datetime", java.s= ql.Time.class); //$NON-NLS-1$ + break; = = + case TIMESTAMP: + // convert(TIMESTAMP, time) --> convert(datetime, convert(= varchar, TIMESTAMP, 108/8) = + // Build inner convert + IFunction innerConvert =3D langFactory.createFunction("con= vert", //$NON-NLS-1$ + Arrays.asList( = + langFactory.createLiteral("varchar", String.class)= , //$NON-NLS-1$ + args.get(0), + langFactory.createLiteral(new Integer(108), Intege= r.class) ), + String.class); + = + // Build outer convert + convert =3D langFactory.createFunction("convert", //$NON-= NLS-1$ + Arrays.asList( = + langFactory.createLiteral("datetime", String.class= ), //$NON-NLS-1$ + innerConvert ), + java.sql.Time.class); + = + break; + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } = + = + private IExpression convertToTimestamp(IFunction function) { + IExpression convert =3D null; + List args =3D function.getParameters(); + Class srcType =3D args.get(0).getType(); + int srcCode =3D getSrcCode(srcType); + switch(srcCode) { + case STRING: + case TIME: = + case DATE: + // convert(DATE/TIME/STRING, timestamp) --> convert(dateti= me, DATE) + convert =3D createFunction(args.get(0), "datetime", java.s= ql.Timestamp.class); //$NON-NLS-1$ = + break; = + default: + convert =3D DROP_MODIFIER.modify(function); = + break; + } + = + return convert; + } + = + private IFunction createFunction(IExpression args0, String targetType,= Class targetClass) { + IFunction created =3D langFactory.createFunction("convert", //$NON= -NLS-1$ + Arrays.asList( + langFactory.createLiteral(targetType, String.class), + args0), = + targetClass); + return created; = + } + = + private IFunction createFunction(IExpression args0, int formatNumber, = Class targetClass) { + IFunction created =3D langFactory.createFunction("convert", //$NO= N-NLS-1$ + Arrays.asList( langFactory.createLiteral("varchar", String.cla= ss), //$NON-NLS-1$ = + args0, + langFactory.createLiteral(new Integer(formatNumber), Integ= er.class) ), = + targetClass); + return created; = + } + = + private int getSrcCode(Class source) { + return ((Integer) typeMap.get(source)).intValue(); + } + +} Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/sybase/SybaseSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/sybase/SybaseSQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseSQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,14 +22,15 @@ = /* */ -package com.metamatrix.connector.jdbc.sybase; +package org.teiid.connector.jdbc.sybase; = +import org.teiid.connector.jdbc.translator.AliasModifier; +import org.teiid.connector.jdbc.translator.SubstringFunctionModifier; +import org.teiid.connector.jdbc.translator.Translator; + import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.jdbc.translator.AliasModifier; -import com.metamatrix.connector.jdbc.translator.SubstringFunctionModifier; -import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ILimit; = /** Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/teradata (from rev 486, trunk/connectors/connector-jdbc/src/main/java/c= om/metamatrix/connector/jdbc/teradata) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/teradata ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/teradata/TeradataCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/teradata/TeradataCapabilities.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= teradata/TeradataCapabilities.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,14 +20,15 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.teradata; +package org.teiid.connector.jdbc.teradata; = import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.jdbc.JDBCCapabilities; +import org.teiid.connector.jdbc.JDBCCapabilities; = = + /** = * for Teradata database Release V2R5.1 */ Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/translator (from rev 486, trunk/connectors/connector-jdbc/src/main/java= /com/metamatrix/connector/jdbc/translator) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/translator ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/AliasModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/AliasModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/AliasModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,7 +22,7 @@ = /* */ -package com.metamatrix.connector.jdbc.translator; +package org.teiid.connector.jdbc.translator; = import com.metamatrix.connector.language.*; = @@ -41,7 +41,7 @@ } = /** - * @see com.metamatrix.connector.jdbc.translator.FunctionModifier#modi= fy(com.metamatrix.connector.language.IFunction) + * @see org.teiid.connector.jdbc.translator.FunctionModifier#modify(co= m.metamatrix.connector.language.IFunction) */ public IExpression modify(IFunction function) { function.setName(alias); Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/translator/BasicFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/BasicFunctionModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/BasicFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,116 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -/* - */ -package com.metamatrix.connector.jdbc.translator; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; - -/** - */ -public abstract class BasicFunctionModifier implements FunctionModifier { - - /* - * Public sharing part for the mapping between class and type in forma= t of MapInteger>. - */ - public static final int STRING =3D 0; - public static final int CHAR =3D 1; - public static final int BOOLEAN =3D 2; - public static final int BYTE =3D 3; - public static final int SHORT =3D 4; - public static final int INTEGER =3D 5; - public static final int LONG =3D 6; - public static final int BIGINTEGER =3D 7; - public static final int FLOAT =3D 8; - public static final int DOUBLE =3D 9; - public static final int BIGDECIMAL =3D 10; - public static final int DATE =3D 11; - public static final int TIME =3D 12; - public static final int TIMESTAMP =3D 13; - public static final int OBJECT =3D 14; - public static final int BLOB =3D 15; - public static final int CLOB =3D 16; - public static final int XML =3D 17; - - public static final Map typeMap =3D new HashMap(); - = - static { - typeMap.put(TypeFacility.RUNTIME_TYPES.STRING, new Integer(STRING)= ); - typeMap.put(TypeFacility.RUNTIME_TYPES.CHAR, new Integer(CHAR)); - typeMap.put(TypeFacility.RUNTIME_TYPES.BOOLEAN, new Integer(BOOLEA= N)); - typeMap.put(TypeFacility.RUNTIME_TYPES.BYTE, new Integer(BYTE)); - typeMap.put(TypeFacility.RUNTIME_TYPES.SHORT, new Integer(SHORT)); - typeMap.put(TypeFacility.RUNTIME_TYPES.INTEGER, new Integer(INTEGE= R)); - typeMap.put(TypeFacility.RUNTIME_TYPES.LONG, new Integer(LONG)); - typeMap.put(TypeFacility.RUNTIME_TYPES.BIG_INTEGER, new Integer(BI= GINTEGER)); - typeMap.put(TypeFacility.RUNTIME_TYPES.FLOAT, new Integer(FLOAT)); - typeMap.put(TypeFacility.RUNTIME_TYPES.DOUBLE, new Integer(DOUBLE)= ); - typeMap.put(TypeFacility.RUNTIME_TYPES.BIG_DECIMAL, new Integer(BI= GDECIMAL)); - typeMap.put(TypeFacility.RUNTIME_TYPES.DATE, new Integer(DATE)); - typeMap.put(TypeFacility.RUNTIME_TYPES.TIME, new Integer(TIME)); - typeMap.put(TypeFacility.RUNTIME_TYPES.TIMESTAMP, new Integer(TIME= STAMP)); - typeMap.put(TypeFacility.RUNTIME_TYPES.OBJECT, new Integer(OBJECT)= ); = - typeMap.put(TypeFacility.RUNTIME_TYPES.BLOB, new Integer(BLOB)); - typeMap.put(TypeFacility.RUNTIME_TYPES.CLOB, new Integer(CLOB)); - typeMap.put(TypeFacility.RUNTIME_TYPES.XML, new Integer(XML)); - } = - = - /** - * Subclass should override this method as needed. - * @see com.metamatrix.connector.jdbc.translator.FunctionModifier#modi= fy(com.metamatrix.connector.language.IFunction) - */ - public IExpression modify(IFunction function) { - return function; - } - - /** - * Subclass should override this method as needed. - * @see com.metamatrix.connector.jdbc.translator.FunctionModifier#tran= slate(com.metamatrix.connector.language.IFunction) - */ - public List translate(IFunction function) { - List objs =3D new ArrayList(); - objs.add(function.getName()); - objs.add("("); //$NON-NLS-1$ - IExpression[] params =3D function.getParameters(); - if(params.length > 0) { = - objs.add(params[0]); - if(params.length > 1) { - for(int i=3D1; iInteger>. + */ + public static final int STRING =3D 0; + public static final int CHAR =3D 1; + public static final int BOOLEAN =3D 2; + public static final int BYTE =3D 3; + public static final int SHORT =3D 4; + public static final int INTEGER =3D 5; + public static final int LONG =3D 6; + public static final int BIGINTEGER =3D 7; + public static final int FLOAT =3D 8; + public static final int DOUBLE =3D 9; + public static final int BIGDECIMAL =3D 10; + public static final int DATE =3D 11; + public static final int TIME =3D 12; + public static final int TIMESTAMP =3D 13; + public static final int OBJECT =3D 14; + public static final int BLOB =3D 15; + public static final int CLOB =3D 16; + public static final int XML =3D 17; + + public static final Map typeMap =3D new HashMap(); + = + static { + typeMap.put(TypeFacility.RUNTIME_TYPES.STRING, new Integer(STRING)= ); + typeMap.put(TypeFacility.RUNTIME_TYPES.CHAR, new Integer(CHAR)); + typeMap.put(TypeFacility.RUNTIME_TYPES.BOOLEAN, new Integer(BOOLEA= N)); + typeMap.put(TypeFacility.RUNTIME_TYPES.BYTE, new Integer(BYTE)); + typeMap.put(TypeFacility.RUNTIME_TYPES.SHORT, new Integer(SHORT)); + typeMap.put(TypeFacility.RUNTIME_TYPES.INTEGER, new Integer(INTEGE= R)); + typeMap.put(TypeFacility.RUNTIME_TYPES.LONG, new Integer(LONG)); + typeMap.put(TypeFacility.RUNTIME_TYPES.BIG_INTEGER, new Integer(BI= GINTEGER)); + typeMap.put(TypeFacility.RUNTIME_TYPES.FLOAT, new Integer(FLOAT)); + typeMap.put(TypeFacility.RUNTIME_TYPES.DOUBLE, new Integer(DOUBLE)= ); + typeMap.put(TypeFacility.RUNTIME_TYPES.BIG_DECIMAL, new Integer(BI= GDECIMAL)); + typeMap.put(TypeFacility.RUNTIME_TYPES.DATE, new Integer(DATE)); + typeMap.put(TypeFacility.RUNTIME_TYPES.TIME, new Integer(TIME)); + typeMap.put(TypeFacility.RUNTIME_TYPES.TIMESTAMP, new Integer(TIME= STAMP)); + typeMap.put(TypeFacility.RUNTIME_TYPES.OBJECT, new Integer(OBJECT)= ); = + typeMap.put(TypeFacility.RUNTIME_TYPES.BLOB, new Integer(BLOB)); + typeMap.put(TypeFacility.RUNTIME_TYPES.CLOB, new Integer(CLOB)); + typeMap.put(TypeFacility.RUNTIME_TYPES.XML, new Integer(XML)); + } = + = + /** + * Subclass should override this method as needed. + * @see org.teiid.connector.jdbc.translator.FunctionModifier#modify(co= m.metamatrix.connector.language.IFunction) + */ + public IExpression modify(IFunction function) { + return function; + } + + /** + * Subclass should override this method as needed. + * @see org.teiid.connector.jdbc.translator.FunctionModifier#translate= (com.metamatrix.connector.language.IFunction) + */ + public List translate(IFunction function) { + List objs =3D new ArrayList(); + objs.add(function.getName()); + objs.add("("); //$NON-NLS-1$ + List params =3D function.getParameters(); + if(params.size() > 0) { = + objs.add(params.get(0)); + if(params.size() > 1) { + for(int i=3D1; i args =3D function.getParameters(); + if(args.size() <=3D replaceIndex) { = + throw new IllegalArgumentException(JDBCPlugin.Util.getString("= DropFunctionModifier.DropFunctionModifier_can_only_be_used_on_functions_wit= h___1") + function); //$NON-NLS-1$ + } + + return args.get(replaceIndex); + } +} Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/EscapeSyntaxModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/EscapeSyntaxModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/EscapeSyntaxModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.translator; +package org.teiid.connector.jdbc.translator; = import java.util.ArrayList; import java.util.List; @@ -39,7 +39,7 @@ } = /** = - * @see com.metamatrix.connector.jdbc.translator.BasicFunctionModifier= #translate(com.metamatrix.connector.language.IFunction) + * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#tran= slate(com.metamatrix.connector.language.IFunction) * @since 5.0 */ public List translate(IFunction function) { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/FunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/FunctionModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/FunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,7 +22,7 @@ = /* */ -package com.metamatrix.connector.jdbc.translator; +package org.teiid.connector.jdbc.translator; = import java.util.List; = Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/translator/FunctionReplacementVisitor.java (from rev 486, trunk/connect= ors/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/util/Functio= nReplacementVisitor.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/FunctionReplacementVisitor.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/FunctionReplacementVisitor.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,204 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.translator; + +import java.util.List; +import java.util.Map; + + +import com.metamatrix.connector.language.IAggregate; +import com.metamatrix.connector.language.ICompareCriteria; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.IGroupBy; +import com.metamatrix.connector.language.IInCriteria; +import com.metamatrix.connector.language.IInlineView; +import com.metamatrix.connector.language.IInsert; +import com.metamatrix.connector.language.IIsNullCriteria; +import com.metamatrix.connector.language.ILikeCriteria; +import com.metamatrix.connector.language.ISearchedCaseExpression; +import com.metamatrix.connector.language.ISelectSymbol; +import com.metamatrix.connector.language.ISubqueryCompareCriteria; +import com.metamatrix.connector.language.ISubqueryInCriteria; +import com.metamatrix.connector.visitor.framework.HierarchyVisitor; + +/** + */ +public class FunctionReplacementVisitor extends HierarchyVisitor { + + private Map functionModifiers; = + + /** + * Set the functon modifiers. = + * @param Map of function names to function modifiers. + */ + public FunctionReplacementVisitor(Map functionModifiers){ + super(); + this.functionModifiers =3D functionModifiers; + } + = + /* = + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.IAggregate) + */ + public void visit(IAggregate obj) { + super.visit(obj); + obj.setExpression(replaceFunction(obj.getExpression())); + } + = + public void visit(IInlineView obj) { + visitNode(obj.getQuery()); + } + + /* = + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.ICompareCriteria) + */ + public void visit(ICompareCriteria obj) { + super.visit(obj); + obj.setLeftExpression(replaceFunction(obj.getLeftExpression())); + obj.setRightExpression(replaceFunction(obj.getRightExpression())); + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IFunction) + */ + public void visit(IFunction obj) { + super.visit(obj); + List args =3D obj.getParameters(); + for(int i=3D0; i expressions =3D obj.getElements(); + = + for (int i=3D0; i rightExprs =3D obj.getRightExpressions(); + = + for(int i=3D0; i values =3D obj.getValues(); + = + for(int i=3D0; i modifiers; - private ExecutionContext context; - private Translator translator; - - private boolean prepared; - = - private List preparedValues =3D new ArrayList(); - private List preparedTypes =3D new ArrayList(); - = - public SQLConversionVisitor(Translator translator) { - this.translator =3D translator; - this.prepared =3D translator.usePreparedStatements(); - this.modifiers =3D translator.getFunctionModifiers(); - } - - public void visit(IBulkInsert obj) { - this.prepared =3D true; - - super.visit(obj); - = - for (int i =3D 0; i < obj.getElements().size(); i++) { - IElement element =3D (IElement) obj.getElements().get(i); - this.preparedTypes.add(element.getType()); - } - - this.preparedValues =3D obj.getRows(); - } = - = - /** - * @param type - * @param object - * @param valuesbuffer - */ - private void translateSQLType(Class type, Object obj, StringBuffer val= uesbuffer) { - if (obj =3D=3D null) { - valuesbuffer.append(NULL); - } else { - if(Number.class.isAssignableFrom(type)) { - boolean useFormatting =3D false; - = - if (Double.class.isAssignableFrom(type)){ - double value =3D ((Double)obj).doubleValue(); - useFormatting =3D (value <=3D SCIENTIC_LOW || value >= =3D SCIENTIC_HIGH); = - } - else if (Float.class.isAssignableFrom(type)){ - float value =3D ((Float)obj).floatValue(); - useFormatting =3D (value <=3D SCIENTIC_LOW || value >= =3D SCIENTIC_HIGH); - } - // The formatting is to avoid the so-called "scientic-nota= tion" - // where toString will use for numbers greater than 10p7 a= nd - // less than 10p-3, where database may not understand. - if (useFormatting) { - synchronized (DECIMAL_FORMAT) { - valuesbuffer.append(DECIMAL_FORMAT.format(obj)); - } - } - else { - valuesbuffer.append(obj); - } - } else if(type.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { - valuesbuffer.append(translator.translateLiteralBoolean((Bo= olean)obj)); - } else if(type.equals(TypeFacility.RUNTIME_TYPES.TIMESTAMP)) { - valuesbuffer.append(translator.translateLiteralTimestamp((= Timestamp)obj)); - } else if(type.equals(TypeFacility.RUNTIME_TYPES.TIME)) { - valuesbuffer.append(translator.translateLiteralTime((Time)= obj)); - } else if(type.equals(TypeFacility.RUNTIME_TYPES.DATE)) { - valuesbuffer.append(translator.translateLiteralDate((java.= sql.Date)obj)); - } else { - // If obj is string, toSting() will not create a new Strin= g = - // object, it returns it self, so new object creation. = - valuesbuffer.append("'") //$NON-NLS-1$ - .append(escapeString(obj.toString())) - .append("'"); //$NON-NLS-1$ - } - } = - } - - /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IProcedure) - */ - public void visit(IProcedure obj) { - this.prepared =3D true; - /* - * preparedValues is now a list of procedure params instead of jus= t values - */ - this.preparedValues =3D obj.getParameters(); - super.buffer.append(generateSqlForStoredProcedure(obj)); - } - - /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IFunction) - */ - public void visit(IFunction obj) { - if(this.modifiers !=3D null) { - FunctionModifier functionModifier =3D (FunctionModifier)this.m= odifiers.get(obj.getName().toLowerCase()); - if(functionModifier !=3D null) { - List parts =3D functionModifier.translate(obj); - = - // null means the FunctionModifier will rely on default tr= anslation - if (parts !=3D null) { - Iterator iter =3D parts.iterator(); - while(iter.hasNext()) { - Object part =3D iter.next(); - if(part instanceof String) { - buffer.append(part); - } else { - append((ILanguageObject)part); - } - } - return; - } = - } = - } = - super.visit(obj); - } - - /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.ILiteral) - */ - public void visit(ILiteral obj) { - if (this.prepared && obj.isBindValue()) { - buffer.append(UNDEFINED_PARAM); - preparedValues.add(obj.getValue()); - preparedTypes.add(obj.getType()); - } else { - translateSQLType(obj.getType(), obj.getValue(), buffer); - } - } - - /** - * Set the per-command execution context on this visitor. = - * @param context ExecutionContext - * @since 4.3 - */ - public void setExecutionContext(ExecutionContext context) { - this.context =3D context; - } - = - /** - * Retrieve the per-command execution context for this visitor = - * (intended for subclasses to use). - * @return - * @since 4.3 - */ - protected ExecutionContext getExecutionContext() { - return this.context; - } - - protected String getSourceComment(ICommand command) { - return this.translator.getSourceComment(this.context, command); - } - = - /** - * This is a generic implementation. Subclass should override this met= hod - * if necessary. - * @param exec The command for the stored procedure. - * @return String to be executed by CallableStatement. - */ - protected String generateSqlForStoredProcedure(IProcedure exec) { - StringBuffer prepareCallBuffer =3D new StringBuffer(); - prepareCallBuffer.append("{ "); //$NON-NLS-1$ - - List params =3D exec.getParameters(); - - //check whether a "?" is needed if there are returns - boolean needQuestionMark =3D false; - Iterator iter =3D params.iterator(); - while(iter.hasNext()){ - IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() =3D=3D Direction.RETURN){ - needQuestionMark =3D true; - break; - } - } - = - prepareCallBuffer.append(getSourceComment(exec)); - = - if(needQuestionMark){ - prepareCallBuffer.append("?=3D"); //$NON-NLS-1$ - } - - prepareCallBuffer.append(" call ");//$NON-NLS-1$ - prepareCallBuffer.append(exec.getMetadataID() !=3D null ? getName(= exec.getMetadataID()) : exec.getProcedureName()); - prepareCallBuffer.append("("); //$NON-NLS-1$ - - int numberOfParameters =3D 0; - iter =3D params.iterator(); - while(iter.hasNext()){ - IParameter param =3D (IParameter)iter.next(); - if(param.getDirection() =3D=3D Direction.IN || param.getDirect= ion() =3D=3D Direction.OUT || param.getDirection() =3D=3D Direction.INOUT){ - if(numberOfParameters > 0){ - prepareCallBuffer.append(","); //$NON-NLS-1$ - } - prepareCallBuffer.append("?"); //$NON-NLS-1$ - numberOfParameters++; - } - } - prepareCallBuffer.append(")"); //$NON-NLS-1$ - prepareCallBuffer.append("}"); //$NON-NLS-1$ - return prepareCallBuffer.toString(); - } - = - /** = - * @return the preparedValues - */ - List getPreparedValues() { - return this.preparedValues; - } - = - /** = - * @return the preparedValues - */ - List getPreparedTypes() { - return this.preparedTypes; - } - = - public boolean isPrepared() { - return prepared; - } - = - public void setPrepared(boolean prepared) { - this.prepared =3D prepared; - } - = - @Override - protected boolean useAsInGroupAlias() { - return this.translator.useAsInGroupAlias(); - } - = - @Override - public void visit(IQuery obj) { - if (obj.getLimit() !=3D null) { - handleLimit(obj); - } else { - super.visit(obj); - } - } - = - @Override - public void visit(ISetQuery obj) { - if (obj.getLimit() !=3D null) { - handleLimit(obj); - } else { - super.visit(obj); - } - } - = - @Override - protected boolean useParensForSetQueries() { - return translator.useParensForSetQueries(); - } - = - private void handleLimit(IQueryCommand obj) { - ILimit limit =3D obj.getLimit(); - obj.setLimit(null); - StringBuffer current =3D this.buffer; - this.buffer =3D new StringBuffer(); - append(obj); - current.append(this.translator.addLimitString(this.buffer.toString(),= limit)); - this.buffer =3D current; - obj.setLimit(limit); - } - = - @Override - protected String replaceElementName(String group, String element) { - return translator.replaceElementName(group, element); - } - = - @Override - protected void appendSetOperation(Operation operation) { - buffer.append(translator.getSetOperationString(operation)); - } - = -} Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/translator/SQLConversionVisitor.java (from rev 488, trunk/connectors/co= nnector-jdbc/src/main/java/com/metamatrix/connector/jdbc/translator/SQLConv= ersionVisitor.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/SQLConversionVisitor.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/SQLConversionVisitor.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,340 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +/* + */ +package org.teiid.connector.jdbc.translator; + +import java.sql.Time; +import java.sql.Timestamp; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.IBulkInsert; +import com.metamatrix.connector.language.ICommand; +import com.metamatrix.connector.language.IElement; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageObject; +import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.IParameter; +import com.metamatrix.connector.language.IProcedure; +import com.metamatrix.connector.language.IQuery; +import com.metamatrix.connector.language.IQueryCommand; +import com.metamatrix.connector.language.ISetQuery; +import com.metamatrix.connector.language.IParameter.Direction; +import com.metamatrix.connector.language.ISetQuery.Operation; +import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.visitor.util.SQLStringVisitor; + +/** + * This visitor takes an ICommand and does DBMS-specific conversion on it + * to produce a SQL String. This class is expected to be subclassed. + * Specialized instances of this class can be gotten from a SQL Translator + * {@link Translator#getTranslationVisitor(RuntimeMetadata) using this met= hod}. + */ +public class SQLConversionVisitor extends SQLStringVisitor{ + + private static DecimalFormat DECIMAL_FORMAT =3D = + new DecimalFormat("#############################0.0###############= ##############"); //$NON-NLS-1$ = + private static double SCIENTIC_LOW =3D Math.pow(10, -3); + private static double SCIENTIC_HIGH =3D Math.pow(10, 7); + = + private Map modifiers; + private ExecutionContext context; + private Translator translator; + + private boolean prepared; + = + private List preparedValues =3D new ArrayList(); + private List preparedTypes =3D new ArrayList(); + = + public SQLConversionVisitor(Translator translator) { + this.translator =3D translator; + this.prepared =3D translator.usePreparedStatements(); + this.modifiers =3D translator.getFunctionModifiers(); + } + + public void visit(IBulkInsert obj) { + this.prepared =3D true; + + super.visit(obj); + = + for (int i =3D 0; i < obj.getElements().size(); i++) { + IElement element =3D (IElement) obj.getElements().get(i); + this.preparedTypes.add(element.getType()); + } + + this.preparedValues =3D obj.getRows(); + } = + = + /** + * @param type + * @param object + * @param valuesbuffer + */ + private void translateSQLType(Class type, Object obj, StringBuffer val= uesbuffer) { + if (obj =3D=3D null) { + valuesbuffer.append(NULL); + } else { + if(Number.class.isAssignableFrom(type)) { + boolean useFormatting =3D false; + = + if (Double.class.isAssignableFrom(type)){ + double value =3D ((Double)obj).doubleValue(); + useFormatting =3D (value <=3D SCIENTIC_LOW || value >= =3D SCIENTIC_HIGH); = + } + else if (Float.class.isAssignableFrom(type)){ + float value =3D ((Float)obj).floatValue(); + useFormatting =3D (value <=3D SCIENTIC_LOW || value >= =3D SCIENTIC_HIGH); + } + // The formatting is to avoid the so-called "scientic-nota= tion" + // where toString will use for numbers greater than 10p7 a= nd + // less than 10p-3, where database may not understand. + if (useFormatting) { + synchronized (DECIMAL_FORMAT) { + valuesbuffer.append(DECIMAL_FORMAT.format(obj)); + } + } + else { + valuesbuffer.append(obj); + } + } else if(type.equals(TypeFacility.RUNTIME_TYPES.BOOLEAN)) { + valuesbuffer.append(translator.translateLiteralBoolean((Bo= olean)obj)); + } else if(type.equals(TypeFacility.RUNTIME_TYPES.TIMESTAMP)) { + valuesbuffer.append(translator.translateLiteralTimestamp((= Timestamp)obj)); + } else if(type.equals(TypeFacility.RUNTIME_TYPES.TIME)) { + valuesbuffer.append(translator.translateLiteralTime((Time)= obj)); + } else if(type.equals(TypeFacility.RUNTIME_TYPES.DATE)) { + valuesbuffer.append(translator.translateLiteralDate((java.= sql.Date)obj)); + } else { + // If obj is string, toSting() will not create a new Strin= g = + // object, it returns it self, so new object creation. = + valuesbuffer.append("'") //$NON-NLS-1$ + .append(escapeString(obj.toString())) + .append("'"); //$NON-NLS-1$ + } + } = + } + + /** + * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IProcedure) + */ + public void visit(IProcedure obj) { + this.prepared =3D true; + /* + * preparedValues is now a list of procedure params instead of jus= t values + */ + this.preparedValues =3D obj.getParameters(); + super.buffer.append(generateSqlForStoredProcedure(obj)); + } + + /** + * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IFunction) + */ + public void visit(IFunction obj) { + if(this.modifiers !=3D null) { + FunctionModifier functionModifier =3D (FunctionModifier)this.m= odifiers.get(obj.getName().toLowerCase()); + if(functionModifier !=3D null) { + List parts =3D functionModifier.translate(obj); + = + // null means the FunctionModifier will rely on default tr= anslation + if (parts !=3D null) { + Iterator iter =3D parts.iterator(); + while(iter.hasNext()) { + Object part =3D iter.next(); + if(part instanceof String) { + buffer.append(part); + } else { + append((ILanguageObject)part); + } + } + return; + } = + } = + } = + super.visit(obj); + } + + /** + * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.ILiteral) + */ + public void visit(ILiteral obj) { + if (this.prepared && obj.isBindValue()) { + buffer.append(UNDEFINED_PARAM); + preparedValues.add(obj.getValue()); + preparedTypes.add(obj.getType()); + } else { + translateSQLType(obj.getType(), obj.getValue(), buffer); + } + } + + /** + * Set the per-command execution context on this visitor. = + * @param context ExecutionContext + * @since 4.3 + */ + public void setExecutionContext(ExecutionContext context) { + this.context =3D context; + } + = + /** + * Retrieve the per-command execution context for this visitor = + * (intended for subclasses to use). + * @return + * @since 4.3 + */ + protected ExecutionContext getExecutionContext() { + return this.context; + } + + protected String getSourceComment(ICommand command) { + return this.translator.getSourceComment(this.context, command); + } + = + /** + * This is a generic implementation. Subclass should override this met= hod + * if necessary. + * @param exec The command for the stored procedure. + * @return String to be executed by CallableStatement. + */ + protected String generateSqlForStoredProcedure(IProcedure exec) { + StringBuffer prepareCallBuffer =3D new StringBuffer(); + prepareCallBuffer.append("{ "); //$NON-NLS-1$ + + List params =3D exec.getParameters(); + + //check whether a "?" is needed if there are returns + boolean needQuestionMark =3D false; + Iterator iter =3D params.iterator(); + while(iter.hasNext()){ + IParameter param =3D (IParameter)iter.next(); + if(param.getDirection() =3D=3D Direction.RETURN){ + needQuestionMark =3D true; + break; + } + } + = + prepareCallBuffer.append(getSourceComment(exec)); + = + if(needQuestionMark){ + prepareCallBuffer.append("?=3D"); //$NON-NLS-1$ + } + + prepareCallBuffer.append(" call ");//$NON-NLS-1$ + prepareCallBuffer.append(exec.getMetadataObject() !=3D null ? getN= ame(exec.getMetadataObject()) : exec.getProcedureName()); + prepareCallBuffer.append("("); //$NON-NLS-1$ + + int numberOfParameters =3D 0; + iter =3D params.iterator(); + while(iter.hasNext()){ + IParameter param =3D (IParameter)iter.next(); + if(param.getDirection() =3D=3D Direction.IN || param.getDirect= ion() =3D=3D Direction.OUT || param.getDirection() =3D=3D Direction.INOUT){ + if(numberOfParameters > 0){ + prepareCallBuffer.append(","); //$NON-NLS-1$ + } + prepareCallBuffer.append("?"); //$NON-NLS-1$ + numberOfParameters++; + } + } + prepareCallBuffer.append(")"); //$NON-NLS-1$ + prepareCallBuffer.append("}"); //$NON-NLS-1$ + return prepareCallBuffer.toString(); + } + = + /** = + * @return the preparedValues + */ + List getPreparedValues() { + return this.preparedValues; + } + = + /** = + * @return the preparedValues + */ + List getPreparedTypes() { + return this.preparedTypes; + } + = + public boolean isPrepared() { + return prepared; + } + = + public void setPrepared(boolean prepared) { + this.prepared =3D prepared; + } + = + @Override + protected boolean useAsInGroupAlias() { + return this.translator.useAsInGroupAlias(); + } + = + @Override + public void visit(IQuery obj) { + if (obj.getLimit() !=3D null) { + handleLimit(obj); + } else { + super.visit(obj); + } + } + = + @Override + public void visit(ISetQuery obj) { + if (obj.getLimit() !=3D null) { + handleLimit(obj); + } else { + super.visit(obj); + } + } + = + @Override + protected boolean useParensForSetQueries() { + return translator.useParensForSetQueries(); + } + = + private void handleLimit(IQueryCommand obj) { + ILimit limit =3D obj.getLimit(); + obj.setLimit(null); + StringBuffer current =3D this.buffer; + this.buffer =3D new StringBuffer(); + append(obj); + current.append(this.translator.addLimitString(this.buffer.toString(),= limit)); + this.buffer =3D current; + obj.setLimit(limit); + } + = + @Override + protected String replaceElementName(String group, String element) { + return translator.replaceElementName(group, element); + } + = + @Override + protected void appendSetOperation(Operation operation) { + buffer.append(translator.getSetOperationString(operation)); + } + = +} Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/translator/SubstringFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/SubstringFunctionModifier.java 2009-02-24 14:21:49 UTC (rev= 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/SubstringFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,63 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.translator; - -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; - -/** - * Common logic for Substring modifiers requiring 3 parameters - */ -public class SubstringFunctionModifier extends BasicFunctionModifier { - - private ILanguageFactory languageFactory; - private String length_function; - = - public SubstringFunctionModifier(ILanguageFactory languageFactory, Str= ing substring_function, String length_function) { - this.languageFactory =3D languageFactory; = - this.length_function =3D length_function; - } - - /** - * @see com.metamatrix.connector.jdbc.translator.FunctionModifier#modi= fy(com.metamatrix.query.sql.symbol.Function) - */ - public IExpression modify(IFunction function) { - IExpression[] args =3D function.getParameters(); - IExpression[] newArgs =3D new IExpression[3]; - function.setParameters(newArgs); - - newArgs[0] =3D args[0]; - newArgs[1] =3D args[1]; - = - if(args.length =3D=3D 2) { - newArgs[2] =3D languageFactory.createFunction(length_function,= new IExpression[] { args[0] }, Integer.class); = - } else { - newArgs[2] =3D args[2]; - } - = - function.setParameters(newArgs); - = - return function; - } -} \ No newline at end of file Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/translator/SubstringFunctionModifier.java (from rev 488, trunk/connecto= rs/connector-jdbc/src/main/java/com/metamatrix/connector/jdbc/translator/Su= bstringFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/SubstringFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/SubstringFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.translator; + +import java.util.Arrays; +import java.util.List; + +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; + +/** + * Common logic for Substring modifiers requiring 3 parameters + */ +public class SubstringFunctionModifier extends BasicFunctionModifier { + + private ILanguageFactory languageFactory; + private String length_function; + = + public SubstringFunctionModifier(ILanguageFactory languageFactory, Str= ing substring_function, String length_function) { + this.languageFactory =3D languageFactory; = + this.length_function =3D length_function; + } + + /** + * @see org.teiid.connector.jdbc.translator.FunctionModifier#modify(co= m.metamatrix.query.sql.symbol.Function) + */ + public IExpression modify(IFunction function) { + List args =3D function.getParameters(); + = + if(args.size() =3D=3D 2) { + args.add(languageFactory.createFunction(length_function, Array= s.asList(args.get(0)), Integer.class)); = + } = + = + return function; + } +} \ No newline at end of file Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/TranslatedCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/TranslatedCommand.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/TranslatedCommand.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,15 +22,15 @@ = /* */ -package com.metamatrix.connector.jdbc.translator; +package org.teiid.connector.jdbc.translator; = import java.util.List; import java.util.Map; = + import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ILiteral; import com.metamatrix.connector.visitor.util.CollectorVisitor; @@ -61,7 +61,7 @@ this.sqlTranslator =3D sqlTranslator; = Map modifiers =3D sqlTranslator.getFunction= Modifiers(); - this.sqlConversionVisitor =3D new SQLConversionVisitor(sqlTranslat= or); + this.sqlConversionVisitor =3D sqlTranslator.getSQLConversionVisito= r(); sqlConversionVisitor.setExecutionContext(context); this.functionVisitor =3D new FunctionReplacementVisitor(modifiers); } Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/Translator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/translator/Translator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/Translator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.translator; +package org.teiid.connector.jdbc.translator; = import java.math.BigDecimal; import java.math.BigInteger; @@ -41,6 +41,9 @@ import java.util.Map; import java.util.TimeZone; = +import org.teiid.connector.jdbc.JDBCPlugin; +import org.teiid.connector.jdbc.JDBCPropertyNames; + import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; @@ -48,8 +51,6 @@ import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.api.ValueTranslator; import com.metamatrix.connector.internal.ConnectorPropertyNames; -import com.metamatrix.connector.jdbc.JDBCPlugin; -import com.metamatrix.connector.jdbc.JDBCPropertyNames; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.connector.language.ILimit; @@ -419,7 +420,7 @@ * values, so subclasses should override that method if necessery to c= hange the binding = * behavior. * = - * @see com.metamatrix.connector.jdbc.extension.ResultsTranslator#bind= PreparedStatementValues(java.sql.Connection, java.sql.PreparedStatement, co= m.metamatrix.connector.jdbc.translator.TranslatedCommand) + * @see com.metamatrix.connector.jdbc.extension.ResultsTranslator#bind= PreparedStatementValues(java.sql.Connection, java.sql.PreparedStatement, or= g.teiid.connector.jdbc.translator.TranslatedCommand) */ public void bindPreparedStatementValues(Connection conn, PreparedState= ment stmt, TranslatedCommand command) throws SQLException { List params =3D command.getPreparedValues(); @@ -710,5 +711,9 @@ public int getIsValidTimeout() { return isValidTimeout; } + = + public SQLConversionVisitor getSQLConversionVisitor() { + return new SQLConversionVisitor(this); + } = } Copied: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/j= dbc/xa (from rev 486, trunk/connectors/connector-jdbc/src/main/java/com/met= amatrix/connector/jdbc/xa) Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/xa ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/xa/JDBCSourceXAConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/JDBCSourceXAConnection.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= xa/JDBCSourceXAConnection.java 2009-02-24 18:28:11 UTC (rev 491) @@ -22,7 +22,7 @@ = /* */ -package com.metamatrix.connector.jdbc.xa; +package org.teiid.connector.jdbc.xa; = import java.sql.Connection; import java.sql.SQLException; @@ -31,10 +31,11 @@ import javax.sql.ConnectionEventListener; import javax.transaction.xa.XAResource; = +import org.teiid.connector.jdbc.JDBCSourceConnection; +import org.teiid.connector.jdbc.translator.Translator; + import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.JDBCSourceConnection; -import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.xa.api.XAConnection; = public class JDBCSourceXAConnection extends JDBCSourceConnection implement= s XAConnection { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/xa/XAJDBCPropertyNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/= jdbc/xa/XAJDBCPropertyNames.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= xa/XAJDBCPropertyNames.java 2009-02-24 18:28:11 UTC (rev 491) @@ -24,7 +24,7 @@ * Date: Jan 23, 2003 * Time: 5:38:40 PM */ -package com.metamatrix.connector.jdbc.xa; +package org.teiid.connector.jdbc.xa; = /** * XAJDBCPropertyNames. Copied: trunk/connectors/connector-jdbc/src/main/resources/org/teiid/connec= tor/jdbc (from rev 486, trunk/connectors/connector-jdbc/src/main/resources/= com/metamatrix/connector/jdbc) Property changes on: trunk/connectors/connector-jdbc/src/main/resources/org= /teiid/connector/jdbc ___________________________________________________________________ Name: svn:mergeinfo + = Deleted: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conne= ctor/jdbc/FakeConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/FakeConnection.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/FakeConnection.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc; - -import java.sql.SQLException; -import java.sql.Statement; - -import com.metamatrix.core.util.SimpleMock; - -/** - * FakeConnection for unit testing - */ -public class FakeConnection { - - boolean closed; - boolean fail; - = - /* (non-Javadoc) - * @see java.sql.Connection#createStatement() - */ - public Statement createStatement() throws SQLException { - if (fail) { - throw new SQLException(); - } - return SimpleMock.createSimpleMock(Statement.class); - } - = - /* (non-Javadoc) - * @see java.sql.Connection#isClosed() - */ - public boolean isClosed() { - return closed; - } - -} Deleted: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conne= ctor/jdbc/MetadataFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/MetadataFactory.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/MetadataFactory.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc; - -import junit.framework.Assert; - -import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.connector.language.ICommand; - -public class MetadataFactory { - = - public static final String PARTS_VDB =3D "/PartsSupplier.vdb"; //$NON-= NLS-1$ - public static final String BQT_VDB =3D "/bqt.vdb"; //$NON-NLS-1$ - - public static ICommand helpTranslate(String vdbFileName, String sql) { - TranslationUtility util =3D null; - if (PARTS_VDB.equals(vdbFileName)) { - util =3D new TranslationUtility(MetadataFactory.class.getResource(vd= bFileName)); - } else if (BQT_VDB.equals(vdbFileName)){ - util =3D FakeTranslationFactory.getInstance().getBQTTranslationUtili= ty(); - } else { - Assert.fail("unknown vdb"); //$NON-NLS-1$ - } - return util.parseCommand(sql); = - } - -} Deleted: trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/conne= ctor/jdbc/TestJDBCSourceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/TestJDBCSourceConnection.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/TestJDBCSourceConnection.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,115 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc; - -import java.sql.Connection; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.basic.BasicConnectorCapabilities; -import com.metamatrix.connector.jdbc.translator.Translator; -import com.metamatrix.core.util.SimpleMock; - - -/** = - * Test case for JDBCSourceConnection - * @since 4.3 - */ -public class TestJDBCSourceConnection extends TestCase { - = - private FakeConnection fakeConnection; - private Connection connection; - private ConnectorEnvironment environment; - = - = - public TestJDBCSourceConnection(String name) { - super(name); - } - = - public void setUp() throws Exception { - fakeConnection =3D new FakeConnection(); - connection =3D SimpleMock.createSimpleMock(fakeConnection, Connect= ion.class); - - final Properties properties =3D new Properties(); - properties.setProperty(JDBCPropertyNames.EXT_CAPABILITY_CLASS, Bas= icConnectorCapabilities.class.getName()); = - = - environment =3D EnvironmentUtility.createEnvironment(properties, f= alse); = - } - = - - /** - * Tests JDBCSourceConnection.isConnectionAlive() with a ConnectionQue= ryStrategy - * @since 4.3 - */ - public void testIsAlive() throws Exception { - JDBCSourceConnection sourceConnection =3D new JDBCSourceConnection= (connection, environment, new Translator() { - @Override - public String getConnectionTestQuery() { - return "select 1"; - } - }); = - = - //closed connections should not be 'alive' = - fakeConnection.closed =3D true; - assertFalse(sourceConnection.isAlive()); = - = - //open connections should be 'alive' - fakeConnection.closed =3D false; - assertTrue(sourceConnection.isAlive()); - = - //failed connections should not be 'alive' - fakeConnection.fail =3D true; - assertFalse(sourceConnection.isAlive()); - = - } - = - /** - * Tests JDBCSourceConnection.isConnectionAlive() with a null Connecti= onStrategy - * @since 4.3 - */ - public void testIsAliveNullStrategy() throws Exception { - JDBCSourceConnection sourceConnection =3D new JDBCSourceConnection= (connection, environment, new Translator() { - @Override - public String getConnectionTestQuery() { - return null; - } - }); = - = - //closed connections should not be 'alive' = - fakeConnection.closed =3D true; - assertFalse(sourceConnection.isAlive()); = - = - //open connections should be 'alive' - fakeConnection.closed =3D false; - assertTrue(sourceConnection.isAlive()); - = - //without a strategy, failed connections are detected as 'alive' - fakeConnection.fail =3D true; - assertTrue(sourceConnection.isAlive()); - = - } - = -} Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/FakeConnection.java (from rev 486, trunk/connectors/connector-jdbc/src/= test/java/com/metamatrix/connector/jdbc/FakeConnection.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= FakeConnection.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= FakeConnection.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc; + +import java.sql.SQLException; +import java.sql.Statement; + +import com.metamatrix.core.util.SimpleMock; + +/** + * FakeConnection for unit testing + */ +public class FakeConnection { + + boolean closed; + boolean fail; + = + /* (non-Javadoc) + * @see java.sql.Connection#createStatement() + */ + public Statement createStatement() throws SQLException { + if (fail) { + throw new SQLException(); + } + return SimpleMock.createSimpleMock(Statement.class); + } + = + /* (non-Javadoc) + * @see java.sql.Connection#isClosed() + */ + public boolean isClosed() { + return closed; + } + +} Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/FakeConnection.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/MetadataFactory.java (from rev 486, trunk/connectors/connector-jdbc/src= /test/java/com/metamatrix/connector/jdbc/MetadataFactory.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= MetadataFactory.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= MetadataFactory.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc; + +import junit.framework.Assert; + +import com.metamatrix.cdk.api.TranslationUtility; +import com.metamatrix.cdk.unittest.FakeTranslationFactory; +import com.metamatrix.connector.language.ICommand; + +public class MetadataFactory { + = + public static final String PARTS_VDB =3D "/PartsSupplier.vdb"; //$NON-= NLS-1$ + public static final String BQT_VDB =3D "/bqt.vdb"; //$NON-NLS-1$ + + public static ICommand helpTranslate(String vdbFileName, String sql) { + TranslationUtility util =3D null; + if (PARTS_VDB.equals(vdbFileName)) { + util =3D new TranslationUtility(MetadataFactory.class.getResource(vd= bFileName)); + } else if (BQT_VDB.equals(vdbFileName)){ + util =3D FakeTranslationFactory.getInstance().getBQTTranslationUtili= ty(); + } else { + Assert.fail("unknown vdb"); //$NON-NLS-1$ + } + return util.parseCommand(sql); = + } + +} Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/MetadataFactory.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/TestJDBCSourceConnection.java (from rev 486, trunk/connectors/connector= -jdbc/src/test/java/com/metamatrix/connector/jdbc/TestJDBCSourceConnection.= java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= TestJDBCSourceConnection.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= TestJDBCSourceConnection.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,118 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc; + +import java.sql.Connection; +import java.util.Properties; + +import org.teiid.connector.jdbc.JDBCPropertyNames; +import org.teiid.connector.jdbc.JDBCSourceConnection; +import org.teiid.connector.jdbc.translator.Translator; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.api.ConnectorEnvironment; +import com.metamatrix.connector.basic.BasicConnectorCapabilities; +import com.metamatrix.core.util.SimpleMock; + + +/** = + * Test case for JDBCSourceConnection + * @since 4.3 + */ +public class TestJDBCSourceConnection extends TestCase { + = + private FakeConnection fakeConnection; + private Connection connection; + private ConnectorEnvironment environment; + = + = + public TestJDBCSourceConnection(String name) { + super(name); + } + = + public void setUp() throws Exception { + fakeConnection =3D new FakeConnection(); + connection =3D SimpleMock.createSimpleMock(fakeConnection, Connect= ion.class); + + final Properties properties =3D new Properties(); + properties.setProperty(JDBCPropertyNames.EXT_CAPABILITY_CLASS, Bas= icConnectorCapabilities.class.getName()); = + = + environment =3D EnvironmentUtility.createEnvironment(properties, f= alse); = + } + = + + /** + * Tests JDBCSourceConnection.isConnectionAlive() with a ConnectionQue= ryStrategy + * @since 4.3 + */ + public void testIsAlive() throws Exception { + JDBCSourceConnection sourceConnection =3D new JDBCSourceConnection= (connection, environment, new Translator() { + @Override + public String getConnectionTestQuery() { + return "select 1"; + } + }); = + = + //closed connections should not be 'alive' = + fakeConnection.closed =3D true; + assertFalse(sourceConnection.isAlive()); = + = + //open connections should be 'alive' + fakeConnection.closed =3D false; + assertTrue(sourceConnection.isAlive()); + = + //failed connections should not be 'alive' + fakeConnection.fail =3D true; + assertFalse(sourceConnection.isAlive()); + = + } + = + /** + * Tests JDBCSourceConnection.isConnectionAlive() with a null Connecti= onStrategy + * @since 4.3 + */ + public void testIsAliveNullStrategy() throws Exception { + JDBCSourceConnection sourceConnection =3D new JDBCSourceConnection= (connection, environment, new Translator() { + @Override + public String getConnectionTestQuery() { + return null; + } + }); = + = + //closed connections should not be 'alive' = + fakeConnection.closed =3D true; + assertFalse(sourceConnection.isAlive()); = + = + //open connections should be 'alive' + fakeConnection.closed =3D false; + assertTrue(sourceConnection.isAlive()); + = + //without a strategy, failed connections are detected as 'alive' + fakeConnection.fail =3D true; + assertTrue(sourceConnection.isAlive()); + = + } + = +} Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/TestJDBCSourceConnection.java ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/access (from rev 486, trunk/connectors/connector-jdbc/src/test/java/com= /metamatrix/connector/jdbc/access) Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/access ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/access/TestAccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/access/TestAccessSQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= access/TestAccessSQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,17 +20,19 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.access; +package org.teiid.connector.jdbc.access; = import java.util.Properties; = +import org.teiid.connector.jdbc.access.AccessSQLTranslator; +import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.jdbc.translator.Translator; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; -import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ICommand; = = Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/db2 (from rev 486, trunk/connectors/connector-jdbc/src/test/java/com/me= tamatrix/connector/jdbc/db2) Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/db2 ___________________________________________________________________ Name: svn:mergeinfo + = Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/= jdbc/db2/TestDB2ConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/db2/TestDB2ConvertModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= db2/TestDB2ConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,518 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.db2; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.sql.Timestamp; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.query.unittest.TimestampUtil; - -/** - */ -public class TestDB2ConvertModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestSybaseConvertModifier. - * @param name - */ - public TestDB2ConvertModifier(String name) { - super(name); - } - - public String helpGetString(IExpression expr) throws Exception { - DB2SQLTranslator trans =3D new DB2SQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); - = - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = - sqlVisitor.append(expr); = - = - return sqlVisitor.toString(); = - } - - public void helpTest(IExpression srcExpression, String tgtType, String= expectedExpression) throws Exception { - IFunction func =3D LANG_FACTORY.createFunction("convert", //$NON-= NLS-1$ - new IExpression[] { = - srcExpression, - LANG_FACTORY.createLiteral(tgtType, String.class)}, - TypeFacility.getDataTypeClass(tgtType)); - = - DB2ConvertModifier mod =3D new DB2ConvertModifier(LANG_FACTORY); - IExpression expr =3D mod.modify(func); - = - assertEquals("Error converting from " + srcExpression.getType() + = " to " + tgtType, //$NON-NLS-1$ //$NON-NLS-2$ = - expectedExpression, helpGetString(expr)); = - } - - // Source =3D STRING - - public void testStringToChar() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "char", "c= har('5', 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "boolean",= "CASE WHEN '5' =3D 'true' THEN 1 ELSE 0 END"); //$NON-NLS-1$ //$NON-NLS-2$= //$NON-NLS-3$ - } - - public void testStringToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "byte", "s= mallint('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "short", "= smallint('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "integer",= "integer('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "long", "b= igint('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigintege= r", "bigint('5')"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "float", "= real('5')");//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "double", = "double('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToDate() throws Exception { - helpTest(LANG_FACTORY.createLiteral("2004-06-29", String.class), "= date", "date('2004-06-29')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToTime() throws Exception { - helpTest(LANG_FACTORY.createLiteral("23:59:59", String.class), "ti= me", "time('23:59:59')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral("2004-06-29 23:59:59.987", Str= ing.class), "timestamp", "timestamp('2004-06-29 23:59:59.987')"); //$NON-NL= S-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigdecima= l", "decimal('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - // Source =3D CHAR - = - public void testCharToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Character('5'), Character.= class), "string", "'5'"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D BOOLEAN - = - public void testBooleanToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "string", "CASE WHEN 1 =3D 0 THEN 'false' ELSE 'true' END"); //$NON-NLS-1$ = //$NON-NLS-2$ - } - - public void testBooleanToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - = - // Source =3D BYTE - = - public void testByteToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D SHORT - = - public void testShortToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D INTEGER - = - public void testIntegerToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "boolean", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "byte", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "short", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D LONG - = - public void testLongToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "str= ing", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "boo= lean", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "byt= e", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "sho= rt", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "int= eger", "integer(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "flo= at", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "dou= ble", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= decimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D BIGINTEGER - = - public void testBigIntegerToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "boolean", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS= -3$ - } - - public void testBigIntegerToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "byte", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "short", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "integer", "integer(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ - } - - public void testBigIntegerToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - // Source =3D FLOAT - = - public void testFloatToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "string", "char(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "boolean", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "byte", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "short", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "integer", "integer(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "long", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "biginteger", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "double", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "bigdecimal", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D DOUBLE - = - public void testDoubleToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "string", "char(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "boolean", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "byte", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "short", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "integer", "integer(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "long", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "biginteger", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "float", "real(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "bigdecimal", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D BIGDECIMAL - = - public void testBigDecimalToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "string", "char(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ - } - - public void testBigDecimalToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "boolean", "smallint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON= -NLS-3$ - } - - public void testBigDecimalToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "byte", "smallint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NL= S-3$ - } - - public void testBigDecimalToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "short", "smallint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-N= LS-3$ - } - - public void testBigDecimalToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "integer", "integer(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-= NLS-3$ - } - - public void testBigDecimalToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "long", "bigint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ - } - - public void testBigDecimalToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "biginteger", "bigint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NO= N-NLS-3$ - } - - public void testBigDecimalToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "float", "real(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigDecimalToDoublel() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "double", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - // Source =3D DATE - - public void testDateToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "string", "char({d'2003-11-01'})"); //$NON-NL= S-1$ //$NON-NLS-2$ - } - - public void testDateToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "timestamp", "timestamp({d'2003-11-01'}, '00:= 00:00')"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D TIME - - public void testTimeToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "string", "char({t'23:59:59'})"); //$NON-NLS-= 1$ //$NON-NLS-2$ - } - - public void testTimeToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "timestamp", "timestamp('1970-01-01', {t'23:5= 9:59'})"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D TIMESTAMP - = - public void testTimestampToString() throws Exception { - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "string"= , "char({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testTimestampToDate() throws Exception { - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "date", = "date({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testTimestampToTime() throws Exception { - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "time", = "time({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ - } - = -} Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/db2/TestDB2ConvertModifier.java (from rev 488, trunk/connectors/connect= or-jdbc/src/test/java/com/metamatrix/connector/jdbc/db2/TestDB2ConvertModif= ier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= db2/TestDB2ConvertModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= db2/TestDB2ConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,520 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.db2; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.sql.Timestamp; +import java.util.Arrays; +import java.util.Properties; + +import org.teiid.connector.jdbc.db2.DB2ConvertModifier; +import org.teiid.connector.jdbc.db2.DB2SQLTranslator; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.query.unittest.TimestampUtil; + +/** + */ +public class TestDB2ConvertModifier extends TestCase { + + private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); + + /** + * Constructor for TestSybaseConvertModifier. + * @param name + */ + public TestDB2ConvertModifier(String name) { + super(name); + } + + public String helpGetString(IExpression expr) throws Exception { + DB2SQLTranslator trans =3D new DB2SQLTranslator(); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = + sqlVisitor.append(expr); = + = + return sqlVisitor.toString(); = + } + + public void helpTest(IExpression srcExpression, String tgtType, String= expectedExpression) throws Exception { + IFunction func =3D LANG_FACTORY.createFunction("convert", //$NON-= NLS-1$ + Arrays.asList( = + srcExpression, + LANG_FACTORY.createLiteral(tgtType, String.class)), + TypeFacility.getDataTypeClass(tgtType)); + = + DB2ConvertModifier mod =3D new DB2ConvertModifier(LANG_FACTORY); + IExpression expr =3D mod.modify(func); + = + assertEquals("Error converting from " + srcExpression.getType() + = " to " + tgtType, //$NON-NLS-1$ //$NON-NLS-2$ = + expectedExpression, helpGetString(expr)); = + } + + // Source =3D STRING + public void testStringToChar() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "char", "c= har('5', 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "boolean",= "CASE WHEN '5' =3D 'true' THEN 1 ELSE 0 END"); //$NON-NLS-1$ //$NON-NLS-2$= //$NON-NLS-3$ + } + + public void testStringToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "byte", "s= mallint('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "short", "= smallint('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "integer",= "integer('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "long", "b= igint('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigintege= r", "bigint('5')"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "float", "= real('5')");//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "double", = "double('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToDate() throws Exception { + helpTest(LANG_FACTORY.createLiteral("2004-06-29", String.class), "= date", "date('2004-06-29')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToTime() throws Exception { + helpTest(LANG_FACTORY.createLiteral("23:59:59", String.class), "ti= me", "time('23:59:59')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToTimestamp() throws Exception { + helpTest(LANG_FACTORY.createLiteral("2004-06-29 23:59:59.987", Str= ing.class), "timestamp", "timestamp('2004-06-29 23:59:59.987')"); //$NON-NL= S-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigdecima= l", "decimal('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + // Source =3D CHAR + = + public void testCharToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Character('5'), Character.= class), "string", "'5'"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D BOOLEAN + = + public void testBooleanToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "string", "CASE WHEN 1 =3D 0 THEN 'false' ELSE 'true' END"); //$NON-NLS-1$ = //$NON-NLS-2$ + } + + public void testBooleanToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + = + // Source =3D BYTE + = + public void testByteToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D SHORT + = + public void testShortToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D INTEGER + = + public void testIntegerToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "boolean", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "byte", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "short", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D LONG + = + public void testLongToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "str= ing", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "boo= lean", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "byt= e", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "sho= rt", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "int= eger", "integer(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "flo= at", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "dou= ble", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= decimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D BIGINTEGER + = + public void testBigIntegerToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "boolean", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS= -3$ + } + + public void testBigIntegerToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "byte", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "short", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "integer", "integer(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ + } + + public void testBigIntegerToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + // Source =3D FLOAT + = + public void testFloatToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "string", "char(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "boolean", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "byte", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "short", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "integer", "integer(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "long", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "biginteger", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "double", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "bigdecimal", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D DOUBLE + = + public void testDoubleToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "string", "char(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "boolean", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "byte", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "short", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "integer", "integer(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "long", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "biginteger", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "float", "real(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "bigdecimal", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D BIGDECIMAL + = + public void testBigDecimalToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "string", "char(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ + } + + public void testBigDecimalToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "boolean", "smallint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON= -NLS-3$ + } + + public void testBigDecimalToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "byte", "smallint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NL= S-3$ + } + + public void testBigDecimalToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "short", "smallint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-N= LS-3$ + } + + public void testBigDecimalToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "integer", "integer(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-= NLS-3$ + } + + public void testBigDecimalToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "long", "bigint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ + } + + public void testBigDecimalToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "biginteger", "bigint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NO= N-NLS-3$ + } + + public void testBigDecimalToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "float", "real(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigDecimalToDoublel() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "double", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + // Source =3D DATE + + public void testDateToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "string", "char({d'2003-11-01'})"); //$NON-NL= S-1$ //$NON-NLS-2$ + } + + public void testDateToTimestamp() throws Exception { + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "timestamp", "timestamp({d'2003-11-01'}, '00:= 00:00')"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D TIME + + public void testTimeToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "string", "char({t'23:59:59'})"); //$NON-NLS-= 1$ //$NON-NLS-2$ + } + + public void testTimeToTimestamp() throws Exception { + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "timestamp", "timestamp('1970-01-01', {t'23:5= 9:59'})"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D TIMESTAMP + = + public void testTimestampToString() throws Exception { + Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = + helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "string"= , "char({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testTimestampToDate() throws Exception { + Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = + helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "date", = "date({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testTimestampToTime() throws Exception { + Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = + helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "time", = "time({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ + } + = +} Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/db2/TestDB2SqlTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/db2/TestDB2SqlTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= db2/TestDB2SqlTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,11 +20,14 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.db2; +package org.teiid.connector.jdbc.db2; = import java.util.Map; import java.util.Properties; = +import org.teiid.connector.jdbc.db2.DB2SQLTranslator; +import org.teiid.connector.jdbc.translator.TranslatedCommand; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; @@ -32,7 +35,6 @@ import com.metamatrix.cdk.unittest.FakeTranslationFactory; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; import com.metamatrix.connector.language.ICommand; import com.metamatrix.core.util.UnitTestUtil; = Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/derby (from rev 486, trunk/connectors/connector-jdbc/src/test/java/com/= metamatrix/connector/jdbc/derby) Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/derby ___________________________________________________________________ Name: svn:mergeinfo + = Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/= jdbc/derby/TestDerbyConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/derby/TestDerbyConvertModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= derby/TestDerbyConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,519 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.derby; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.sql.Timestamp; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.query.unittest.TimestampUtil; - -/** - */ -public class TestDerbyConvertModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestSybaseConvertModifier. - * @param name - */ - public TestDerbyConvertModifier(String name) { - super(name); - } - - public String helpGetString(IExpression expr) throws Exception { - DerbySQLTranslator trans =3D new DerbySQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); - = - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = - sqlVisitor.append(expr); = - = - return sqlVisitor.toString(); = - } - - public void helpTest(IExpression srcExpression, String tgtType, String= expectedExpression) throws Exception { - IFunction func =3D LANG_FACTORY.createFunction("convert", //$NON-= NLS-1$ - new IExpression[] { = - srcExpression, - LANG_FACTORY.createLiteral(tgtType, String.class)}, - TypeFacility.getDataTypeClass(tgtType)); - = - DerbyConvertModifier mod =3D new DerbyConvertModifier(LANG_FACTORY= ); - IExpression expr =3D mod.modify(func); - = - assertEquals("Error converting from " + srcExpression.getType() + = " to " + tgtType, //$NON-NLS-1$ //$NON-NLS-2$ = - expectedExpression, helpGetString(expr)); = - } - - // Source =3D STRING - - public void testStringToChar() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "char", "c= har('5', 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "boolean",= "CASE WHEN '5' =3D 'true' THEN 1 ELSE 0 END"); //$NON-NLS-1$ //$NON-NLS-2$= //$NON-NLS-3$ - } - - public void testStringToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "byte", "s= mallint('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "short", "= smallint('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "integer",= "integer('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "long", "b= igint('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigintege= r", "bigint('5')"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "float", "= cast(cast('5' as decimal) as float)");//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS= -3$ - } - - public void testStringToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "double", = "cast(cast('5' as decimal) as double)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON= -NLS-3$ - } - - public void testStringToDate() throws Exception { - helpTest(LANG_FACTORY.createLiteral("2004-06-29", String.class), "= date", "date('2004-06-29')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToTime() throws Exception { - helpTest(LANG_FACTORY.createLiteral("23:59:59", String.class), "ti= me", "time('23:59:59')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral("2004-06-29 23:59:59.987", Str= ing.class), "timestamp", "timestamp('2004-06-29 23:59:59.987')"); //$NON-NL= S-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigdecima= l", "cast('5' as decimal)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - // Source =3D CHAR - = - public void testCharToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Character('5'), Character.= class), "string", "'5'"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D BOOLEAN - = - public void testBooleanToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "string", "CASE WHEN 1 =3D 0 THEN 'false' ELSE 'true' END"); //$NON-NLS-1$ = //$NON-NLS-2$ - } - - public void testBooleanToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - = - // Source =3D BYTE - = - public void testByteToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D SHORT - = - public void testShortToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D INTEGER - = - public void testIntegerToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "boolean", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "byte", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "short", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D LONG - = - public void testLongToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "str= ing", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "boo= lean", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "byt= e", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "sho= rt", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "int= eger", "integer(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "flo= at", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "dou= ble", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= decimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D BIGINTEGER - = - public void testBigIntegerToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "boolean", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS= -3$ - } - - public void testBigIntegerToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "byte", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "short", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "integer", "integer(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ - } - - public void testBigIntegerToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - // Source =3D FLOAT - = - public void testFloatToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "string", "char(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "boolean", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "byte", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "short", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "integer", "integer(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "long", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "biginteger", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "double", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "bigdecimal", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D DOUBLE - = - public void testDoubleToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "string", "char(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "boolean", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "byte", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "short", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "integer", "integer(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "long", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "biginteger", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "float", "cast(1.2 as float)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "bigdecimal", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D BIGDECIMAL - = - public void testBigDecimalToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "string", "char(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ - } - - public void testBigDecimalToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "boolean", "smallint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON= -NLS-3$ - } - - public void testBigDecimalToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "byte", "smallint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NL= S-3$ - } - - public void testBigDecimalToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "short", "smallint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-N= LS-3$ - } - - public void testBigDecimalToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "integer", "integer(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-= NLS-3$ - } - - public void testBigDecimalToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "long", "bigint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ - } - - public void testBigDecimalToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "biginteger", "bigint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NO= N-NLS-3$ - } - - public void testBigDecimalToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "float", "cast(1.0 as float)"); //$NON-NLS-1$ //$NON-NLS-2$ //$= NON-NLS-3$ - } - - public void testBigDecimalToDoublel() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "double", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - // Source =3D DATE - - public void testDateToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "string", "char({d'2003-11-01'})"); //$NON-NL= S-1$ //$NON-NLS-2$ - } - - public void testDateToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "timestamp", "timestamp({d'2003-11-01'}, '00:= 00:00')"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D TIME - - public void testTimeToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "string", "char({t'23:59:59'})"); //$NON-NLS-= 1$ //$NON-NLS-2$ - } - - public void testTimeToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "timestamp", "timestamp('1970-01-01', {t'23:5= 9:59'})"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D TIMESTAMP - = - public void testTimestampToString() throws Exception { - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "string"= , "char({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testTimestampToDate() throws Exception { - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "date", = "date({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testTimestampToTime() throws Exception { - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, 2, = 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "time", = "time({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - = -} Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/derby/TestDerbyConvertModifier.java (from rev 488, trunk/connectors/con= nector-jdbc/src/test/java/com/metamatrix/connector/jdbc/derby/TestDerbyConv= ertModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= derby/TestDerbyConvertModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= derby/TestDerbyConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,523 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.derby; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.sql.Timestamp; +import java.util.Arrays; +import java.util.Properties; + +import org.teiid.connector.jdbc.derby.DerbyConvertModifier; +import org.teiid.connector.jdbc.derby.DerbySQLTranslator; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.query.unittest.TimestampUtil; + +/** + */ +public class TestDerbyConvertModifier extends TestCase { + + private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); + + /** + * Constructor for TestSybaseConvertModifier. + * @param name + */ + public TestDerbyConvertModifier(String name) { + super(name); + } + + public String helpGetString(IExpression expr) throws Exception { + DerbySQLTranslator trans =3D new DerbySQLTranslator(); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); + = + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = + sqlVisitor.append(expr); = + = + return sqlVisitor.toString(); = + } + + public void helpTest(IExpression srcExpression, String tgtType, String= expectedExpression) throws Exception { + IFunction func =3D LANG_FACTORY.createFunction("convert", //$NON-= NLS-1$ + Arrays.asList( = + srcExpression, + LANG_FACTORY.createLiteral(tgtType, String.class)), + TypeFacility.getDataTypeClass(tgtType)); + = + DerbyConvertModifier mod =3D new DerbyConvertModifier(LANG_FACTORY= ); + IExpression expr =3D mod.modify(func); + = + assertEquals("Error converting from " + srcExpression.getType() + = " to " + tgtType, //$NON-NLS-1$ //$NON-NLS-2$ = + expectedExpression, helpGetString(expr)); = + } + + // Source =3D STRING + + public void testStringToChar() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "char", "c= har('5', 1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "boolean",= "CASE WHEN '5' =3D 'true' THEN 1 ELSE 0 END"); //$NON-NLS-1$ //$NON-NLS-2$= //$NON-NLS-3$ + } + + public void testStringToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "byte", "s= mallint('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "short", "= smallint('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "integer",= "integer('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "long", "b= igint('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigintege= r", "bigint('5')"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "float", "= cast(cast('5' as decimal) as float)");//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS= -3$ + } + + public void testStringToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "double", = "cast(cast('5' as decimal) as double)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON= -NLS-3$ + } + + public void testStringToDate() throws Exception { + helpTest(LANG_FACTORY.createLiteral("2004-06-29", String.class), "= date", "date('2004-06-29')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToTime() throws Exception { + helpTest(LANG_FACTORY.createLiteral("23:59:59", String.class), "ti= me", "time('23:59:59')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToTimestamp() throws Exception { + helpTest(LANG_FACTORY.createLiteral("2004-06-29 23:59:59.987", Str= ing.class), "timestamp", "timestamp('2004-06-29 23:59:59.987')"); //$NON-NL= S-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigdecima= l", "cast('5' as decimal)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + // Source =3D CHAR + = + public void testCharToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Character('5'), Character.= class), "string", "'5'"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D BOOLEAN + = + public void testBooleanToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "string", "CASE WHEN 1 =3D 0 THEN 'false' ELSE 'true' END"); //$NON-NLS-1$ = //$NON-NLS-2$ + } + + public void testBooleanToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + = + // Source =3D BYTE + = + public void testByteToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D SHORT + = + public void testShortToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D INTEGER + = + public void testIntegerToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "boolean", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "byte", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "short", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D LONG + = + public void testLongToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "str= ing", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "boo= lean", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "byt= e", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "sho= rt", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "int= eger", "integer(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "flo= at", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "dou= ble", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= decimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D BIGINTEGER + = + public void testBigIntegerToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "string", "char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "boolean", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS= -3$ + } + + public void testBigIntegerToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "byte", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "short", "smallint(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "integer", "integer(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ + } + + public void testBigIntegerToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + // Source =3D FLOAT + = + public void testFloatToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "string", "char(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "boolean", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "byte", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "short", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "integer", "integer(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "long", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "biginteger", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "double", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "bigdecimal", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D DOUBLE + = + public void testDoubleToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "string", "char(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "boolean", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "byte", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "short", "smallint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "integer", "integer(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "long", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "biginteger", "bigint(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "float", "cast(1.2 as float)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "bigdecimal", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D BIGDECIMAL + = + public void testBigDecimalToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "string", "char(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ + } + + public void testBigDecimalToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "boolean", "smallint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON= -NLS-3$ + } + + public void testBigDecimalToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "byte", "smallint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NL= S-3$ + } + + public void testBigDecimalToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "short", "smallint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-N= LS-3$ + } + + public void testBigDecimalToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "integer", "integer(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-= NLS-3$ + } + + public void testBigDecimalToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "long", "bigint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-= 3$ + } + + public void testBigDecimalToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "biginteger", "bigint(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NO= N-NLS-3$ + } + + public void testBigDecimalToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "float", "cast(1.0 as float)"); //$NON-NLS-1$ //$NON-NLS-2$ //$= NON-NLS-3$ + } + + public void testBigDecimalToDoublel() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "double", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + // Source =3D DATE + + public void testDateToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "string", "char({d'2003-11-01'})"); //$NON-NL= S-1$ //$NON-NLS-2$ + } + + public void testDateToTimestamp() throws Exception { + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "timestamp", "timestamp({d'2003-11-01'}, '00:= 00:00')"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D TIME + + public void testTimeToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "string", "char({t'23:59:59'})"); //$NON-NLS-= 1$ //$NON-NLS-2$ + } + + public void testTimeToTimestamp() throws Exception { + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "timestamp", "timestamp('1970-01-01', {t'23:5= 9:59'})"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D TIMESTAMP + = + public void testTimestampToString() throws Exception { + Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = + helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "string"= , "char({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testTimestampToDate() throws Exception { + Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = + helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "date", = "date({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testTimestampToTime() throws Exception { + Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, 2, = 0); = + helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "time", = "time({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + = +} Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/extension/impl (from rev 486, trunk/connectors/connector-jdbc/src/test/= java/com/metamatrix/connector/jdbc/extension/impl) Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/extension/impl ___________________________________________________________________ Name: svn:mergeinfo + = Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/= jdbc/extension/impl/TestDropFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/extension/impl/TestDropFunctionModifier.java 2009-02-24 14:21:49 UTC (= rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= extension/impl/TestDropFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 4= 91) @@ -1,73 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.extension.impl; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILiteral; - -/** - */ -public class TestDropFunctionModifier extends TestCase { - - /** - * Constructor for TestDropFunctionModifier. - * @param name - */ - public TestDropFunctionModifier(String name) { - super(name); - } - - public void testDrop() { - DropFunctionModifier mod =3D new DropFunctionModifier(); - = - ILiteral arg1 =3D CommandBuilder.getLanuageFactory().createLiteral= (new Integer(5), Integer.class); - ILiteral arg2 =3D CommandBuilder.getLanuageFactory().createLiteral= ("string", String.class);//$NON-NLS-1$ - IFunction func =3D CommandBuilder.getLanuageFactory().createFuncti= on("convert", new IExpression[] { arg1, arg2}, Integer.class); //$NON-NLS-1$ - = - IExpression output =3D mod.modify(func); - assertEquals("Did not get expected function after using drop modif= ier", arg1, output); //$NON-NLS-1$ - } - = - /** - * In SQL Server convert(), the type arg is the first arg, and the col= umn name - * is the second arg. DropFunctionModifier needs to be able to handle= the column name - * arg being in different indices. - */ - public void testDrop2() { - DropFunctionModifier mod =3D new DropFunctionModifier(); - mod.setReplaceIndex(1); - = - ILiteral arg1 =3D CommandBuilder.getLanuageFactory().createLiteral= ("string", String.class);//$NON-NLS-1$ - ILiteral arg2 =3D CommandBuilder.getLanuageFactory().createLiteral= (new Integer(5), Integer.class); - IFunction func =3D CommandBuilder.getLanuageFactory().createFuncti= on("convert", new IExpression[] { arg1, arg2}, Integer.class); //$NON-NLS-1$ - = - IExpression output =3D mod.modify(func); - assertEquals("Did not get expected function after using drop modif= ier", arg2, output); //$NON-NLS-1$ - } - = -} Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/extension/impl/TestDropFunctionModifier.java (from rev 488, trunk/conne= ctors/connector-jdbc/src/test/java/com/metamatrix/connector/jdbc/extension/= impl/TestDropFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= extension/impl/TestDropFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= extension/impl/TestDropFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 4= 91) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.extension.impl; + +import java.util.Arrays; + +import org.teiid.connector.jdbc.translator.DropFunctionModifier; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILiteral; + +/** + */ +public class TestDropFunctionModifier extends TestCase { + + /** + * Constructor for TestDropFunctionModifier. + * @param name + */ + public TestDropFunctionModifier(String name) { + super(name); + } + + public void testDrop() { + DropFunctionModifier mod =3D new DropFunctionModifier(); + = + ILiteral arg1 =3D CommandBuilder.getLanuageFactory().createLiteral= (new Integer(5), Integer.class); + ILiteral arg2 =3D CommandBuilder.getLanuageFactory().createLiteral= ("string", String.class);//$NON-NLS-1$ + IFunction func =3D CommandBuilder.getLanuageFactory().createFuncti= on("convert", Arrays.asList(arg1, arg2), Integer.class); //$NON-NLS-1$ + = + IExpression output =3D mod.modify(func); + assertEquals("Did not get expected function after using drop modif= ier", arg1, output); //$NON-NLS-1$ + } + = + /** + * In SQL Server convert(), the type arg is the first arg, and the col= umn name + * is the second arg. DropFunctionModifier needs to be able to handle= the column name + * arg being in different indices. + */ + public void testDrop2() { + DropFunctionModifier mod =3D new DropFunctionModifier(); + mod.setReplaceIndex(1); + = + ILiteral arg1 =3D CommandBuilder.getLanuageFactory().createLiteral= ("string", String.class);//$NON-NLS-1$ + ILiteral arg2 =3D CommandBuilder.getLanuageFactory().createLiteral= (new Integer(5), Integer.class); + IFunction func =3D CommandBuilder.getLanuageFactory().createFuncti= on("convert", Arrays.asList(arg1, arg2), Integer.class); //$NON-NLS-1$ + = + IExpression output =3D mod.modify(func); + assertEquals("Did not get expected function after using drop modif= ier", arg2, output); //$NON-NLS-1$ + } + = +} Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/= jdbc/extension/impl/TestEscapeSyntaxModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/extension/impl/TestEscapeSyntaxModifier.java 2009-02-24 14:21:49 UTC (= rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= extension/impl/TestEscapeSyntaxModifier.java 2009-02-24 18:28:11 UTC (rev 4= 91) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.extension.impl; - -import java.util.Arrays; -import java.util.List; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.connector.jdbc.translator.EscapeSyntaxModifier; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILiteral; - -/** - */ -public class TestEscapeSyntaxModifier extends TestCase { - - /** - * Constructor for TestDropFunctionModifier. - * @param name - */ - public TestEscapeSyntaxModifier(String name) { - super(name); - } - - public void testEscape() { - EscapeSyntaxModifier mod =3D new EscapeSyntaxModifier(); - = - ILiteral arg1 =3D CommandBuilder.getLanuageFactory().createLiteral= ("arg1", String.class); //$NON-NLS-1$ - ILiteral arg2 =3D CommandBuilder.getLanuageFactory().createLiteral= ("arg2", String.class);//$NON-NLS-1$ - IFunction func =3D CommandBuilder.getLanuageFactory().createFuncti= on("concat", new IExpression[] { arg1, arg2}, Integer.class); //$NON-NLS-1$ - = - func =3D (IFunction) mod.modify(func); - List parts =3D mod.translate(func); - = - List expected =3D Arrays.asList(new Object[] { "{fn ", "concat", "= (", arg1, ", ", arg2, ")", "}"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$= //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ - assertEquals(expected, parts); - } - = -} Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/extension/impl/TestEscapeSyntaxModifier.java (from rev 488, trunk/conne= ctors/connector-jdbc/src/test/java/com/metamatrix/connector/jdbc/extension/= impl/TestEscapeSyntaxModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= extension/impl/TestEscapeSyntaxModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= extension/impl/TestEscapeSyntaxModifier.java 2009-02-24 18:28:11 UTC (rev 4= 91) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.extension.impl; + +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.translator.EscapeSyntaxModifier; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILiteral; + +/** + */ +public class TestEscapeSyntaxModifier extends TestCase { + + /** + * Constructor for TestDropFunctionModifier. + * @param name + */ + public TestEscapeSyntaxModifier(String name) { + super(name); + } + + public void testEscape() { + EscapeSyntaxModifier mod =3D new EscapeSyntaxModifier(); + = + ILiteral arg1 =3D CommandBuilder.getLanuageFactory().createLiteral= ("arg1", String.class); //$NON-NLS-1$ + ILiteral arg2 =3D CommandBuilder.getLanuageFactory().createLiteral= ("arg2", String.class);//$NON-NLS-1$ + IFunction func =3D CommandBuilder.getLanuageFactory().createFuncti= on("concat", Arrays.asList( arg1, arg2), Integer.class); //$NON-NLS-1$ + = + func =3D (IFunction) mod.modify(func); + List parts =3D mod.translate(func); + = + List expected =3D Arrays.asList(new Object[] { "{fn ", "concat", "= (", arg1, ", ", arg2, ")", "}"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$= //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ + assertEquals(expected, parts); + } + = +} Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/mysql (from rev 486, trunk/connectors/connector-jdbc/src/test/java/com/= metamatrix/connector/jdbc/mysql) Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/mysql ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/mysql/TestMySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/mysql/TestMySQLTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= mysql/TestMySQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,17 +20,19 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.mysql; +package org.teiid.connector.jdbc.mysql; = import java.util.Map; import java.util.Properties; = +import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.mysql.MySQLTranslator; +import org.teiid.connector.jdbc.translator.TranslatedCommand; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.MetadataFactory; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; import com.metamatrix.connector.language.ICommand; = /** Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/oracle (from rev 486, trunk/connectors/connector-jdbc/src/test/java/com= /metamatrix/connector/jdbc/oracle) Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/oracle ___________________________________________________________________ Name: svn:mergeinfo + = Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/= jdbc/oracle/TestDayWeekQuarterFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestDayWeekQuarterFunctionModifier.java 2009-02-24 14:21:49 UTC= (rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestDayWeekQuarterFunctionModifier.java 2009-02-24 18:28:11 UTC (rev= 491) @@ -1,130 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.sql.Timestamp; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.query.unittest.TimestampUtil; - -/** - */ -public class TestDayWeekQuarterFunctionModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestHourFunctionModifier. - * @param name - */ - public TestDayWeekQuarterFunctionModifier(String name) { - super(name); - } - - public IExpression helpTestMod(ILiteral c, String format, String expec= tedStr) throws Exception { - IFunction func =3D LANG_FACTORY.createFunction("dayweekquarter", = //$NON-NLS-1$ = - new IExpression[] { c }, - String.class); - = - DayWeekQuarterFunctionModifier mod =3D new DayWeekQuarterFunctionM= odifier (LANG_FACTORY, format); - IExpression expr =3D mod.modify(func); - = - OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); - = - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = - sqlVisitor.append(expr); = - assertEquals(expectedStr, sqlVisitor.toString()); - = - return expr; - } - - public void test1() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "DDD", //$NON-NLS-1$ - "TO_NUMBER(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'DDD'))"); //$= NON-NLS-1$ - } - - public void test2() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); - helpTestMod(arg1, "DDD", //$NON-NLS-1$ - "TO_NUMBER(TO_CHAR({d'2004-01-21'}, 'DDD'))"); //$NON-NLS-1$ - } - = - public void test3() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "D", //$NON-NLS-1$ - "TO_NUMBER(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'D'))"); //$NO= N-NLS-1$ - } - - public void test4() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); - helpTestMod(arg1, "D", //$NON-NLS-1$ - "TO_NUMBER(TO_CHAR({d'2004-01-21'}, 'D'))"); //$NON-NLS-1$ - } - = - public void test5() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "DD", //$NON-NLS-1$ - "TO_NUMBER(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'DD'))"); //$N= ON-NLS-1$ - } - - public void test6() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); - helpTestMod(arg1, "DD", //$NON-NLS-1$ - "TO_NUMBER(TO_CHAR({d'2004-01-21'}, 'DD'))"); //$NON-NLS-1$ - } - = - public void test7() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "WW", //$NON-NLS-1$ - "TO_NUMBER(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'WW'))"); //$N= ON-NLS-1$ - } - - public void test8() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); - helpTestMod(arg1, "WW", //$NON-NLS-1$ - "TO_NUMBER(TO_CHAR({d'2004-01-21'}, 'WW'))"); //$NON-NLS-1$ - } - = - public void test9() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "Q", //$NON-NLS-1$ - "TO_NUMBER(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'Q'))"); //$NO= N-NLS-1$ - } - - public void test10() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); - helpTestMod(arg1, "Q", //$NON-NLS-1$ - "TO_NUMBER(TO_CHAR({d'2004-01-21'}, 'Q'))"); //$NON-NLS-1$ - } -} \ No newline at end of file Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/oracle/TestDayWeekQuarterFunctionModifier.java (from rev 488, trunk/con= nectors/connector-jdbc/src/test/java/com/metamatrix/connector/jdbc/oracle/T= estDayWeekQuarterFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestDayWeekQuarterFunctionModifier.java (rev= 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestDayWeekQuarterFunctionModifier.java 2009-02-24 18:28:11 UTC (rev= 491) @@ -0,0 +1,134 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.sql.Timestamp; +import java.util.Arrays; +import java.util.Properties; + +import org.teiid.connector.jdbc.oracle.DayWeekQuarterFunctionModifier; +import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.query.unittest.TimestampUtil; + +/** + */ +public class TestDayWeekQuarterFunctionModifier extends TestCase { + + private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); + + /** + * Constructor for TestHourFunctionModifier. + * @param name + */ + public TestDayWeekQuarterFunctionModifier(String name) { + super(name); + } + + public IExpression helpTestMod(ILiteral c, String format, String expec= tedStr) throws Exception { + IFunction func =3D LANG_FACTORY.createFunction("dayweekquarter", = //$NON-NLS-1$ = + Arrays.asList(c), + String.class); + = + DayWeekQuarterFunctionModifier mod =3D new DayWeekQuarterFunctionM= odifier (LANG_FACTORY, format); + IExpression expr =3D mod.modify(func); + = + OracleSQLTranslator trans =3D new OracleSQLTranslator(); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); + = + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = + sqlVisitor.append(expr); = + assertEquals(expectedStr, sqlVisitor.toString()); + = + return expr; + } + + public void test1() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); + helpTestMod(arg1, "DDD", //$NON-NLS-1$ + "TO_NUMBER(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'DDD'))"); //$= NON-NLS-1$ + } + + public void test2() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); + helpTestMod(arg1, "DDD", //$NON-NLS-1$ + "TO_NUMBER(TO_CHAR({d'2004-01-21'}, 'DDD'))"); //$NON-NLS-1$ + } + = + public void test3() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); + helpTestMod(arg1, "D", //$NON-NLS-1$ + "TO_NUMBER(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'D'))"); //$NO= N-NLS-1$ + } + + public void test4() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); + helpTestMod(arg1, "D", //$NON-NLS-1$ + "TO_NUMBER(TO_CHAR({d'2004-01-21'}, 'D'))"); //$NON-NLS-1$ + } + = + public void test5() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); + helpTestMod(arg1, "DD", //$NON-NLS-1$ + "TO_NUMBER(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'DD'))"); //$N= ON-NLS-1$ + } + + public void test6() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); + helpTestMod(arg1, "DD", //$NON-NLS-1$ + "TO_NUMBER(TO_CHAR({d'2004-01-21'}, 'DD'))"); //$NON-NLS-1$ + } + = + public void test7() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); + helpTestMod(arg1, "WW", //$NON-NLS-1$ + "TO_NUMBER(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'WW'))"); //$N= ON-NLS-1$ + } + + public void test8() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); + helpTestMod(arg1, "WW", //$NON-NLS-1$ + "TO_NUMBER(TO_CHAR({d'2004-01-21'}, 'WW'))"); //$NON-NLS-1$ + } + = + public void test9() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); + helpTestMod(arg1, "Q", //$NON-NLS-1$ + "TO_NUMBER(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'Q'))"); //$NO= N-NLS-1$ + } + + public void test10() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); + helpTestMod(arg1, "Q", //$NON-NLS-1$ + "TO_NUMBER(TO_CHAR({d'2004-01-21'}, 'Q'))"); //$NON-NLS-1$ + } +} \ No newline at end of file Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/= jdbc/oracle/TestExtractFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestExtractFunctionModifier.java 2009-02-24 14:21:49 UTC (rev 4= 86) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestExtractFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,114 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.sql.Timestamp; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.query.unittest.TimestampUtil; - -/** - */ -public class TestExtractFunctionModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestMonthFunctionModifier. - * @param name - */ - public TestExtractFunctionModifier(String name) { - super(name); - } - - public IExpression helpTestMod(IExpression c, String expectedStr, Stri= ng target) throws Exception { - IFunction func =3D LANG_FACTORY.createFunction(target, = - new IExpression[] { c }, - Integer.class); - = - ExtractFunctionModifier mod =3D new ExtractFunctionModifier (targe= t); - IExpression expr =3D mod.modify(func); - - OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.registerFunctionModifier("extract", mod); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); - = - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = - - //sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); - sqlVisitor.append(expr); = - //System.out.println(" expected: " + expectedStr + " \t actual: " = + sqlVisitor.toString()); - assertEquals(expectedStr, sqlVisitor.toString()); - = - return expr; - } - public void test1() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); - helpTestMod(arg1, "EXTRACT(MONTH FROM {d'2004-01-21'})" , "month")= ; //$NON-NLS-1$ //$NON-NLS-2$ - } - = - public void test2() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 17, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "EXTRACT(MONTH FROM {ts'2004-01-21 17:05:00.0'})= ", "month"); //$NON-NLS-1$ //$NON-NLS-2$ - } - = - public void test3() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); - helpTestMod(arg1, "EXTRACT(YEAR FROM {d'2004-01-21'})", "year"); /= /$NON-NLS-1$ //$NON-NLS-2$ - } - - public void test4() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 17, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "EXTRACT(YEAR FROM {ts'2004-01-21 17:05:00.0'})"= , "year"); //$NON-NLS-1$ //$NON-NLS-2$ - } - = - public void test5() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); - helpTestMod(arg1, "EXTRACT(DAY FROM {d'2004-01-21'})", "dayofmonth= "); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void test6() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 17, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "EXTRACT(DAY FROM {ts'2004-01-21 17:05:00.0'})",= "dayofmonth"); //$NON-NLS-1$ //$NON-NLS-2$ - } = - - public void test11() throws Exception { - IGroup group =3D LANG_FACTORY.createGroup(null, "group", null); //= $NON-NLS-1$ - IElement elem =3D LANG_FACTORY.createElement("col", group, null, T= ypeFacility.RUNTIME_TYPES.DATE); //$NON-NLS-1$ - helpTestMod(elem, "EXTRACT(DAY FROM col)", "dayofmonth"); //$NON-N= LS-1$ //$NON-NLS-2$ - } - = -} - Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/oracle/TestExtractFunctionModifier.java (from rev 488, trunk/connectors= /connector-jdbc/src/test/java/com/metamatrix/connector/jdbc/oracle/TestExtr= actFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestExtractFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestExtractFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,118 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.sql.Timestamp; +import java.util.Arrays; +import java.util.Properties; + +import org.teiid.connector.jdbc.oracle.ExtractFunctionModifier; +import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.IElement; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.IGroup; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.query.unittest.TimestampUtil; + +/** + */ +public class TestExtractFunctionModifier extends TestCase { + + private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); + + /** + * Constructor for TestMonthFunctionModifier. + * @param name + */ + public TestExtractFunctionModifier(String name) { + super(name); + } + + public IExpression helpTestMod(IExpression c, String expectedStr, Stri= ng target) throws Exception { + IFunction func =3D LANG_FACTORY.createFunction(target, = + Arrays.asList(c), + Integer.class); + = + ExtractFunctionModifier mod =3D new ExtractFunctionModifier (targe= t); + IExpression expr =3D mod.modify(func); + + OracleSQLTranslator trans =3D new OracleSQLTranslator(); + trans.registerFunctionModifier("extract", mod); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); + = + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = + + //sqlVisitor.setFunctionModifiers(trans.getFunctionModifiers()); + sqlVisitor.append(expr); = + //System.out.println(" expected: " + expectedStr + " \t actual: " = + sqlVisitor.toString()); + assertEquals(expectedStr, sqlVisitor.toString()); + = + return expr; + } + public void test1() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); + helpTestMod(arg1, "EXTRACT(MONTH FROM {d'2004-01-21'})" , "month")= ; //$NON-NLS-1$ //$NON-NLS-2$ + } + = + public void test2() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 17, 5, 0, 0), Timestamp.class); + helpTestMod(arg1, "EXTRACT(MONTH FROM {ts'2004-01-21 17:05:00.0'})= ", "month"); //$NON-NLS-1$ //$NON-NLS-2$ + } + = + public void test3() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); + helpTestMod(arg1, "EXTRACT(YEAR FROM {d'2004-01-21'})", "year"); /= /$NON-NLS-1$ //$NON-NLS-2$ + } + + public void test4() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 17, 5, 0, 0), Timestamp.class); + helpTestMod(arg1, "EXTRACT(YEAR FROM {ts'2004-01-21 17:05:00.0'})"= , "year"); //$NON-NLS-1$ //$NON-NLS-2$ + } + = + public void test5() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); + helpTestMod(arg1, "EXTRACT(DAY FROM {d'2004-01-21'})", "dayofmonth= "); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void test6() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 17, 5, 0, 0), Timestamp.class); + helpTestMod(arg1, "EXTRACT(DAY FROM {ts'2004-01-21 17:05:00.0'})",= "dayofmonth"); //$NON-NLS-1$ //$NON-NLS-2$ + } = + + public void test11() throws Exception { + IGroup group =3D LANG_FACTORY.createGroup(null, "group", null); //= $NON-NLS-1$ + IElement elem =3D LANG_FACTORY.createElement("col", group, null, T= ypeFacility.RUNTIME_TYPES.DATE); //$NON-NLS-1$ + helpTestMod(elem, "EXTRACT(DAY FROM col)", "dayofmonth"); //$NON-N= LS-1$ //$NON-NLS-2$ + } + = +} + Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/= jdbc/oracle/TestLeftOrRightFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLeftOrRightFunctionModifier.java 2009-02-24 14:21:49 UTC (r= ev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLeftOrRightFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 49= 1) @@ -1,83 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; - -/** - */ -public class TestLeftOrRightFunctionModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestHourFunctionModifier. - * @param name - */ - public TestLeftOrRightFunctionModifier(String name) { - super(name); - } - - public IExpression helpTestMod(ILiteral c, ILiteral d, String target, = String expectedStr) throws Exception { - IFunction func =3D LANG_FACTORY.createFunction(target, - new IExpression[] { c, d }, - String.class); - = - LeftOrRightFunctionModifier mod =3D new LeftOrRightFunctionModifie= r (LANG_FACTORY); - IExpression expr =3D mod.modify(func); - = - OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); - = - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = - sqlVisitor.append(expr); = - //System.out.println(" expected: " + expectedStr + " \t actual: " = + sqlVisitor.toString()); - assertEquals(expectedStr, sqlVisitor.toString()); - = - return expr; - } - - public void test1() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral("1234214", String.cla= ss); //$NON-NLS-1$ - ILiteral count =3D LANG_FACTORY.createLiteral(new Integer(11), Int= eger.class); - helpTestMod(arg1, count, "left", //$NON-NLS-1$ - "SUBSTR('1234214', 1, 11)"); //$NON-NLS-1$ - } - = - public void test2() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral("1234214", String.cla= ss); //$NON-NLS-1$ - ILiteral count =3D LANG_FACTORY.createLiteral(new Integer(2), Inte= ger.class); - helpTestMod(arg1, count, "right", //$NON-NLS-1$ - "SUBSTR('1234214', (-1 * 2))"); //$NON-NLS-1$ - } -} \ No newline at end of file Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/oracle/TestLeftOrRightFunctionModifier.java (from rev 488, trunk/connec= tors/connector-jdbc/src/test/java/com/metamatrix/connector/jdbc/oracle/Test= LeftOrRightFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLeftOrRightFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLeftOrRightFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 49= 1) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.util.Arrays; +import java.util.Properties; + +import org.teiid.connector.jdbc.oracle.LeftOrRightFunctionModifier; +import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILiteral; + +/** + */ +public class TestLeftOrRightFunctionModifier extends TestCase { + + private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); + + /** + * Constructor for TestHourFunctionModifier. + * @param name + */ + public TestLeftOrRightFunctionModifier(String name) { + super(name); + } + + public IExpression helpTestMod(ILiteral c, ILiteral d, String target, = String expectedStr) throws Exception { + IFunction func =3D LANG_FACTORY.createFunction(target, + Arrays.asList( c, d ), + String.class); + = + LeftOrRightFunctionModifier mod =3D new LeftOrRightFunctionModifie= r (LANG_FACTORY); + IExpression expr =3D mod.modify(func); + = + OracleSQLTranslator trans =3D new OracleSQLTranslator(); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); + = + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = + sqlVisitor.append(expr); = + //System.out.println(" expected: " + expectedStr + " \t actual: " = + sqlVisitor.toString()); + assertEquals(expectedStr, sqlVisitor.toString()); + = + return expr; + } + + public void test1() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral("1234214", String.cla= ss); //$NON-NLS-1$ + ILiteral count =3D LANG_FACTORY.createLiteral(new Integer(11), Int= eger.class); + helpTestMod(arg1, count, "left", //$NON-NLS-1$ + "SUBSTR('1234214', 1, 11)"); //$NON-NLS-1$ + } + = + public void test2() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral("1234214", String.cla= ss); //$NON-NLS-1$ + ILiteral count =3D LANG_FACTORY.createLiteral(new Integer(2), Inte= ger.class); + helpTestMod(arg1, count, "right", //$NON-NLS-1$ + "SUBSTR('1234214', (-1 * 2))"); //$NON-NLS-1$ + } +} \ No newline at end of file Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/= jdbc/oracle/TestLocateFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLocateFunctionModifier.java 2009-02-24 14:21:49 UTC (rev 48= 6) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLocateFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; - -/** - */ -public class TestLocateFunctionModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestLocateFunctionModifier. - * @param name - */ - public TestLocateFunctionModifier(String name) { - super(name); - } - - public IExpression helpTestMod(IExpression[] args, String expectedStr)= throws Exception { - IFunction func =3D LANG_FACTORY.createFunction("hour", //$NON-NLS= -1$ - args, - Integer.class); - = - LocateFunctionModifier mod =3D new LocateFunctionModifier(LANG_FAC= TORY); - IExpression expr =3D mod.modify(func); - = - OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); - = - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = - sqlVisitor.append(expr); = - = - assertEquals(expectedStr, sqlVisitor.toString()); - = - return expr; - } - - public void testTwoArgs() throws Exception { - IExpression[] args =3D new IExpression[] { - LANG_FACTORY.createLiteral(".", String.class), //$NON-NLS-1$ - LANG_FACTORY.createLiteral("a.b.c", String.class) = //$NON-NLS-1$ - }; = - helpTestMod(args, "instr('a.b.c', '.')"); //$NON-NLS-1$ - } - - public void testThreeArgsWithConstant() throws Exception { - IExpression[] args =3D new IExpression[] { - LANG_FACTORY.createLiteral(".", String.class), //$NON-NLS-1$ - LANG_FACTORY.createLiteral("a.b.c", String.class), = //$NON-NLS-1$ - LANG_FACTORY.createLiteral(new Integer(2), Integer.class) = = - }; = - helpTestMod(args, "instr('a.b.c', '.', 3)"); //$NON-NLS-1$ - } - - public void testThreeArgsWithElement() throws Exception { - IExpression[] args =3D new IExpression[] { - LANG_FACTORY.createLiteral(".", String.class), //$NON-NLS-1$ - LANG_FACTORY.createLiteral("a.b.c", String.class), = //$NON-NLS-1$ - LANG_FACTORY.createElement("e1", null, null, Integer.class) = //$NON-NLS-1$ - }; = - helpTestMod(args, "instr('a.b.c', '.', (e1 + 1))"); //$NON-NLS-1$ - } - - public void testThreeArgsWithNull() throws Exception { - IExpression[] args =3D new IExpression[] { - LANG_FACTORY.createLiteral(".", String.class), //$NON-NLS-1$ - LANG_FACTORY.createLiteral("a.b.c", String.class), = //$NON-NLS-1$ - LANG_FACTORY.createLiteral(null, Integer.class) = - }; = - helpTestMod(args, "instr('a.b.c', '.', NULL)"); //$NON-NLS-1$ - } - -} Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/oracle/TestLocateFunctionModifier.java (from rev 488, trunk/connectors/= connector-jdbc/src/test/java/com/metamatrix/connector/jdbc/oracle/TestLocat= eFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLocateFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLocateFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,108 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.util.Arrays; +import java.util.Properties; + +import org.teiid.connector.jdbc.oracle.LocateFunctionModifier; +import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; + +/** + */ +public class TestLocateFunctionModifier extends TestCase { + + private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); + + /** + * Constructor for TestLocateFunctionModifier. + * @param name + */ + public TestLocateFunctionModifier(String name) { + super(name); + } + + public IExpression helpTestMod(IExpression[] args, String expectedStr)= throws Exception { + IFunction func =3D LANG_FACTORY.createFunction("hour", //$NON-NLS= -1$ + Arrays.asList(args), + Integer.class); + = + LocateFunctionModifier mod =3D new LocateFunctionModifier(LANG_FAC= TORY); + IExpression expr =3D mod.modify(func); + = + OracleSQLTranslator trans =3D new OracleSQLTranslator(); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); + = + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = + sqlVisitor.append(expr); = + = + assertEquals(expectedStr, sqlVisitor.toString()); + = + return expr; + } + + public void testTwoArgs() throws Exception { + IExpression[] args =3D new IExpression[] { + LANG_FACTORY.createLiteral(".", String.class), //$NON-NLS-1$ + LANG_FACTORY.createLiteral("a.b.c", String.class) = //$NON-NLS-1$ + }; = + helpTestMod(args, "instr('a.b.c', '.')"); //$NON-NLS-1$ + } + + public void testThreeArgsWithConstant() throws Exception { + IExpression[] args =3D new IExpression[] { + LANG_FACTORY.createLiteral(".", String.class), //$NON-NLS-1$ + LANG_FACTORY.createLiteral("a.b.c", String.class), = //$NON-NLS-1$ + LANG_FACTORY.createLiteral(new Integer(2), Integer.class) = = + }; = + helpTestMod(args, "instr('a.b.c', '.', 3)"); //$NON-NLS-1$ + } + + public void testThreeArgsWithElement() throws Exception { + IExpression[] args =3D new IExpression[] { + LANG_FACTORY.createLiteral(".", String.class), //$NON-NLS-1$ + LANG_FACTORY.createLiteral("a.b.c", String.class), = //$NON-NLS-1$ + LANG_FACTORY.createElement("e1", null, null, Integer.class) = //$NON-NLS-1$ + }; = + helpTestMod(args, "instr('a.b.c', '.', (e1 + 1))"); //$NON-NLS-1$ + } + + public void testThreeArgsWithNull() throws Exception { + IExpression[] args =3D new IExpression[] { + LANG_FACTORY.createLiteral(".", String.class), //$NON-NLS-1$ + LANG_FACTORY.createLiteral("a.b.c", String.class), = //$NON-NLS-1$ + LANG_FACTORY.createLiteral(null, Integer.class) = + }; = + helpTestMod(args, "instr('a.b.c', '.', NULL)"); //$NON-NLS-1$ + } + +} Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/= jdbc/oracle/TestLog10FunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestLog10FunctionModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLog10FunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.visitor.util.SQLStringVisitor; - -/** - */ -public class TestLog10FunctionModifier extends TestCase { - - /** - * Constructor for TestLog10FunctionModifier. - * @param name - */ - public TestLog10FunctionModifier(String name) { - super(name); - } - - public void testModifier() { - ILiteral arg =3D CommandBuilder.getLanuageFactory().createLiteral(= new Double(5.2), Double.class); - IFunction func =3D CommandBuilder.getLanuageFactory().createFuncti= on("log10", new IExpression[] {arg}, Double.class); //$NON-NLS-1$ - = - Log10FunctionModifier modifier =3D new Log10FunctionModifier(Comma= ndBuilder.getLanuageFactory()); - IExpression outExpr =3D modifier.modify(func); - = - assertTrue(outExpr instanceof IFunction); - IFunction outFunc =3D (IFunction) outExpr; - = - assertEquals("log", outFunc.getName()); //$NON-NLS-1$ - assertEquals(func.getType(), outFunc.getType()); - = - IExpression[] outArgs =3D func.getParameters(); - assertEquals(2, outArgs.length); - assertEquals(arg, outArgs[1]); - = - assertTrue(outArgs[1] instanceof ILiteral); - ILiteral newArg =3D (ILiteral) outArgs[0]; - assertEquals(Integer.class, newArg.getType()); - assertEquals(new Integer(10), newArg.getValue()); - = - assertEquals("log(10, 5.2)", SQLStringVisitor.getSQLString(outFunc= )); //$NON-NLS-1$ - } -} Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/oracle/TestLog10FunctionModifier.java (from rev 488, trunk/connectors/c= onnector-jdbc/src/test/java/com/metamatrix/connector/jdbc/oracle/TestLog10F= unctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLog10FunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLog10FunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.util.Arrays; +import java.util.List; + +import org.teiid.connector.jdbc.oracle.Log10FunctionModifier; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.visitor.util.SQLStringVisitor; + +/** + */ +public class TestLog10FunctionModifier extends TestCase { + + /** + * Constructor for TestLog10FunctionModifier. + * @param name + */ + public TestLog10FunctionModifier(String name) { + super(name); + } + + public void testModifier() { + ILiteral arg =3D CommandBuilder.getLanuageFactory().createLiteral(= new Double(5.2), Double.class); + IFunction func =3D CommandBuilder.getLanuageFactory().createFuncti= on("log10", Arrays.asList(arg), Double.class); //$NON-NLS-1$ + = + Log10FunctionModifier modifier =3D new Log10FunctionModifier(Comma= ndBuilder.getLanuageFactory()); + IExpression outExpr =3D modifier.modify(func); + = + assertTrue(outExpr instanceof IFunction); + IFunction outFunc =3D (IFunction) outExpr; + = + assertEquals("log", outFunc.getName()); //$NON-NLS-1$ + assertEquals(func.getType(), outFunc.getType()); + = + List outArgs =3D func.getParameters(); + assertEquals(2, outArgs.size()); + assertEquals(arg, outArgs.get(1)); + = + assertTrue(outArgs.get(1) instanceof ILiteral); + ILiteral newArg =3D (ILiteral) outArgs.get(0); + assertEquals(Integer.class, newArg.getType()); + assertEquals(new Integer(10), newArg.getValue()); + = + assertEquals("log(10, 5.2)", SQLStringVisitor.getSQLString(outFunc= )); //$NON-NLS-1$ + } +} Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/= jdbc/oracle/TestMonthOrDayNameFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-24 14:21:49 UTC= (rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-24 18:28:11 UTC (rev= 491) @@ -1,93 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.sql.Timestamp; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.query.unittest.TimestampUtil; - -/** - */ -public class TestMonthOrDayNameFunctionModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestHourFunctionModifier. - * @param name - */ - public TestMonthOrDayNameFunctionModifier(String name) { - super(name); - } - - public IExpression helpTestMod(ILiteral c, String format, String expec= tedStr) throws Exception { - IFunction func =3D LANG_FACTORY.createFunction(format.toLowerCase(= )+"name", // "monthname" //$NON-NLS-1$ = - new IExpression[] { c }, - String.class); - = - MonthOrDayNameFunctionModifier mod =3D new MonthOrDayNameFunctionM= odifier (LANG_FACTORY, format); - IExpression expr =3D mod.modify(func); - = - OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); - = - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = - sqlVisitor.append(expr); = - assertEquals(expectedStr, sqlVisitor.toString()); - return expr; - } - - public void test1() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "Month", //$NON-NLS-1$ - "RTRIM(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'Month'))"); //$NO= N-NLS-1$ - } - - public void test2() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); - helpTestMod(arg1, "Month", //$NON-NLS-1$ - "RTRIM(TO_CHAR({d'2004-01-21'}, 'Month'))"); //$NON-NLS-1$ - } - = - public void test3() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); - helpTestMod(arg1, "Day", //$NON-NLS-1$ - "RTRIM(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'Day'))"); //$NON-= NLS-1$ - } - - public void test4() throws Exception { - ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); - helpTestMod(arg1, "Day", //$NON-NLS-1$ - "RTRIM(TO_CHAR({d'2004-01-21'}, 'Day'))"); //$NON-NLS-1$ - } -} \ No newline at end of file Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/oracle/TestMonthOrDayNameFunctionModifier.java (from rev 488, trunk/con= nectors/connector-jdbc/src/test/java/com/metamatrix/connector/jdbc/oracle/T= estMonthOrDayNameFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestMonthOrDayNameFunctionModifier.java (rev= 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-24 18:28:11 UTC (rev= 491) @@ -0,0 +1,97 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.sql.Timestamp; +import java.util.Arrays; +import java.util.Properties; + +import org.teiid.connector.jdbc.oracle.MonthOrDayNameFunctionModifier; +import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.query.unittest.TimestampUtil; + +/** + */ +public class TestMonthOrDayNameFunctionModifier extends TestCase { + + private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); + + /** + * Constructor for TestHourFunctionModifier. + * @param name + */ + public TestMonthOrDayNameFunctionModifier(String name) { + super(name); + } + + public IExpression helpTestMod(ILiteral c, String format, String expec= tedStr) throws Exception { + IFunction func =3D LANG_FACTORY.createFunction(format.toLowerCase(= )+"name", // "monthname" //$NON-NLS-1$ = + Arrays.asList( c ), + String.class); + = + MonthOrDayNameFunctionModifier mod =3D new MonthOrDayNameFunctionM= odifier (LANG_FACTORY, format); + IExpression expr =3D mod.modify(func); + = + OracleSQLTranslator trans =3D new OracleSQLTranslator(); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); + = + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = + sqlVisitor.append(expr); = + assertEquals(expectedStr, sqlVisitor.toString()); + return expr; + } + + public void test1() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); + helpTestMod(arg1, "Month", //$NON-NLS-1$ + "RTRIM(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'Month'))"); //$NO= N-NLS-1$ + } + + public void test2() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); + helpTestMod(arg1, "Month", //$NON-NLS-1$ + "RTRIM(TO_CHAR({d'2004-01-21'}, 'Month'))"); //$NON-NLS-1$ + } + = + public void test3() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createT= imestamp(104, 0, 21, 10, 5, 0, 0), Timestamp.class); + helpTestMod(arg1, "Day", //$NON-NLS-1$ + "RTRIM(TO_CHAR({ts'2004-01-21 10:05:00.0'}, 'Day'))"); //$NON-= NLS-1$ + } + + public void test4() throws Exception { + ILiteral arg1 =3D LANG_FACTORY.createLiteral(TimestampUtil.createD= ate(104, 0, 21), java.sql.Date.class); + helpTestMod(arg1, "Day", //$NON-NLS-1$ + "RTRIM(TO_CHAR({d'2004-01-21'}, 'Day'))"); //$NON-NLS-1$ + } +} \ No newline at end of file Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/= jdbc/oracle/TestOracleConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestOracleConvertModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestOracleConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,518 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.sql.Timestamp; -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.query.unittest.TimestampUtil; - -/** - */ -public class TestOracleConvertModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - /** - * Constructor for TestSybaseConvertModifier. - * @param name - */ - public TestOracleConvertModifier(String name) { - super(name); - } - - public String helpGetString(IExpression expr) throws Exception { - OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); - = - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = - sqlVisitor.append(expr); = - = - return sqlVisitor.toString(); = - } - - public void helpTest(IExpression srcExpression, String tgtType, String= expectedExpression) throws Exception { - IFunction func =3D LANG_FACTORY.createFunction("convert", //$NON-= NLS-1$ - new IExpression[] { = - srcExpression, - LANG_FACTORY.createLiteral(tgtType, String.class)}, - TypeFacility.getDataTypeClass(tgtType)); - = - OracleConvertModifier mod =3D new OracleConvertModifier(LANG_FACTO= RY, null); - IExpression expr =3D mod.modify(func); - = - assertEquals("Error converting from " + srcExpression.getType() + = " to " + tgtType, //$NON-NLS-1$ //$NON-NLS-2$ = - expectedExpression, helpGetString(expr)); = - } - - // Source =3D STRING - - public void testStringToChar() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "char", "'= 5'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "boolean",= "decode('5', 'true', 1, 'false', 0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-= NLS-3$ - } - - public void testStringToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "byte", "t= o_number('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "short", "= to_number('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "integer",= "to_number('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "long", "t= o_number('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigintege= r", "to_number('5')"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "float", "= to_number('5')");//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "double", = "to_number('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToDate() throws Exception { - helpTest(LANG_FACTORY.createLiteral("2004-06-29", String.class), "= date", "to_date('2004-06-29', 'YYYY-MM-DD')"); //$NON-NLS-1$ //$NON-NLS-2$ = //$NON-NLS-3$ - } - - public void testStringToTime() throws Exception { - helpTest(LANG_FACTORY.createLiteral("23:59:59", String.class), "ti= me", "to_date(('1970-01-01 ' || to_char('23:59:59', 'HH24:MI:SS')), 'YYYY-M= M-DD HH24:MI:SS')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral("2004-06-29 23:59:59.987", Str= ing.class), "timestamp", "to_timestamp('2004-06-29 23:59:59.987', 'YYYY-MM-= DD HH24:MI:SS.FF')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testStringToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigdecima= l", "to_number('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - // Source =3D CHAR - = - public void testCharToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Character('5'), Character.= class), "string", "'5'"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D BOOLEAN - = - public void testBooleanToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "string", "decode(1, 0, 'false', 1, 'true')"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testBooleanToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - = - // Source =3D BYTE - = - public void testByteToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "string", "to_char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testByteToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D SHORT - = - public void testShortToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "string", "to_char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testShortToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D INTEGER - = - public void testIntegerToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "string", "to_char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testIntegerToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D LONG - = - public void testLongToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "str= ing", "to_char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "boo= lean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "byt= e", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "sho= rt", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "int= eger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "flo= at", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "dou= ble", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testLongToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= decimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D BIGINTEGER - = - public void testBigIntegerToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "string", "to_char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigIntegerToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - // Source =3D FLOAT - = - public void testFloatToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "string", "to_char(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "boolean", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "byte", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "short", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "integer", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "long", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "biginteger", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "double", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testFloatToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "bigdecimal", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D DOUBLE - = - public void testDoubleToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "string", "to_char(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "boolean", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "byte", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "short", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "integer", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "long", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "biginteger", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "float", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDoubleToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "bigdecimal", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D BIGDECIMAL - = - public void testBigDecimalToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "string", "to_char(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-N= LS-3$ - } - - public void testBigDecimalToBoolean() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "boolean", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigDecimalToByte() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "byte", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigDecimalToShort() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "short", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigDecimalToInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "integer", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigDecimalToLong() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "long", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigDecimalToBigInteger() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "biginteger", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigDecimalToFloat() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "float", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - public void testBigDecimalToDoublel() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "double", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - - // Source =3D DATE - - public void testDateToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "string", "to_char({d'2003-11-01'}, 'YYYY-MM-= DD')"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testDateToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "timestamp", "cast({d'2003-11-01'} AS timesta= mp)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D TIME - - public void testTimeToString() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "string", "to_char({ts'1970-01-01 23:59:59'},= 'HH24:MI:SS')"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testTimeToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "timestamp", "cast({ts'1970-01-01 23:59:59'} = AS timestamp)"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - // Source =3D TIMESTAMP - = - public void testTimestampToString() throws Exception { - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "string"= , "to_char({ts'2003-11-01 12:05:02.0'}, 'YYYY-MM-DD HH24:MI:SS.FF')"); //$N= ON-NLS-1$ //$NON-NLS-2$ - } - - public void testTimestampToDate() throws Exception { - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "date", = "trunc({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testTimestampToTime() throws Exception { - Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = - helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "time", = "to_date(('1970-01-01 ' || to_char({ts'2003-11-01 12:05:02.0'}, 'HH24:MI:SS= ')), 'YYYY-MM-DD HH24:MI:SS')"); //$NON-NLS-1$ //$NON-NLS-2$ - } = - -} Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/oracle/TestOracleConvertModifier.java (from rev 488, trunk/connectors/c= onnector-jdbc/src/test/java/com/metamatrix/connector/jdbc/oracle/TestOracle= ConvertModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestOracleConvertModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestOracleConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,522 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.sql.Timestamp; +import java.util.Arrays; +import java.util.Properties; + +import org.teiid.connector.jdbc.oracle.OracleConvertModifier; +import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.query.unittest.TimestampUtil; + +/** + */ +public class TestOracleConvertModifier extends TestCase { + + private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); + + /** + * Constructor for TestSybaseConvertModifier. + * @param name + */ + public TestOracleConvertModifier(String name) { + super(name); + } + + public String helpGetString(IExpression expr) throws Exception { + OracleSQLTranslator trans =3D new OracleSQLTranslator(); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); + = + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = + sqlVisitor.append(expr); = + = + return sqlVisitor.toString(); = + } + + public void helpTest(IExpression srcExpression, String tgtType, String= expectedExpression) throws Exception { + IFunction func =3D LANG_FACTORY.createFunction("convert", //$NON-= NLS-1$ + Arrays.asList( = + srcExpression, + LANG_FACTORY.createLiteral(tgtType, String.class)), + TypeFacility.getDataTypeClass(tgtType)); + = + OracleConvertModifier mod =3D new OracleConvertModifier(LANG_FACTO= RY, null); + IExpression expr =3D mod.modify(func); + = + assertEquals("Error converting from " + srcExpression.getType() + = " to " + tgtType, //$NON-NLS-1$ //$NON-NLS-2$ = + expectedExpression, helpGetString(expr)); = + } + + // Source =3D STRING + + public void testStringToChar() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "char", "'= 5'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "boolean",= "decode('5', 'true', 1, 'false', 0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-= NLS-3$ + } + + public void testStringToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "byte", "t= o_number('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "short", "= to_number('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "integer",= "to_number('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "long", "t= o_number('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigintege= r", "to_number('5')"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "float", "= to_number('5')");//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "double", = "to_number('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToDate() throws Exception { + helpTest(LANG_FACTORY.createLiteral("2004-06-29", String.class), "= date", "to_date('2004-06-29', 'YYYY-MM-DD')"); //$NON-NLS-1$ //$NON-NLS-2$ = //$NON-NLS-3$ + } + + public void testStringToTime() throws Exception { + helpTest(LANG_FACTORY.createLiteral("23:59:59", String.class), "ti= me", "to_date(('1970-01-01 ' || to_char('23:59:59', 'HH24:MI:SS')), 'YYYY-M= M-DD HH24:MI:SS')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToTimestamp() throws Exception { + helpTest(LANG_FACTORY.createLiteral("2004-06-29 23:59:59.987", Str= ing.class), "timestamp", "to_timestamp('2004-06-29 23:59:59.987', 'YYYY-MM-= DD HH24:MI:SS.FF')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testStringToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral("5", String.class), "bigdecima= l", "to_number('5')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + // Source =3D CHAR + = + public void testCharToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Character('5'), Character.= class), "string", "'5'"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D BOOLEAN + = + public void testBooleanToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "string", "decode(1, 0, 'false', 1, 'true')"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testBooleanToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), = "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + = + // Source =3D BYTE + = + public void testByteToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "string", "to_char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testByteToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Byte((byte)1), Byte.class)= , "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D SHORT + = + public void testShortToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "string", "to_char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testShortToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Short((short)1), Short.cla= ss), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D INTEGER + = + public void testIntegerToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "string", "to_char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "biginteger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testIntegerToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Integer(1), Integer.class)= , "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D LONG + = + public void testLongToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "str= ing", "to_char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "boo= lean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "byt= e", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "sho= rt", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "int= eger", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "flo= at", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "dou= ble", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testLongToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Long(1), Long.class), "big= decimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D BIGINTEGER + = + public void testBigIntegerToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "string", "to_char(1)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "boolean", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "byte", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "short", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "integer", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "long", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "float", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigIntegerToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigIntege= r.class), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + // Source =3D FLOAT + = + public void testFloatToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "string", "to_char(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "boolean", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "byte", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "short", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "integer", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "long", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "biginteger", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToDouble() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "double", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testFloatToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Float(1.2f), Float.class),= "bigdecimal", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D DOUBLE + = + public void testDoubleToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "string", "to_char(1.2)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "boolean", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "byte", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "short", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "integer", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "long", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "biginteger", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "float", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDoubleToBigDecimal() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new Double(1.2), Double.class)= , "bigdecimal", "1.2"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D BIGDECIMAL + = + public void testBigDecimalToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "string", "to_char(1.0)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-N= LS-3$ + } + + public void testBigDecimalToBoolean() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "boolean", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigDecimalToByte() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "byte", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigDecimalToShort() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "short", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigDecimalToInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "integer", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigDecimalToLong() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "long", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigDecimalToBigInteger() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "biginteger", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigDecimalToFloat() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "float", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + public void testBigDecimalToDoublel() throws Exception { + helpTest(LANG_FACTORY.createLiteral(new BigDecimal("1.0"), BigDeci= mal.class), "double", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + + // Source =3D DATE + + public void testDateToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "string", "to_char({d'2003-11-01'}, 'YYYY-MM-= DD')"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testDateToTimestamp() throws Exception { + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, = 10, 1), java.sql.Date.class), "timestamp", "cast({d'2003-11-01'} AS timesta= mp)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D TIME + + public void testTimeToString() throws Exception { + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "string", "to_char({ts'1970-01-01 23:59:59'},= 'HH24:MI:SS')"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testTimeToTimestamp() throws Exception { + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createTime(23, 5= 9, 59), java.sql.Time.class), "timestamp", "cast({ts'1970-01-01 23:59:59'} = AS timestamp)"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + // Source =3D TIMESTAMP + = + public void testTimestampToString() throws Exception { + Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = + helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "string"= , "to_char({ts'2003-11-01 12:05:02.0'}, 'YYYY-MM-DD HH24:MI:SS.FF')"); //$N= ON-NLS-1$ //$NON-NLS-2$ + } + + public void testTimestampToDate() throws Exception { + Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = + helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "date", = "trunc({ts'2003-11-01 12:05:02.0'})"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testTimestampToTime() throws Exception { + Timestamp ts =3D TimestampUtil.createTimestamp(103, 10, 1, 12, 5, = 2, 0); = + helpTest(LANG_FACTORY.createLiteral(ts, Timestamp.class), "time", = "to_date(('1970-01-01 ' || to_char({ts'2003-11-01 12:05:02.0'}, 'HH24:MI:SS= ')), 'YYYY-MM-DD HH24:MI:SS')"); //$NON-NLS-1$ //$NON-NLS-2$ + } = + +} Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/oracle/TestOracleTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestOracleTranslator.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestOracleTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,18 +20,20 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.oracle; +package org.teiid.connector.jdbc.oracle; = import java.util.Properties; = +import org.teiid.connector.jdbc.access.AccessSQLTranslator; +import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; +import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.jdbc.translator.Translator; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.access.AccessSQLTranslator; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; -import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ICommand; = public class TestOracleTranslator extends TestCase { Deleted: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/= jdbc/oracle/TestSubstringFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/oracle/TestSubstringFunctionModifier.java 2009-02-24 14:21:49 UTC (rev= 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestSubstringFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -1,105 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.jdbc.oracle; - -import java.util.Properties; - -import junit.framework.TestCase; - -import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.translator.FunctionModifier; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; - -/** - */ -public class TestSubstringFunctionModifier extends TestCase { - - private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); - - - /** - * Constructor for TestSubstringFunctionModifier. - * @param name - */ - public TestSubstringFunctionModifier(String name) { - super(name); - } - - public IExpression helpTestMod(IExpression[] args, String expectedStr)= throws Exception { - IFunction func =3D LANG_FACTORY.createFunction("substring", //$NO= N-NLS-1$ - args, TypeFacility.RUNTIME_TYPES.STRING); - = - OracleSQLTranslator trans =3D new OracleSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); - - IExpression expr =3D ((FunctionModifier)trans.getFunctionModifiers= ().get("substring")).modify(func); //$NON-NLS-1$ - = - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = - sqlVisitor.append(expr); = - = - assertEquals(expectedStr, sqlVisitor.toString()); - = - return expr; - } - - public void testTwoArgs() throws Exception { - IExpression[] args =3D new IExpression[] { - LANG_FACTORY.createLiteral("a.b.c", String.class), //$NON-NLS-= 1$ - LANG_FACTORY.createLiteral(new Integer(1), Integer.class) = = - }; = - helpTestMod(args, "substr('a.b.c', 1)"); //$NON-NLS-1$ - } - - public void testThreeArgsWithConstant() throws Exception { - IExpression[] args =3D new IExpression[] { - LANG_FACTORY.createLiteral("a.b.c", String.class), //$NON-NLS-= 1$ - LANG_FACTORY.createLiteral(new Integer(3), Integer.class), - LANG_FACTORY.createLiteral(new Integer(1), Integer.class) = - }; = - helpTestMod(args, "substr('a.b.c', 3, 1)"); //$NON-NLS-1$ - } - - public void testThreeArgsWithElement() throws Exception { - IExpression[] args =3D new IExpression[] { - LANG_FACTORY.createLiteral("a.b.c", String.class), //$NON-NLS-= 1$ - LANG_FACTORY.createElement("e1", null, null, Integer.class), /= /$NON-NLS-1$ - LANG_FACTORY.createLiteral(new Integer(1), Integer.class) = - }; = - helpTestMod(args, "substr('a.b.c', e1, 1)"); //$NON-NLS-1$ - } - - public void testThreeArgsWithNull() throws Exception { - IExpression[] args =3D new IExpression[] { - LANG_FACTORY.createLiteral("a.b.c", String.class), //$NON-NLS-= 1$ - LANG_FACTORY.createLiteral(null, Integer.class), - LANG_FACTORY.createLiteral(new Integer(5), Integer.class) = - }; = - helpTestMod(args, "substr('a.b.c', NULL, 5)"); //$NON-NLS-1$ - } - -} Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/oracle/TestSubstringFunctionModifier.java (from rev 488, trunk/connecto= rs/connector-jdbc/src/test/java/com/metamatrix/connector/jdbc/oracle/TestSu= bstringFunctionModifier.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestSubstringFunctionModifier.java (rev 0) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestSubstringFunctionModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -0,0 +1,108 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc.oracle; + +import java.util.Arrays; +import java.util.Properties; + +import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; +import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; + +import junit.framework.TestCase; + +import com.metamatrix.cdk.CommandBuilder; +import com.metamatrix.cdk.api.EnvironmentUtility; +import com.metamatrix.connector.api.TypeFacility; +import com.metamatrix.connector.language.IExpression; +import com.metamatrix.connector.language.IFunction; +import com.metamatrix.connector.language.ILanguageFactory; + +/** + */ +public class TestSubstringFunctionModifier extends TestCase { + + private static final ILanguageFactory LANG_FACTORY =3D CommandBuilder.= getLanuageFactory(); + + + /** + * Constructor for TestSubstringFunctionModifier. + * @param name + */ + public TestSubstringFunctionModifier(String name) { + super(name); + } + + public IExpression helpTestMod(IExpression[] args, String expectedStr)= throws Exception { + IFunction func =3D LANG_FACTORY.createFunction("substring", //$NO= N-NLS-1$ + Arrays.asList(args), TypeFacility.RUNTIME_TYPES.STRING); + = + OracleSQLTranslator trans =3D new OracleSQLTranslator(); + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); + + IExpression expr =3D ((FunctionModifier)trans.getFunctionModifiers= ().get("substring")).modify(func); //$NON-NLS-1$ + = + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = + sqlVisitor.append(expr); = + = + assertEquals(expectedStr, sqlVisitor.toString()); + = + return expr; + } + + public void testTwoArgs() throws Exception { + IExpression[] args =3D new IExpression[] { + LANG_FACTORY.createLiteral("a.b.c", String.class), //$NON-NLS-= 1$ + LANG_FACTORY.createLiteral(new Integer(1), Integer.class) = = + }; = + helpTestMod(args, "substr('a.b.c', 1)"); //$NON-NLS-1$ + } + + public void testThreeArgsWithConstant() throws Exception { + IExpression[] args =3D new IExpression[] { + LANG_FACTORY.createLiteral("a.b.c", String.class), //$NON-NLS-= 1$ + LANG_FACTORY.createLiteral(new Integer(3), Integer.class), + LANG_FACTORY.createLiteral(new Integer(1), Integer.class) = + }; = + helpTestMod(args, "substr('a.b.c', 3, 1)"); //$NON-NLS-1$ + } + + public void testThreeArgsWithElement() throws Exception { + IExpression[] args =3D new IExpression[] { + LANG_FACTORY.createLiteral("a.b.c", String.class), //$NON-NLS-= 1$ + LANG_FACTORY.createElement("e1", null, null, Integer.class), /= /$NON-NLS-1$ + LANG_FACTORY.createLiteral(new Integer(1), Integer.class) = + }; = + helpTestMod(args, "substr('a.b.c', e1, 1)"); //$NON-NLS-1$ + } + + public void testThreeArgsWithNull() throws Exception { + IExpression[] args =3D new IExpression[] { + LANG_FACTORY.createLiteral("a.b.c", String.class), //$NON-NLS-= 1$ + LANG_FACTORY.createLiteral(null, Integer.class), + LANG_FACTORY.createLiteral(new Integer(5), Integer.class) = + }; = + helpTestMod(args, "substr('a.b.c', NULL, 5)"); //$NON-NLS-1$ + } + +} Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/postgresql (from rev 486, trunk/connectors/connector-jdbc/src/test/java= /com/metamatrix/connector/jdbc/postgresql) Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/postgresql ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/postgresql/TestPostgreSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/postgresql/TestPostgreSQLTranslator.java 2009-02-24 14:21:49 UTC (rev = 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= postgresql/TestPostgreSQLTranslator.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,17 +20,19 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.postgresql; +package org.teiid.connector.jdbc.postgresql; = import java.util.Map; import java.util.Properties; = +import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.postgresql.PostgreSQLTranslator; +import org.teiid.connector.jdbc.translator.TranslatedCommand; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.MetadataFactory; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; import com.metamatrix.connector.language.ICommand; = /** Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/sqlserver (from rev 486, trunk/connectors/connector-jdbc/src/test/java/= com/metamatrix/connector/jdbc/sqlserver) Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/sqlserver ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/sqlserver/TestSqlServerConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sqlserver/TestSqlServerConversionVisitor.java 2009-02-24 14:21:49 UTC = (rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sqlserver/TestSqlServerConversionVisitor.java 2009-02-24 18:28:11 UTC (rev = 491) @@ -20,19 +20,21 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.sqlserver; +package org.teiid.connector.jdbc.sqlserver; = import java.util.Map; import java.util.Properties; = +import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.sqlserver.SqlServerSQLTranslator; +import org.teiid.connector.jdbc.translator.FunctionReplacementVisitor; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.jdbc.translator.TranslatedCommand; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.MetadataFactory; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; -import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; = /** @@ -84,7 +86,7 @@ SqlServerSQLTranslator trans =3D new SqlServerSQLTranslator(); trans.initialize(EnvironmentUtility.createEnvironment(props, false= )); // Convert back to SQL - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = TranslatedCommand tc =3D new TranslatedCommand(EnvironmentUtility.= createSecurityContext("user"), trans, sqlVisitor, funcVisitor); //$NON-NLS-= 1$ tc.translateCommand(obj); Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/sybase (from rev 486, trunk/connectors/connector-jdbc/src/test/java/com= /metamatrix/connector/jdbc/sybase) Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/sybase ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/sybase/TestSybaseConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestSybaseConvertModifier.java 2009-02-24 14:21:49 UTC (rev 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sybase/TestSybaseConvertModifier.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,19 +20,22 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.sybase; +package org.teiid.connector.jdbc.sybase; = import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Timestamp; import java.util.Properties; = +import org.teiid.connector.jdbc.sybase.SybaseConvertModifier; +import org.teiid.connector.jdbc.sybase.SybaseSQLTranslator; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; + import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; @@ -57,7 +60,7 @@ SybaseSQLTranslator trans =3D new SybaseSQLTranslator(); trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); = - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = sqlVisitor.append(expr); = = return sqlVisitor.toString(); = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/sybase/TestSybaseSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/sybase/TestSybaseSQLConversionVisitor.java 2009-02-24 14:21:49 UTC (re= v 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sybase/TestSybaseSQLConversionVisitor.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,18 +20,20 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.sybase; +package org.teiid.connector.jdbc.sybase; = import java.util.Properties; = +import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.sybase.SybaseSQLTranslator; +import org.teiid.connector.jdbc.translator.FunctionReplacementVisitor; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.jdbc.translator.TranslatedCommand; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.MetadataFactory; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; -import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; = /** @@ -68,7 +70,7 @@ FunctionReplacementVisitor funcVisitor =3D new FunctionReplacement= Visitor(trans.getFunctionModifiers()); = // Convert back to SQL - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); = + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = TranslatedCommand tc =3D new TranslatedCommand(EnvironmentUtility.= createSecurityContext("user"), trans, sqlVisitor, funcVisitor); try { tc.translateCommand(obj); Copied: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/j= dbc/util (from rev 486, trunk/connectors/connector-jdbc/src/test/java/com/m= etamatrix/connector/jdbc/util) Property changes on: trunk/connectors/connector-jdbc/src/test/java/org/teii= d/connector/jdbc/util ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/util/TestFunctionReplacementVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/= jdbc/util/TestFunctionReplacementVisitor.java 2009-02-24 14:21:49 UTC (rev = 486) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= util/TestFunctionReplacementVisitor.java 2009-02-24 18:28:11 UTC (rev 491) @@ -20,15 +20,17 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.jdbc.util; +package org.teiid.connector.jdbc.util; = import java.util.HashMap; import java.util.Map; = +import org.teiid.connector.jdbc.MetadataFactory; +import org.teiid.connector.jdbc.translator.DropFunctionModifier; +import org.teiid.connector.jdbc.translator.FunctionReplacementVisitor; + import junit.framework.TestCase; = -import com.metamatrix.connector.jdbc.MetadataFactory; -import com.metamatrix.connector.jdbc.translator.DropFunctionModifier; import com.metamatrix.connector.language.ICommand; = /** Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialCapabilities.java 2009-0= 2-24 16:41:35 UTC (rev 490) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialCapabilities.java 2009-0= 2-24 18:28:11 UTC (rev 491) @@ -22,9 +22,10 @@ = package com.metamatrix.connector.jdbc.oracle.spatial; = -import com.metamatrix.connector.jdbc.oracle.*; import java.util.*; = +import org.teiid.connector.jdbc.oracle.*; + public class OracleSpatialCapabilities extends OracleCapabilities { = public List getSupportedFunctions() { Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java 2009-02-2= 4 16:41:35 UTC (rev 490) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java 2009-02-2= 4 18:28:11 UTC (rev 491) @@ -28,10 +28,11 @@ */ package com.metamatrix.connector.jdbc.oracle.spatial; = +import org.teiid.connector.jdbc.JDBCConnector; + import com.metamatrix.connector.api.ConnectorCapabilities; import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.jdbc.JDBCConnector; = public class OracleSpatialConnector extends JDBCConnector { = Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java 20= 09-02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java 20= 09-02-24 18:28:11 UTC (rev 491) @@ -24,7 +24,8 @@ = import java.util.List; = -import com.metamatrix.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.jdbc.translator.BasicFunctionModifier; + import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILiteral; Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-= 02-24 16:41:35 UTC (rev 490) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-= 02-24 18:28:11 UTC (rev 491) @@ -26,11 +26,12 @@ import java.util.Iterator; import java.util.List; = +import org.teiid.connector.jdbc.translator.Translator; + import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.jdbc.translator.Translator; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ICriteria; import com.metamatrix.connector.language.IFunction; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Re= quest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.= java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.= java 2009-02-24 18:28:11 UTC (rev 491) @@ -416,7 +416,7 @@ } = if (tc !=3D null){ = - Assertion.assertTrue(tc.getTransactionType() !=3D TransactionC= ontext.TRANSACTION_REQUEST); + Assertion.assertTrue(tc.getTransactionType() !=3D TransactionC= ontext.Scope.TRANSACTION_REQUEST, "Transaction already associated with requ= est."); //$NON-NLS-1$ } = if (tc =3D=3D null || !tc.isInTransaction()) { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Re= questWorkItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestW= orkItem.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestW= orkItem.java 2009-02-24 18:28:11 UTC (rev 491) @@ -285,7 +285,7 @@ this.transactionState =3D TransactionState.END; } } - if (this.transactionState =3D=3D TransactionState.END && transactionCon= text.getTransactionType() =3D=3D TransactionContext.TRANSACTION_REQUEST) { + if (this.transactionState =3D=3D TransactionState.END && transactionCon= text.getTransactionType() =3D=3D TransactionContext.Scope.TRANSACTION_REQUE= ST) { this.transactionService.getTransactionServer().commit(transactionConte= xt); this.transactionState =3D TransactionState.DONE; } @@ -345,7 +345,7 @@ this.transactionState =3D TransactionState.END; } = = - if (this.transactionState =3D=3D TransactionState.END && transactionCont= ext.getTransactionType() =3D=3D TransactionContext.TRANSACTION_REQUEST) { + if (this.transactionState =3D=3D TransactionState.END && transactionCont= ext.getTransactionType() =3D=3D TransactionContext.Scope.TRANSACTION_REQUES= T) { this.transactionState =3D TransactionState.DONE; try { this.transactionService.getTransactionServer().rollback(transact= ionContext); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/transactio= n/TransactionContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Tran= sactionContextImpl.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Tran= sactionContextImpl.java 2009-02-24 18:28:11 UTC (rev 491) @@ -45,7 +45,7 @@ private MMXid xid; private String txnID; private Transaction transaction; - private int transactionType =3D TRANSACTION_NONE; + private Scope transactionType =3D Scope.TRANSACTION_NONE; private Set suspendedBy =3D Collections.newSetFromMap(new ConcurrentHa= shMap()); private int transactionTimeout =3D -1; private Set xaResources =3D Collections.newSetFromMap(new ConcurrentHa= shMap()); @@ -79,11 +79,11 @@ return this.txnID; } = - void setTransactionType(int transactionType) { + void setTransactionType(Scope transactionType) { this.transactionType =3D transactionType; } = - public int getTransactionType() { + public Scope getTransactionType() { return transactionType; } = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/transactio= n/TransactionServerImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Tran= sactionServerImpl.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Tran= sactionServerImpl.java 2009-02-24 18:28:11 UTC (rev 491) @@ -42,7 +42,6 @@ import com.metamatrix.common.xa.MMXid; import com.metamatrix.common.xa.XATransactionException; import com.metamatrix.connector.xa.api.TransactionContext; -import com.metamatrix.connector.xa.api.XAConnector; import com.metamatrix.core.util.Assertion; import com.metamatrix.dqp.DQPPlugin; import com.metamatrix.dqp.internal.transaction.TransactionProvider.XAConne= ctionSource; @@ -228,7 +227,7 @@ case XAResource.TMNOFLAGS: { checkXAState(threadId, xid, false, false); tc =3D transactions.getOrCreateTransactionContext(threadId= ); - if (tc.getTransactionType() !=3D TransactionContext.TRANSA= CTION_NONE) { + if (tc.getTransactionType() !=3D TransactionContext.Scope.= TRANSACTION_NONE) { throw new XATransactionException(XAException.XAER_PROT= O, DQPPlugin.Util.getString("TransactionServer.existing_transaction")); //$= NON-NLS-1$ } Transaction tx; @@ -255,14 +254,14 @@ tc.setTransaction(tx, provider.getTransactionID(tx)); tc.setTransactionTimeout(timeout); tc.setXid(xid); - tc.setTransactionType(TransactionContext.TRANSACTION_GLOBA= L); + tc.setTransactionType(TransactionContext.Scope.TRANSACTION= _GLOBAL); break; } case XAResource.TMJOIN: case XAResource.TMRESUME: { tc =3D checkXAState(threadId, xid, true, false); TransactionContextImpl threadContext =3D transactions.getO= rCreateTransactionContext(threadId); - if (threadContext.getTransactionType() !=3D TransactionCon= text.TRANSACTION_NONE) { + if (threadContext.getTransactionType() !=3D TransactionCon= text.Scope.TRANSACTION_NONE) { throw new XATransactionException(XAException.XAER_PROT= O, DQPPlugin.Util.getString("TransactionServer.existing_transaction")); //$= NON-NLS-1$ } = @@ -323,7 +322,7 @@ } if (!threadBound) { tc =3D transactions.getOrCreateTransactionContext(threadId= ); - if (tc.getTransactionType() !=3D TransactionContext.TRANSA= CTION_NONE) { + if (tc.getTransactionType() !=3D TransactionContext.Scope.= TRANSACTION_NONE) { throw new XATransactionException(XAException.XAER_PROT= O, DQPPlugin.Util.getString("TransactionServer.existing_transaction", new O= bject[] {xid, threadId})); //$NON-NLS-1$ } } @@ -350,8 +349,8 @@ = final TransactionManager tm =3D getTransactionManager(); = - if (tc.getTransactionType() !=3D TransactionContext.TRANSACTION_NO= NE) { - if (tc.getTransactionType() !=3D TransactionContext.TRANSACTIO= N_LOCAL) { + if (tc.getTransactionType() !=3D TransactionContext.Scope.TRANSACT= ION_NONE) { + if (tc.getTransactionType() !=3D TransactionContext.Scope.TRAN= SACTION_LOCAL) { throw new NotSupportedException(DQPPlugin.Util.getString("= TransactionServer.existing_transaction")); //$NON-NLS-1$ } if (!transactionExpected) { @@ -372,7 +371,7 @@ tm.begin(); Transaction tx =3D tm.suspend(); tc.setTransaction(tx, provider.getTransactionID(tx)); - tc.setTransactionType(TransactionContext.TRANSACTION_LOCAL); + tc.setTransactionType(TransactionContext.Scope.TRANSACTION_LOC= AL); return tc; } catch (InvalidTransactionException err) { throw new XATransactionException(err); @@ -446,14 +445,14 @@ TransactionContextImpl tc =3D (TransactionContextImpl)context; = try { - if (tc.getTransactionType() !=3D TransactionContext.TRANSACTIO= N_NONE) { + if (tc.getTransactionType() !=3D TransactionContext.Scope.TRAN= SACTION_NONE) { throw new XATransactionException(DQPPlugin.Util.getString(= "TransactionServer.existing_transaction")); //$NON-NLS-1$ } tm.begin(); Transaction tx =3D tm.suspend(); = tc.setTransaction(tx, provider.getTransactionID(tx)); - tc.setTransactionType(TransactionContext.TRANSACTION_REQUEST); + tc.setTransactionType(TransactionContext.Scope.TRANSACTION_REQ= UEST); return tc; } catch (NotSupportedException e) { throw new XATransactionException(e); @@ -461,13 +460,13 @@ } = public TransactionContext commit(TransactionContext context) throws XA= TransactionException, SystemException { - Assertion.assertTrue(context.getTransactionType() =3D=3D Transacti= onContext.TRANSACTION_REQUEST); + Assertion.assertTrue(context.getTransactionType() =3D=3D Transacti= onContext.Scope.TRANSACTION_REQUEST); TransactionContextImpl tc =3D (TransactionContextImpl)context; = //commit may be called multiple times by the processworker, if thi= s is a subsequent call, then the current //context will not be active TransactionContextImpl currentContext =3D transactions.getTransact= ionContext(tc.getThreadId()); - if (currentContext =3D=3D null || currentContext.getTransactionTyp= e() =3D=3D TransactionContext.TRANSACTION_NONE) { + if (currentContext =3D=3D null || currentContext.getTransactionTyp= e() =3D=3D TransactionContext.Scope.TRANSACTION_NONE) { return currentContext; } TransactionManager tm =3D getTransactionManager(); @@ -494,7 +493,7 @@ } = public TransactionContext rollback(TransactionContext context) throws = XATransactionException, SystemException { - Assertion.assertTrue(context.getTransactionType() =3D=3D Transacti= onContext.TRANSACTION_REQUEST); + Assertion.assertTrue(context.getTransactionType() =3D=3D Transacti= onContext.Scope.TRANSACTION_REQUEST); TransactionManager tm =3D getTransactionManager(); try { tm.resume(context.getTransaction()); @@ -584,11 +583,11 @@ public void cancelTransactions(String threadId, boolean requestOnly) t= hrows InvalidTransactionException, SystemException { TransactionContextImpl tc =3D transactions.getTransactionContext(t= hreadId); = - if (tc =3D=3D null || tc.getTransactionType() =3D=3D TransactionCo= ntext.TRANSACTION_NONE) { + if (tc =3D=3D null || tc.getTransactionType() =3D=3D TransactionCo= ntext.Scope.TRANSACTION_NONE) { return; } = - if (requestOnly && tc.getTransactionType() !=3D TransactionContext= .TRANSACTION_REQUEST) { + if (requestOnly && tc.getTransactionType() !=3D TransactionContext= .Scope.TRANSACTION_REQUEST) { return; } = Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/extension/TestSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-24 18:28:11 UTC (rev 491) @@ -26,17 +26,18 @@ import java.util.Map; import java.util.Properties; = +import org.teiid.connector.jdbc.JDBCPropertyNames; +import org.teiid.connector.jdbc.translator.FunctionReplacementVisitor; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.jdbc.translator.Translator; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.jdbc.JDBCPropertyNames; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; -import com.metamatrix.connector.jdbc.translator.Translator; -import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ILanguageObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; @@ -120,7 +121,7 @@ props.setProperty(JDBCPropertyNames.USE_COMMENTS_SOURCE_QUERY, Boo= lean.TRUE.toString()); Translator trans =3D new Translator(); trans.initialize(EnvironmentUtility.createEnvironment(props, false= )); - SQLConversionVisitor visitor =3D new SQLConversionVisitor(trans); + SQLConversionVisitor visitor =3D trans.getSQLConversionVisitor(); visitor.setExecutionContext(context); visitor.append(obj); return visitor.toString(); @@ -146,7 +147,7 @@ } trans.initialize(EnvironmentUtility.createEnvironment(p, false)); // Convert back to SQL - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= ); + SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = TranslatedCommand tc =3D new TranslatedCommand(new FakeExecutionCo= ntextImpl(), trans, sqlVisitor, funcVisitor); tc.translateCommand(obj); Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/oracle/TestOracleSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/orac= le/TestOracleSQLConversionVisitor.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/orac= le/TestOracleSQLConversionVisitor.java 2009-02-24 18:28:11 UTC (rev 491) @@ -25,6 +25,13 @@ import java.util.Map; import java.util.Properties; = +import org.teiid.connector.jdbc.JDBCPropertyNames; +import org.teiid.connector.jdbc.oracle.ExtractFunctionModifier; +import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; +import org.teiid.connector.jdbc.translator.FunctionReplacementVisitor; +import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.jdbc.translator.TranslatedCommand; + import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; @@ -33,10 +40,6 @@ import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.jdbc.JDBCPropertyNames; -import com.metamatrix.connector.jdbc.translator.SQLConversionVisitor; -import com.metamatrix.connector.jdbc.translator.TranslatedCommand; -import com.metamatrix.connector.jdbc.util.FunctionReplacementVisitor; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.util.UnitTestUtil; @@ -121,7 +124,7 @@ } translator.initialize(EnvironmentUtility.createEnvironment(p, fals= e)); // Convert back to SQL - SQLConversionVisitor sqlVisitor =3D new SQLConversionVisitor(trans= lator); = + SQLConversionVisitor sqlVisitor =3D translator.getSQLConversionVis= itor(); = sqlVisitor.setExecutionContext(context); TranslatedCommand tc =3D new TranslatedCommand(context, translator= , sqlVisitor, funcVisitor); tc.translateCommand(obj); Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/util/TestJDBCExecutionHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util= /TestJDBCExecutionHelper.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util= /TestJDBCExecutionHelper.java 2009-02-24 18:28:11 UTC (rev 491) @@ -28,6 +28,8 @@ import java.util.ArrayList; import java.util.List; = +import org.teiid.connector.jdbc.JDBCExecutionHelper; + import junit.framework.TestCase; = import com.metamatrix.common.types.DataTypeManager; Modified: trunk/test-integration/src/test/java/com/metamatrix/server/integr= ation/TestTPCR.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/server/integration/= TestTPCR.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/test-integration/src/test/java/com/metamatrix/server/integration/= TestTPCR.java 2009-02-24 18:28:11 UTC (rev 491) @@ -25,8 +25,9 @@ import java.util.Arrays; import java.util.List; = -import com.metamatrix.connector.jdbc.oracle.OracleCapabilities; -import com.metamatrix.connector.jdbc.sqlserver.SqlServerCapabilities; +import org.teiid.connector.jdbc.oracle.OracleCapabilities; +import org.teiid.connector.jdbc.sqlserver.SqlServerCapabilities; + import com.metamatrix.core.util.UnitTestUtil; import com.metamatrix.dqp.internal.datamgr.CapabilitiesConverter; import com.metamatrix.query.metadata.QueryMetadataInterface; Modified: trunk/test-integration/src/test/java/com/metamatrix/server/integr= ation/TestXMLTypeTranslations.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/server/integration/= TestXMLTypeTranslations.java 2009-02-24 16:41:35 UTC (rev 490) +++ trunk/test-integration/src/test/java/com/metamatrix/server/integration/= TestXMLTypeTranslations.java 2009-02-24 18:28:11 UTC (rev 491) @@ -28,7 +28,8 @@ import java.util.List; import java.util.Set; = -import com.metamatrix.connector.jdbc.oracle.OracleCapabilities; +import org.teiid.connector.jdbc.oracle.OracleCapabilities; + import com.metamatrix.core.util.UnitTestUtil; import com.metamatrix.dqp.internal.datamgr.CapabilitiesConverter; import com.metamatrix.query.metadata.QueryMetadataInterface; --===============3324125732850690397==-- From teiid-commits at lists.jboss.org Tue Feb 24 16:52:30 2009 Content-Type: multipart/mixed; boundary="===============8582561345570196312==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r492 - in trunk/engine/src: main/java/com/metamatrix/query/optimizer/relational/rules and 9 other directories. Date: Tue, 24 Feb 2009 16:52:30 -0500 Message-ID: --===============8582561345570196312== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ghelblin Date: 2009-02-24 16:52:30 -0500 (Tue, 24 Feb 2009) New Revision: 492 Modified: trunk/engine/src/main/java/com/metamatrix/query/optimizer/proc/Procedure= Planner.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/rul= es/RulePlanProcedures.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/ExecDynam= icSqlInstruction.java trunk/engine/src/main/java/com/metamatrix/query/processor/proc/Procedure= Plan.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dep= endentProcedureAccessNode.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dep= endentProcedureCriteriaProcessor.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Dep= endentProcedureExecutionNode.java trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.j= ava trunk/engine/src/main/java/com/metamatrix/query/rewriter/VariableSubstit= utionVisitor.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Delete.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Insert.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/ProcedureContai= ner.java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/StoredProcedure= .java trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Update.java trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Reference.java trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/ExpressionMa= ppingVisitor.java trunk/engine/src/main/resources/com/metamatrix/query/execution/i18n.prop= erties trunk/engine/src/test/java/com/metamatrix/query/processor/TestProcedureR= elational.java trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewrit= er.java Log: TEIID-148 - Allow runtime checking of NULL values Modified: trunk/engine/src/main/java/com/metamatrix/query/optimizer/proc/Pr= ocedurePlanner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/optimizer/proc/Procedur= ePlanner.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/optimizer/proc/Procedur= ePlanner.java 2009-02-24 21:52:30 UTC (rev 492) @@ -25,6 +25,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; +import java.util.Map; = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; @@ -54,6 +55,7 @@ import com.metamatrix.query.sql.lang.Command; import com.metamatrix.query.sql.lang.DynamicCommand; import com.metamatrix.query.sql.lang.Into; +import com.metamatrix.query.sql.lang.ProcedureContainer; import com.metamatrix.query.sql.lang.Query; import com.metamatrix.query.sql.proc.AssignmentStatement; import com.metamatrix.query.sql.proc.Block; @@ -107,6 +109,7 @@ = // get the current command on the current node of the tree Command procCommand =3D node.getCommand(); + = // set state of the planner with child nodes // to be used while planning List childNodes =3D node.getChildren(); @@ -135,6 +138,16 @@ ProcedureEnvironment env =3D new ProcedureEnvironment(); env.getProgramStack().push(programBlock); ProcedurePlan plan =3D new ProcedurePlan(env); + = + // propagate procedure parameters to the plan to allow runtime typ= e checking + ProcedureContainer container =3D (ProcedureContainer)((CreateUpdat= eProcedureCommand) procCommand).getUserCommand(); + = + if (container !=3D null) { + Map params =3D container.getProcedureParameters(); + plan.setParams(params); + plan.setMetadata(metadata); + } + = env.initialize(plan); env.setUpdateProcedure(((CreateUpdateProcedureCommand)procCommand)= .isUpdateProcedure()); env.setOutputElements(((CreateUpdateProcedureCommand)procCommand).= getProjectedSymbols()); @@ -265,9 +278,9 @@ intoGroup =3D into.getGroup(); } } - List references =3D ReferenceCollectorVisitor.getReferences(command); - ProcessorPlan commandPlan =3D ((CommandTreeNode)childNodes.get(childIn= dex.getChildIndex())).getProcessorPlan(); - childIndex.incrementChildIndex(); + List references =3D ReferenceCollectorVisitor.getReferences(command); = = + ProcessorPlan commandPlan =3D ((CommandTreeNode)childNodes.get(childIn= dex.getChildIndex())).getProcessorPlan(); = + childIndex.incrementChildIndex(); = if (command.getType() =3D=3D Command.TYPE_DYNAMIC){ instruction =3D new ExecDynamicSqlInstruction(parentProcCommand,((Dyn= amicCommand)command), references, metadata, idGenerator, capFinder ); @@ -343,7 +356,7 @@ } return instruction; } - = + = static class ChildIndexHolder{ private int childIndex; = Modified: trunk/engine/src/main/java/com/metamatrix/query/optimizer/relatio= nal/rules/RulePlanProcedures.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/ru= les/RulePlanProcedures.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/ru= les/RulePlanProcedures.java 2009-02-24 21:52:30 UTC (rev 492) @@ -32,11 +32,9 @@ import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.api.exception.query.QueryPlannerException; -import com.metamatrix.common.log.LogManager; import com.metamatrix.query.analysis.AnalysisRecord; import com.metamatrix.query.execution.QueryExecPlugin; import com.metamatrix.query.metadata.QueryMetadataInterface; -import com.metamatrix.query.metadata.SupportConstants; import com.metamatrix.query.optimizer.capabilities.CapabilitiesFinder; import com.metamatrix.query.optimizer.relational.OptimizerRule; import com.metamatrix.query.optimizer.relational.RuleStack; @@ -60,7 +58,6 @@ import com.metamatrix.query.sql.symbol.Reference; import com.metamatrix.query.sql.visitor.ReferenceCollectorVisitor; import com.metamatrix.query.util.CommandContext; -import com.metamatrix.query.util.LogConstants; = public class RulePlanProcedures implements OptimizerRule { = @@ -95,9 +92,6 @@ List conjuncts =3D new LinkedList(); HashSet coveredParams =3D new HashSet(); //List preExecNodes =3D new LinkedList(); - - // Case 6395 - maintain a list of non-nullable elements that a= re set IS NULL. = - List nonNullableElems =3D new LinkedList(); = if (!proc.isProcedureRelational()) { continue; @@ -111,13 +105,8 @@ inputSymbols.add(symbol); } = - findInputNodes(inputSymbols, critNode, conjuncts, coveredParam= s, nonNullableElems, metadata); + findInputNodes(inputSymbols, critNode, conjuncts, coveredParam= s); = - // Check for non-nullable elements that are set IS NULL. thro= ws exception if any found. - if(!nonNullableElems.isEmpty()) { - throw new QueryPlannerException(QueryExecPlugin.Util.getStrin= g("RulePlanProcedures.nonNullableParam", nonNullableElems.get(0))); //$NON-= NLS-1$ - } - = List defaults =3D new LinkedList(); = for (Iterator params =3D inputReferences.iterator(); params.ha= sNext();) { @@ -162,8 +151,7 @@ = private void findInputNodes(final HashSet inputs, PlanNode critNode, - final List conjuncts, final Set params, fin= al List nonNullableElems, - final QueryMetadataInterface metadata) thro= ws QueryMetadataException, MetaMatrixComponentException { + final List conjuncts, final Set params) { = while (critNode.getType() =3D=3D NodeConstants.Types.SELECT) { final PlanNode currentNode =3D critNode; @@ -201,24 +189,10 @@ setAbort(true); } = - // method to add invalid isNull element - private void addInvalidElem(ElementSymbol symbol) { - nonNullableElems.add(symbol); - } - = - public void visit(IsNullCriteria isNull) { + public void visit(IsNullCriteria isNull){ if (isNull.isNegated()) { return; } - // Case 6395 - check for non-nullable Elems that are I= S NULL - Expression expr =3D isNull.getExpression(); - if(expr instanceof Reference) { - expr =3D ((Reference)expr).getExpression(); - } - if(expr instanceof ElementSymbol &&!isNullable((ElementSymbol)expr,me= tadata)) { - addInvalidElem((ElementSymbol)expr); - } - = if (checkForInput(isNull.getExpression())) { addInputNode((Reference)isNull.getExpression()); } @@ -262,24 +236,13 @@ } return false; } - - boolean isNullable(ElementSymbol element, QueryMetadataInt= erface metadata) { = - Object elemID =3D element.getMetadataID(); - try { - return metadata.elementSupports(elemID, SupportConsta= nts.Element.NULL) || = - metadata.elementSupports(elemID, SupportConstants= .Element.NULL_UNKNOWN); - } catch (Exception e){ - LogManager.logWarning(LogConstants.CTX_QUERY_PLANN= ER, e , "Error getting isNullable on element: "+element.getShortName()); //= $NON-NLS-1$ - return false; - } - } = }; = PreOrderNavigator.doVisit(crit, visitor); } } - + = /** = * @see java.lang.Object#toString() */ Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/proc/Ex= ecDynamicSqlInstruction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/processor/proc/ExecDyna= micSqlInstruction.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/proc/ExecDyna= micSqlInstruction.java 2009-02-24 21:52:30 UTC (rev 492) @@ -43,6 +43,7 @@ import com.metamatrix.query.eval.Evaluator; import com.metamatrix.query.execution.QueryExecPlugin; import com.metamatrix.query.metadata.QueryMetadataInterface; +import com.metamatrix.query.metadata.TempMetadataAdapter; import com.metamatrix.query.metadata.TempMetadataStore; import com.metamatrix.query.optimizer.QueryOptimizer; import com.metamatrix.query.optimizer.capabilities.CapabilitiesFinder; @@ -66,6 +67,7 @@ import com.metamatrix.query.sql.lang.Select; import com.metamatrix.query.sql.lang.SetClause; import com.metamatrix.query.sql.lang.SubqueryFromClause; +import com.metamatrix.query.sql.lang.UnaryFromClause; import com.metamatrix.query.sql.proc.CreateUpdateProcedureCommand; import com.metamatrix.query.sql.symbol.AliasSymbol; import com.metamatrix.query.sql.symbol.Constant; @@ -212,7 +214,7 @@ = // validation visitor? = - VariableSubstitutionVisitor.substituteVariables(command, comma= nd.getVariableValues(), command.getType(), false); + VariableSubstitutionVisitor.substituteVariables(command, comma= nd.getVariableValues(), command.getType()); = QueryRewriter.rewrite(command, parentProcCommand, metadata, procEnv.getContext()); @@ -334,14 +336,30 @@ Query query =3D new Query(); query.setSelect(select); From from =3D new From(); - SubqueryFromClause sqfc =3D new SubqueryFromClause(subquery_group_name, - command); - from.addClause(sqfc); - query.setFrom(from); + = + GroupSymbol inlineGroup =3D new GroupSymbol(subquery_group_name); + = + from.addClause(new UnaryFromClause(inlineGroup)); = + TempMetadataStore store =3D new TempMetadataStore(); + TempMetadataAdapter tma =3D new TempMetadataAdapter(metadata, stor= e); + = + store.addTempGroup(inlineGroup.getName(), command.getProjectedSymb= ols()); + inlineGroup.setMetadataID(store.getTempGroupID(inlineGroup.getName= ())); + query.setFrom(from); = + QueryResolver.resolveCommand(query, tma); + query.setOption(command.getOption()); + = + from.getClauses().clear(); + SubqueryFromClause sqfc =3D new SubqueryFromClause(inlineGroup.get= Name()); + sqfc.setCommand(command); + sqfc.getGroupSymbol().setMetadataID(inlineGroup.getMetadataID()); + from.addClause(sqfc); + //copy the metadata onto the new query so that temp metadata adapt= ers will be used in later calls + query.getTemporaryMetadata().putAll(store.getData()); = + if (dynamicCommand.getIntoGroup() !=3D null) { query.setInto(new Into(dynamicCommand.getIntoGroup())); } - QueryResolver.resolveCommand(query, metadata); return query; } = Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/proc/Pr= ocedurePlan.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/processor/proc/Procedur= ePlan.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/proc/Procedur= ePlan.java 2009-02-24 21:52:30 UTC (rev 492) @@ -25,11 +25,13 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Iterator; import java.util.List; import java.util.Map; = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.MetaMatrixProcessingException; +import com.metamatrix.api.exception.query.QueryValidatorException; import com.metamatrix.common.buffer.BlockedException; import com.metamatrix.common.buffer.BufferManager; import com.metamatrix.common.buffer.TupleBatch; @@ -39,9 +41,11 @@ import com.metamatrix.common.buffer.BufferManager.TupleSourceType; import com.metamatrix.common.log.LogManager; import com.metamatrix.core.MetaMatrixCoreException; -import com.metamatrix.core.log.MessageLevel; import com.metamatrix.core.util.Assertion; +import com.metamatrix.query.eval.Evaluator; import com.metamatrix.query.execution.QueryExecPlugin; +import com.metamatrix.query.metadata.QueryMetadataInterface; +import com.metamatrix.query.metadata.SupportConstants; import com.metamatrix.query.processor.BaseProcessorPlan; import com.metamatrix.query.processor.DescribableUtil; import com.metamatrix.query.processor.ProcessorDataManager; @@ -51,6 +55,9 @@ import com.metamatrix.query.processor.program.Program; import com.metamatrix.query.processor.program.ProgramInstruction; import com.metamatrix.query.processor.program.ProgramUtil; +import com.metamatrix.query.sql.symbol.ElementSymbol; +import com.metamatrix.query.sql.symbol.Expression; +import com.metamatrix.query.sql.util.VariableContext; import com.metamatrix.query.tempdata.TempTableStore; import com.metamatrix.query.tempdata.TempTableStoreImpl; import com.metamatrix.query.util.CommandContext; @@ -79,7 +86,9 @@ private TupleSource finalTupleSource; private int beginBatch =3D 1; private List batchRows; - private boolean lastBatch =3D false; = + private boolean lastBatch =3D false; + private Map params; + private QueryMetadataInterface metadata; = /** * Constructor for ProcedurePlan. @@ -187,8 +196,8 @@ return env.getOutputElements(); } = - public void open() - throws MetaMatrixComponentException { + public void open() throws MetaMatrixProcessingException, MetaMatrixCom= ponentException { + evaluateParams(); } = /** @@ -336,7 +345,11 @@ clonedEnv.getProgramStack().push(originalProgram.clone()); clonedEnv.setUpdateProcedure(this.env.isUpdateProcedure()); clonedEnv.setOutputElements(this.env.getOutputElements()); - return new ProcedurePlan(clonedEnv); + ProcedurePlan plan =3D new ProcedurePlan(clonedEnv); + plan.setParams(params); + plan.setMetadata(metadata); + + return plan; } = protected void addBatchRow(List row) { @@ -388,4 +401,35 @@ public Collection getChildPlans() { return this.originalProgram.getChildPlans(); } + = + public void setMetadata( QueryMetadataInterface metadata ) { + this.metadata =3D metadata; + } + + public void setParams( Map params ) { + this.params =3D params; + } + = + public void evaluateParams() throws BlockedException, MetaMatrixCompon= entException, MetaMatrixProcessingException { + = + if ( params =3D=3D null ) { + return; + } + = + for (Iterator iter =3D params.entrySet().iterator(); iter.hasNext(= );) { + Map.Entry entry =3D (Map.Entry)iter.next(); + ElementSymbol param =3D (ElementSymbol)entry.getKey(); + Expression expr =3D (Expression)entry.getValue(); + = + VariableContext context =3D env.getCurrentVariableContext(); + Object value =3D new Evaluator(null, null, getContext()).evalu= ate(expr, null); + + //check constraint + if (value =3D=3D null && !metadata.elementSupports(param.getMe= tadataID(), SupportConstants.Element.NULL)) { + throw new QueryValidatorException(QueryExecPlugin.Util.get= String("ProcedurePlan.nonNullableParam", expr)); //$NON-NLS-1$ + } + context.setValue(param, value); + } = + + } } Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relatio= nal/DependentProcedureAccessNode.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/processor/relational/De= pendentProcedureAccessNode.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/relational/De= pendentProcedureAccessNode.java 2009-02-24 21:52:30 UTC (rev 492) @@ -28,6 +28,7 @@ = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.MetaMatrixProcessingException; +import com.metamatrix.query.eval.Evaluator; import com.metamatrix.query.sql.lang.Command; import com.metamatrix.query.sql.lang.Criteria; = @@ -93,7 +94,7 @@ protected boolean prepareNextCommand(Command atomicCommand) throws Met= aMatrixComponentException, MetaMatrixProcessingException { = if (this.criteriaProcessor =3D=3D null) { - this.criteriaProcessor =3D new DependentProcedureCriteriaProce= ssor(this, (Criteria)inputCriteria.clone(), inputReferences, inputDefaults); + this.criteriaProcessor =3D new DependentProcedureCriteriaProce= ssor(this, (Criteria)inputCriteria.clone(), inputReferences, inputDefaults,= new Evaluator(null, null, getContext())); } = return criteriaProcessor.prepareNextCommand(); Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relatio= nal/DependentProcedureCriteriaProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/processor/relational/De= pendentProcedureCriteriaProcessor.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/relational/De= pendentProcedureCriteriaProcessor.java 2009-02-24 21:52:30 UTC (rev 492) @@ -44,13 +44,15 @@ private List inputReferences; private List inputDefaults; private Criteria critInProgress; + private Evaluator eval; = public DependentProcedureCriteriaProcessor(RelationalNode dependentNod= e, Criteria dependentCriteria, List references, - List defaults) { + List defaults, + Evaluator eval) { super(1, dependentNode, dependentCriteria); - = + this.eval =3D eval; this.inputDefaults =3D defaults; this.inputReferences =3D references; } @@ -106,7 +108,7 @@ } = if (value instanceof Expression) { - value =3D Evaluator.evaluate((Expression)value); + value =3D eval.evaluate((Expression)value, null); } = if (value =3D=3D null && !nullAllowed) { Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relatio= nal/DependentProcedureExecutionNode.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/processor/relational/De= pendentProcedureExecutionNode.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/relational/De= pendentProcedureExecutionNode.java 2009-02-24 21:52:30 UTC (rev 492) @@ -30,6 +30,7 @@ import com.metamatrix.api.exception.MetaMatrixProcessingException; import com.metamatrix.common.buffer.BlockedException; import com.metamatrix.common.buffer.TupleSourceNotFoundException; +import com.metamatrix.query.eval.Evaluator; import com.metamatrix.query.sql.lang.Criteria; = public class DependentProcedureExecutionNode extends PlanExecutionNode { @@ -96,7 +97,7 @@ MetaMatrixComponentException, Me= taMatrixProcessingException { = if (this.criteriaProcessor =3D=3D null) { - this.criteriaProcessor =3D new DependentProcedureCriteriaProce= ssor(this, (Criteria)inputCriteria.clone(), inputReferences, inputDefaults); + this.criteriaProcessor =3D new DependentProcedureCriteriaProce= ssor(this, (Criteria)inputCriteria.clone(), inputReferences, inputDefaults,= new Evaluator(null, null, getContext())); } = return criteriaProcessor.prepareNextCommand(); Modified: trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRew= riter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.= java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.= java 2009-02-24 21:52:30 UTC (rev 492) @@ -48,8 +48,10 @@ import com.metamatrix.api.exception.query.FunctionExecutionException; import com.metamatrix.api.exception.query.InvalidFunctionException; import com.metamatrix.api.exception.query.QueryMetadataException; +import com.metamatrix.api.exception.query.QueryProcessingException; import com.metamatrix.api.exception.query.QueryResolverException; import com.metamatrix.api.exception.query.QueryValidatorException; +import com.metamatrix.common.buffer.BlockedException; import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.common.types.Transform; import com.metamatrix.common.util.TimestampWithTimezone; @@ -62,6 +64,7 @@ import com.metamatrix.query.function.FunctionLibrary; import com.metamatrix.query.function.FunctionLibraryManager; import com.metamatrix.query.metadata.QueryMetadataInterface; +import com.metamatrix.query.metadata.SupportConstants; import com.metamatrix.query.metadata.TempMetadataAdapter; import com.metamatrix.query.metadata.TempMetadataID; import com.metamatrix.query.metadata.TempMetadataStore; @@ -188,8 +191,6 @@ */ private static Command rewriteCommand(Command command, Command procComman= d, final QueryMetadataInterface metadata, final CommandContext context) thr= ows QueryValidatorException { = - boolean referencesRequired =3D false; - = //TODO: this should be merged with the normal functioning of the r= ewriter CorrelatedVariableSubstitutionVisitor.substituteVariables(command); = @@ -234,11 +235,9 @@ if (command instanceof ProcedureContainer) { = try { - Map variables =3D QueryResolver.getVariableValues(com= mand, metadata); - //if we know at this point that the procedure wrap= per can be removed, then references will be forwarded in the call below - boolean forwardReferences =3D canRemoveProceduralW= rapper((ProcedureContainer)command); - = - referencesRequired |=3D VariableSubstitutionVisito= r.substituteVariables(subCommand, variables, command.getType(), forwardRefe= rences); + Map variables =3D QueryResolver.getVariableValues(com= mand, metadata); = + VariableSubstitutionVisitor.substituteVariables(su= bCommand, variables, command.getType()); + } catch (QueryMetadataException err) { throw new QueryValidatorException(err, err.getMess= age()); } catch (QueryResolverException err) { @@ -253,24 +252,7 @@ } } = - //there's a chance that rewriting caused the procedure to simplify= , which means that we should check again if the wrapper can be removed - //TODO: handle empty procedure blocks - if (!referencesRequired && (command instanceof ProcedureContainer)= && canRemoveProceduralWrapper((ProcedureContainer)command)) { - ProcedureContainer container =3D (ProcedureContainer)command; - Block block =3D ((CreateUpdateProcedureCommand)container.getSu= bCommand()).getBlock(); - Command subCommand =3D ((CommandStatement)(block.getStatements= ().get(0))).getCommand(); - = - if ( subCommand.getOption() =3D=3D null ) { - subCommand.setOption( command.getOption() ); = = - } else { - Option merged =3D mergeOptions( command.getOption(), subCo= mmand.getOption() ); - subCommand.setOption(merged); - } - = - return subCommand; - } - = - return command; + return removeProceduralWrapper(command, metadata); } = private static Option mergeOptions( Option sourceOption, Option target= Option ) { @@ -291,38 +273,70 @@ } = = - private static boolean canRemoveProceduralWrapper(ProcedureContainer c= ontainer) throws QueryValidatorException { + private static Command removeProceduralWrapper(Command command, QueryM= etadataInterface metadata) throws QueryValidatorException { = - if (container instanceof StoredProcedure && ((StoredProcedure)cont= ainer).isProcedureRelational()) { - return false; + if (!(command instanceof StoredProcedure)) { + return command; } = + StoredProcedure container =3D (StoredProcedure)command; + if (container.isProcedureRelational()) { + return command; + } + = if (!(container.getSubCommand() instanceof CreateUpdateProcedureCo= mmand)) { - return false; + return command; } = CreateUpdateProcedureCommand subCommand =3D (CreateUpdateProcedure= Command)container.getSubCommand(); = if (subCommand =3D=3D null) { - return false; + return command; } + = + //if all parameters can be evaluated, we need to validate their va= lues before removing the procedure wrapper + for (Iterator iter =3D container.getInputParameters().iterator(); = iter.hasNext();) { + SPParameter param =3D (SPParameter)iter.next(); + Expression expr =3D param.getExpression(); + if (!EvaluateExpressionVisitor.isFullyEvaluatable(expr, true))= { + return command; + } + try { + Object value =3D Evaluator.evaluate(expr); + + //check contraint + if (value =3D=3D null && !metadata.elementSupports(param.g= etMetadataID(), SupportConstants.Element.NULL)) { + throw new QueryValidatorException(QueryExecPlugin.Util= .getString("ProcedurePlan.nonNullableParam", expr)); //$NON-NLS-1$ + } + } catch (ExpressionEvaluationException err) { + } catch (BlockedException err) { + } catch (MetaMatrixComponentException err) { = + } + } = + = Block block =3D subCommand.getBlock(); = if (block.getStatements().size() !=3D 1) { - return false; + return command; } Statement statement =3D (Statement)block.getStatements().get(0); if (statement.getType() !=3D Statement.TYPE_COMMAND) { - return false; + return command; } = - Command command =3D (((CommandStatement)statement).getCommand()); + Command child =3D (((CommandStatement)statement).getCommand()); = - if (command !=3D null && command.getType() !=3D Command.TYPE_DYNAM= IC) { - return true; + if (child !=3D null && child.getType() !=3D Command.TYPE_DYNAMIC) { + if ( child.getOption() =3D=3D null ) { + child.setOption( command.getOption() ); = + } else { + Option merged =3D mergeOptions( command.getOption(), child= .getOption() ); + child.setOption(merged); + } + = + return child; = } - = - return false; + return command; } = private static Command rewriteUpdateProcedure(CreateUpdateProcedureComman= d procCommand, QueryMetadataInterface metadata, CommandContext context) Modified: trunk/engine/src/main/java/com/metamatrix/query/rewriter/Variable= SubstitutionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/rewriter/VariableSubsti= tutionVisitor.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/rewriter/VariableSubsti= tutionVisitor.java 2009-02-24 21:52:30 UTC (rev 492) @@ -74,8 +74,6 @@ // substitution private Collection invalidInput; private int commandType; - private boolean forwardReferences; - private boolean referenceRequired; = private QueryResolverException conversionException =3D null; = @@ -83,10 +81,9 @@ * Construct a new visitor with the list of references. * @param references A list of references on to be collected */ - public VariableSubstitutionVisitor(Map variableValues, int commandType, b= oolean forwardReferences) { + public VariableSubstitutionVisitor(Map variableValues, int commandType) { super(variableValues); this.commandType =3D commandType; - this.forwardReferences =3D forwardReferences; } = // ############### Visitor methods for language objects ################## @@ -196,21 +193,16 @@ Expression value =3D (Expression)this.getVariableValues().= get(symbol.getCanonicalName()); = if (value !=3D null) { - expr =3D value; - //don't forward references, instead wrap in a new refe= rence - //that will prevent setting the reference value by any= other scope than the what - //created the reference - if (!forwardReferences && !ReferenceCollectorVisitor.g= etReferences(expr).isEmpty()) { - expr =3D new Reference(0, value); - referenceRequired =3D true; + //don't forward references + if (!ReferenceCollectorVisitor.getReferences(value).is= Empty()) { + return expr; } + expr =3D value; } else if (grpName.equals(ProcedureReservedWords.INPUT)) { expr =3D new Constant(null, symbol.getType()); } else if (grpName.equals(ProcedureReservedWords.CHANGING)= ) { Assertion.failed("Changing value should not be null");= //$NON-NLS-1$ - } else if (grpName.equals(ProcedureReservedWords.VARIABLES= ) || !GroupSymbol.isTempGroupName(grpName)) { - expr =3D new Reference(0, symbol); - } + } = } } = @@ -234,14 +226,14 @@ * @throws QueryValidatorException = * @throws QueryValidatorException */ - public static final boolean substituteVariables( + public static final void substituteVariables( LanguageObject obj, Map variableValues, - int commandType, boolean forwardReferences) throws QueryValidatorE= xception { + int commandType) throws QueryValidatorException { VariableSubstitutionVisitor visitor =3D - new VariableSubstitutionVisitor(variableValues, commandType, forwardRef= erences); + new VariableSubstitutionVisitor(variableValues, commandType); if (obj =3D=3D null) { - return false; + return; } = DeepPreOrderNavigator.doVisit(obj, visitor); @@ -252,7 +244,6 @@ if (visitor.conversionException !=3D null) { throw new QueryValidatorException(visitor.conversionException,= visitor.conversionException.getMessage()); } - = - return visitor.referenceRequired; - } + } + = } Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Delete.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Delete.java 20= 09-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Delete.java 20= 09-02-24 21:52:30 UTC (rev 492) @@ -22,7 +22,9 @@ = package com.metamatrix.query.sql.lang; = +import java.util.Collections; import java.util.List; +import java.util.Map; = import com.metamatrix.core.util.EquivalenceUtil; import com.metamatrix.core.util.HashCodeUtil; @@ -159,6 +161,14 @@ return EquivalenceUtil.areEqual(getGroup(), other.getGroup()) && EquivalenceUtil.areEqual(getCriteria(), other.getCriteria()= ); } + = + /** = + * @see com.metamatrix.query.sql.lang.ProcedureContainer#getParameters= () + * @since 5.0 + */ + public Map getProcedureParameters() { + return Collections.EMPTY_MAP; + } = /** * Return a copy of this Delete. Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Insert.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Insert.java 20= 09-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Insert.java 20= 09-02-24 21:52:30 UTC (rev 492) @@ -23,16 +23,20 @@ package com.metamatrix.query.sql.lang; = import java.util.Collection; +import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import java.util.Map; = import com.metamatrix.core.util.EquivalenceUtil; import com.metamatrix.core.util.HashCodeUtil; import com.metamatrix.query.sql.LanguageVisitor; +import com.metamatrix.query.sql.ProcedureReservedWords; import com.metamatrix.query.sql.symbol.ElementSymbol; import com.metamatrix.query.sql.symbol.Expression; import com.metamatrix.query.sql.symbol.GroupSymbol; +import com.metamatrix.query.sql.symbol.SingleElementSymbol; = /** * Represents a SQL Insert statement of the form: @@ -210,6 +214,23 @@ EquivalenceUtil.areEqual(getVariables(), other.getVariables= ()) && EquivalenceUtil.areEqual(getQueryExpression(), other.getQue= ryExpression()); } + = + /** = + * @see com.metamatrix.query.sql.lang.ProcedureContainer#getParameters= () + * @since 5.0 + */ + public Map getProcedureParameters() { + = + int iSize =3D getVariables().size(); + HashMap map =3D new HashMap(); + = + for (int j =3D 0; j < iSize; j++) { + ElementSymbol symbol =3D (ElementSymbol)((ElementSymbol)variab= les.get( j )).clone(); + symbol.setName(ProcedureReservedWords.INPUT + SingleElementSym= bol.SEPARATOR + symbol.getShortCanonicalName()); + map.put(symbol, values.get( j ) ); + } // for = + return map; + } = /** * Return a deep copy of this Insert. Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Procedur= eContainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/sql/lang/ProcedureConta= iner.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/sql/lang/ProcedureConta= iner.java 2009-02-24 21:52:30 UTC (rev 492) @@ -24,6 +24,7 @@ = import java.util.ArrayList; import java.util.List; +import java.util.Map; = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; @@ -128,5 +129,6 @@ } this.updateCount =3D updateCount; } - = + = + public abstract Map getProcedureParameters(); } Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/lang/StoredPr= ocedure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/sql/lang/StoredProcedur= e.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/sql/lang/StoredProcedur= e.java 2009-02-24 21:52:30 UTC (rev 492) @@ -414,6 +414,22 @@ public void setCallableStatement(boolean isCallableStatement) { this.isCallableStatement =3D isCallableStatement; } + = + /** = + * @see com.metamatrix.query.sql.lang.ProcedureContainer#getProcedurePara= meters() + * @since 5.0 + */ + public Map getProcedureParameters() { + = + HashMap map =3D new HashMap(); + for (Iterator iter =3D this.getInputParameters().iterator(); iter.has= Next();) { + = + SPParameter element =3D (SPParameter)iter.next(); + map.put(element.getParameterSymbol(), element.getExpression()); = = + } // for + = + return map; + } = } = = Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Update.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Update.java 20= 09-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/sql/lang/Update.java 20= 09-02-24 21:52:30 UTC (rev 492) @@ -22,14 +22,19 @@ = package com.metamatrix.query.sql.lang; = +import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Map; = import com.metamatrix.core.util.EquivalenceUtil; import com.metamatrix.core.util.HashCodeUtil; import com.metamatrix.query.sql.LanguageVisitor; +import com.metamatrix.query.sql.ProcedureReservedWords; import com.metamatrix.query.sql.symbol.ElementSymbol; import com.metamatrix.query.sql.symbol.Expression; import com.metamatrix.query.sql.symbol.GroupSymbol; +import com.metamatrix.query.sql.symbol.SingleElementSymbol; import com.metamatrix.query.sql.visitor.SQLStringVisitor; = /** @@ -250,6 +255,25 @@ return false; } = + /** = + * @see com.metamatrix.query.sql.lang.ProcedureContainer#getProcedureP= arameters() + * @since 5.0 + */ + public Map getProcedureParameters() { + = + HashMap map =3D new HashMap(); + = + for (Iterator iter =3D getChangeList().getClauses().iterator(); it= er.hasNext();) { + SetClause setClause =3D (SetClause)iter.next(); + ElementSymbol symbol =3D (ElementSymbol)(setClause.getSymbol()= ).clone(); + symbol.setName(ProcedureReservedWords.INPUT + SingleElementSym= bol.SEPARATOR + symbol.getShortCanonicalName()); + map.put( symbol, setClause.getValue() ); + = + } // for + = + return map; + } + = } = = Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Refere= nce.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Reference.ja= va 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/sql/symbol/Reference.ja= va 2009-02-24 21:52:30 UTC (rev 492) @@ -23,6 +23,7 @@ package com.metamatrix.query.sql.symbol; = import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -109,6 +110,10 @@ } = public Object getValue(LookupEvaluator dataMgr, CommandContext context= ) throws ExpressionEvaluationException, MetaMatrixComponentException { + if ( elements =3D=3D null ) { + elements =3D Collections.EMPTY_MAP; + } + = return new Evaluator(elements, dataMgr, context).evaluate(expressi= on, tuple); } = Modified: trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/Expre= ssionMappingVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/ExpressionM= appingVisitor.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/java/com/metamatrix/query/sql/visitor/ExpressionM= appingVisitor.java 2009-02-24 21:52:30 UTC (rev 492) @@ -278,26 +278,7 @@ } obj.setRowLimit(replaceExpression(obj.getRowLimit())); } - = - public void visit(Insert obj) { = - // iterate over the list containing virtual elements/constants - Iterator valuesIter =3D obj.getValues().iterator(); - = - // create a new list containing physical elements and constants - List valuesList =3D new ArrayList(obj.getValues().size()); - while(valuesIter.hasNext()) { - Expression exp =3D (Expression) valuesIter.next(); - valuesList.add( replaceExpression(exp) ); - } = - obj.setValues(valuesList); - } = - = - public void visit(AssignmentStatement obj) { - if (obj.hasExpression()) { - obj.setExpression(replaceExpression(obj.getExpression())); - } - } - = + = public void visit(DynamicCommand obj) { obj.setSql(replaceExpression(obj.getSql())); if (obj.getUsing() !=3D null) { @@ -342,5 +323,25 @@ protected Map getVariableValues() { return symbolMap; } = - + = + /** = + * @see com.metamatrix.query.sql.LanguageVisitor#visit(com.metamatrix.= query.sql.proc.AssignmentStatement) + * @since 5.0 + */ + public void visit(AssignmentStatement obj) { + if (obj.hasExpression()) { + obj.setExpression(replaceExpression(obj.getExpression())); + } + } + = + /** = + * @see com.metamatrix.query.sql.LanguageVisitor#visit(com.metamatrix.= query.sql.lang.Insert) + * @since 5.0 + */ + public void visit(Insert obj) { + for (int i =3D 0; i < obj.getValues().size(); i++) { + obj.getValues().set(i, replaceExpression((Expression)obj.getVa= lues().get(i))); + } + } + = } Modified: trunk/engine/src/main/resources/com/metamatrix/query/execution/i1= 8n.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/resources/com/metamatrix/query/execution/i18n.pro= perties 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/main/resources/com/metamatrix/query/execution/i18n.pro= perties 2009-02-24 21:52:30 UTC (rev 492) @@ -195,8 +195,8 @@ tuple_not_found=3DTuple source results for the mapping class {0} are not f= ound; unmapped_reference=3DReference value for {0} is not supplied; can not cont= inue. RulePlanProcedures.no_values=3DNo valid criteria specified for procedure p= arameter {0} -RulePlanProcedures.nonNullableParam=3DThe procedure parameter is not nulla= ble, but is set to null: {0} - +ProcedurePlan.nonNullableParam=3DThe procedure parameter is not nullable, = but is set to null: {0} + = BufferManagerImpl.no_memory_available=3DNo memory available BufferManagerImpl.tuple_source_not_found=3DTuple source does not exist: {0} FileStoreageManager.file_exists=3DUnable to create {0} as it already exists Modified: trunk/engine/src/test/java/com/metamatrix/query/processor/TestPro= cedureRelational.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/processor/TestProcedure= Relational.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/test/java/com/metamatrix/query/processor/TestProcedure= Relational.java 2009-02-24 21:52:30 UTC (rev 492) @@ -27,6 +27,7 @@ = import junit.framework.TestCase; = +import com.metamatrix.api.exception.query.QueryValidatorException; import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.dqp.message.ParameterInfo; import com.metamatrix.query.mapping.relational.QueryNode; @@ -523,7 +524,24 @@ TestProcedureProcessor.helpTestProcess(plan, expected, new FakeDat= aManager()); = = } - = + + //virtual group with procedure in transformation + public void testCase6395ProcAsVirtualGroup9(){ + String sql =3D "SELECT P.e2 as ve3, P.e1 as ve4 FROM pm1.vsp47 as = P where param1=3D1 and param2=3D'a' OPTION DEBUG"; //$NON-NLS-1$ + + // Create expected results + List[] expected =3D new List[] { = + Arrays.asList(new Object[] { new Integer(1), "FOO" }), //$NON-= NLS-1$ = + }; = + // Construct data manager with data + FakeDataManager dataManager =3D new FakeDataManager(); + TestProcessor.sampleData1(dataManager); = + // Plan query + ProcessorPlan plan =3D TestProcessor.helpGetPlan(sql, FakeMetadata= Factory.example1Cached()); = + // Run query + TestProcessor.helpProcess(plan, dataManager, expected); = + } = + = /** * Case 6395 - This test case will now raise a QueryPlannerException.= param2 is required * and not nullable. This case is expected to fail because of 'param= 2 is null' = @@ -538,16 +556,14 @@ FakeDataManager dataManager =3D new FakeDataManager(); TestProcessor.sampleData1(dataManager); = // Plan query - ProcessorPlan plan =3D null; try { - plan =3D TestProcessor.helpGetPlan(sql, FakeMetadataFactory.examp= le1Cached()); = + ProcessorPlan plan =3D TestProcessor.helpGetPlan(sql, FakeMetadat= aFactory.example1Cached()); = // Run query - TestProcessor.helpProcess(plan, dataManager, expected); = - } catch (Exception e) { + TestProcessor.doProcess(plan, dataManager, expected, TestProce= ssor.createCommandContext()); = + fail("QueryPlannerException was expected."); //$NON-NLS-1$ + } catch (QueryValidatorException e) { assertEquals("The procedure parameter is not nullable, but is set= to null: pm1.vsp26.param2",e.getMessage()); //$NON-NLS-1$ - return; } - fail("QueryPlannerException was expected."); //$NON-NLS-1$ } = /** @@ -569,6 +585,24 @@ // Run query TestProcessor.helpProcess(plan, dataManager, expected); = } + = + /** + * Case 6395 - This will not throw an exception and the proc will not= be invoked. + */ + public void testProcAsVirtualGroup2WithNull3() throws Exception { + String sql =3D "select e1 from (SELECT * FROM pm1.vsp26 as P where= P.e1=3D'a') x where param1=3D1 and param2 =3D commandpayload()"; //$NON-NL= S-1$ + + // Create expected results + List[] expected =3D new List[] { = + }; = + // Construct data manager with data + FakeDataManager dataManager =3D new FakeDataManager(); + TestProcessor.sampleData1(dataManager); = + // Plan query + ProcessorPlan plan =3D TestProcessor.helpGetPlan(sql, FakeMetadata= Factory.example1Cached()); = + // Run query + TestProcessor.helpProcess(plan, dataManager, expected); = + } = /* * The following are tests that were removed from the validator. We a= re no longer trying to validate a priori whether = Modified: trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQuer= yRewriter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewri= ter.java 2009-02-24 18:28:11 UTC (rev 491) +++ trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewri= ter.java 2009-02-24 21:52:30 UTC (rev 492) @@ -22,54 +22,55 @@ = package com.metamatrix.query.rewriter; = -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Properties; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; import java.util.TimeZone; + +import junit.framework.TestCase; + +import com.metamatrix.api.exception.MetaMatrixComponentException; +import com.metamatrix.api.exception.MetaMatrixException; +import com.metamatrix.api.exception.query.QueryMetadataException; +import com.metamatrix.api.exception.query.QueryParserException; +import com.metamatrix.api.exception.query.QueryResolverException; +import com.metamatrix.api.exception.query.QueryValidatorException; +import com.metamatrix.common.types.DataTypeManager; +import com.metamatrix.core.MetaMatrixRuntimeException; +import com.metamatrix.dqp.message.ParameterInfo; +import com.metamatrix.query.metadata.QueryMetadataInterface; +import com.metamatrix.query.parser.QueryParser; +import com.metamatrix.query.resolver.QueryResolver; +import com.metamatrix.query.sql.lang.Command; +import com.metamatrix.query.sql.lang.CompareCriteria; +import com.metamatrix.query.sql.lang.CompoundCriteria; +import com.metamatrix.query.sql.lang.Criteria; +import com.metamatrix.query.sql.lang.MatchCriteria; +import com.metamatrix.query.sql.lang.Query; +import com.metamatrix.query.sql.lang.QueryCommand; +import com.metamatrix.query.sql.lang.SPParameter; +import com.metamatrix.query.sql.lang.SetCriteria; +import com.metamatrix.query.sql.lang.SetQuery; +import com.metamatrix.query.sql.lang.StoredProcedure; +import com.metamatrix.query.sql.lang.Update; +import com.metamatrix.query.sql.symbol.Constant; +import com.metamatrix.query.sql.symbol.ElementSymbol; +import com.metamatrix.query.sql.symbol.ExpressionSymbol; +import com.metamatrix.query.sql.symbol.Function; +import com.metamatrix.query.sql.symbol.GroupSymbol; +import com.metamatrix.query.sql.symbol.SingleElementSymbol; +import com.metamatrix.query.sql.visitor.CorrelatedReferenceCollectorVisito= r; +import com.metamatrix.query.unittest.FakeMetadataFacade; +import com.metamatrix.query.unittest.FakeMetadataFactory; +import com.metamatrix.query.unittest.FakeMetadataObject; +import com.metamatrix.query.util.CommandContext; +import com.metamatrix.query.util.ContextProperties; = -import junit.framework.TestCase; - -import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.api.exception.MetaMatrixException; -import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.api.exception.query.QueryParserException; -import com.metamatrix.api.exception.query.QueryResolverException; -import com.metamatrix.api.exception.query.QueryValidatorException; -import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.core.MetaMatrixRuntimeException; -import com.metamatrix.dqp.message.ParameterInfo; -import com.metamatrix.query.metadata.QueryMetadataInterface; -import com.metamatrix.query.parser.QueryParser; -import com.metamatrix.query.resolver.QueryResolver; -import com.metamatrix.query.sql.lang.Command; -import com.metamatrix.query.sql.lang.CompareCriteria; -import com.metamatrix.query.sql.lang.CompoundCriteria; -import com.metamatrix.query.sql.lang.Criteria; -import com.metamatrix.query.sql.lang.MatchCriteria; -import com.metamatrix.query.sql.lang.Query; -import com.metamatrix.query.sql.lang.QueryCommand; -import com.metamatrix.query.sql.lang.SPParameter; -import com.metamatrix.query.sql.lang.SetCriteria; -import com.metamatrix.query.sql.lang.SetQuery; -import com.metamatrix.query.sql.lang.StoredProcedure; -import com.metamatrix.query.sql.lang.Update; -import com.metamatrix.query.sql.symbol.Constant; -import com.metamatrix.query.sql.symbol.ElementSymbol; -import com.metamatrix.query.sql.symbol.Function; -import com.metamatrix.query.sql.symbol.GroupSymbol; -import com.metamatrix.query.sql.symbol.SingleElementSymbol; -import com.metamatrix.query.sql.visitor.CorrelatedReferenceCollectorVisito= r; -import com.metamatrix.query.unittest.FakeMetadataFacade; -import com.metamatrix.query.unittest.FakeMetadataFactory; -import com.metamatrix.query.unittest.FakeMetadataObject; -import com.metamatrix.query.util.CommandContext; -import com.metamatrix.query.util.ContextProperties; - public class TestQueryRewriter extends TestCase { = private static final String TRUE_STR =3D "1 =3D 1"; //$NON-NLS-1$ @@ -176,7 +177,7 @@ private Command helpTestRewriteCommand(String original, String expecte= d, QueryMetadataInterface metadata) throws MetaMatrixException { = Command command =3D QueryParser.getQueryParser().parseCommand(orig= inal); = QueryResolver.resolveCommand(command, metadata); - Command rewriteCommand =3D QueryRewriter.rewrite(command, null, Fa= keMetadataFactory.example1Cached(), null); + Command rewriteCommand =3D QueryRewriter.rewrite(command, null, me= tadata, null); assertEquals("Rewritten command was not expected", expected, rewri= teCommand.toString()); //$NON-NLS-1$ return rewriteCommand; } @@ -1733,6 +1734,17 @@ public void testDefect16879_7(){ helpTestRewriteCommand("SELECT decodeinteger(e1, 'a, b, null, d, e= ') FROM pm1.g1", "SELECT CASE WHEN e1 =3D 'a' THEN 'b' WHEN e1 IS NULL THEN= 'd' ELSE 'e' END FROM pm1.g1"); //$NON-NLS-1$ //$NON-NLS-2$ } + = + public void testCaseExpressionThatResolvesToNull() { + String sqlBefore =3D "SELECT CASE 'x' WHEN 'Old Inventory System' = THEN NULL WHEN 'New Inventory System' THEN NULL END"; //$NON-NLS-1$ + String sqlAfter =3D "SELECT null"; //$NON-NLS-1$ + + Command cmd =3D helpTestRewriteCommand( sqlBefore, sqlAfter ); + = + ExpressionSymbol es =3D (ExpressionSymbol)cmd.getProjectedSymbols(= ).get(0); + assertEquals( DataTypeManager.DefaultDataClasses.STRING, es.getTyp= e() ); + } + = //note that the env is now treated as deterministic, however it is rea= lly only deterministic within a session public void testRewriteExecEnv() throws Exception { @@ -2097,5 +2109,17 @@ public void testRewriteCoalesce() throws Exception { helpTestRewriteCriteria("coalesce(convert(pm1.g1.e2, double), pm1.g1.= e4) =3D 1", "ifnull(convert(pm1.g1.e2, double), pm1.g1.e4) =3D 1", true); /= /$NON-NLS-1$ //$NON-NLS-2$ } + = + public void testProcWithNull() throws Exception { + String sql =3D "exec pm1.vsp26(1, null)"; //$NON-NLS-1$ + = + try { + helpTestRewriteCommand(sql, "", FakeMetadataFactory.example1Cache= d()); + fail("expected exception"); + } catch (QueryValidatorException e) { + = + } + = + } = } --===============8582561345570196312==-- From teiid-commits at lists.jboss.org Tue Feb 24 16:55:33 2009 Content-Type: multipart/mixed; boundary="===============8854187279649801311==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r493 - trunk/engine/src/main/java/com/metamatrix/query/resolver/util. Date: Tue, 24 Feb 2009 16:55:33 -0500 Message-ID: --===============8854187279649801311== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ghelblin Date: 2009-02-24 16:55:33 -0500 (Tue, 24 Feb 2009) New Revision: 493 Modified: trunk/engine/src/main/java/com/metamatrix/query/resolver/util/ResolverUt= il.java Log: TEIID-61 - Fix for exception when CASE resoves to NULL [reviewed by Steve H] Modified: trunk/engine/src/main/java/com/metamatrix/query/resolver/util/Res= olverUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/resolver/util/ResolverU= til.java 2009-02-24 21:52:30 UTC (rev 492) +++ trunk/engine/src/main/java/com/metamatrix/query/resolver/util/ResolverU= til.java 2009-02-24 21:55:33 UTC (rev 493) @@ -51,6 +51,7 @@ import com.metamatrix.query.sql.LanguageObject; import com.metamatrix.query.sql.lang.Limit; import com.metamatrix.query.sql.lang.OrderBy; +import com.metamatrix.query.sql.symbol.AbstractCaseExpression; import com.metamatrix.query.sql.symbol.AggregateSymbol; import com.metamatrix.query.sql.symbol.AliasSymbol; import com.metamatrix.query.sql.symbol.Constant; @@ -60,6 +61,7 @@ import com.metamatrix.query.sql.symbol.Function; import com.metamatrix.query.sql.symbol.GroupSymbol; import com.metamatrix.query.sql.symbol.Reference; +import com.metamatrix.query.sql.symbol.ScalarSubquery; import com.metamatrix.query.sql.symbol.SelectSymbol; import com.metamatrix.query.sql.symbol.SingleElementSymbol; import com.metamatrix.query.util.ErrorMessageKeys; @@ -597,18 +599,33 @@ */ public static void resolveNullLiterals(List symbols) { for (int i =3D 0; i < symbols.size(); i++) { - SelectSymbol symbol =3D (SelectSymbol) symbols.get(i); + SelectSymbol selectSymbol =3D (SelectSymbol) symbols.get(i); + = + if (!(selectSymbol instanceof SingleElementSymbol)) { + continue; + } + = + SingleElementSymbol symbol =3D (SingleElementSymbol)selectSymb= ol; + = + if(!DataTypeManager.DefaultDataClasses.NULL.equals(symbol.getT= ype()) && symbol.getType() !=3D null) { + continue; + } if(symbol instanceof AliasSymbol) { symbol =3D ((AliasSymbol)symbol).getSymbol(); } - = + = Class replacement =3D DataTypeManager.DefaultDataClasses.STRIN= G; = if(symbol instanceof ExpressionSymbol && !(symbol instanceof A= ggregateSymbol)) { ExpressionSymbol exprSymbol =3D (ExpressionSymbol) symbol; Expression expr =3D exprSymbol.getExpression(); - if(expr !=3D null && expr instanceof Constant && ((Constan= t)expr).isNull()) { + = + if(expr instanceof Constant) { = exprSymbol.setExpression(new Constant(null, replacemen= t)); + } else if (expr instanceof AbstractCaseExpression) { + ((AbstractCaseExpression)expr).setType(replacement); + } else if (expr instanceof ScalarSubquery) { + ((ScalarSubquery)expr).setType(replacement); = = } else { try { ResolverUtil.setTypeIfReference(expr, replacement, symbol); --===============8854187279649801311==-- From teiid-commits at lists.jboss.org Tue Feb 24 22:49:49 2009 Content-Type: multipart/mixed; boundary="===============2188445510574597471==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r494 - in trunk: connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc and 15 other directories. Date: Tue, 24 Feb 2009 22:49:49 -0500 Message-ID: --===============2188445510574597471== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-24 22:49:48 -0500 (Tue, 24 Feb 2009) New Revision: 494 Added: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/T= estJDBCConnector.java Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/= SQLStringVisitor.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCConnector.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= erby/DerbyConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/m= ysql/MySQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/ConcatFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/OracleConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/OracleSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/PostgreSQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/ModFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/BasicFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/EscapeSyntaxModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/Translator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/d= b2/TestDB2SqlTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/d= erby/TestDerbyConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/e= xtension/impl/TestEscapeSyntaxModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java trunk/server/src/main/java/com/metamatrix/metadata/runtime/spi/jdbc/JDBC= Connector.java trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslat= ionUtility.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracl= e/TestOracleSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/Te= stSQLStringVisitor.java Log: TEIID-164 fixes from rewiring integration tests Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/util/SQLStringVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /SQLStringVisitor.java 2009-02-24 21:55:33 UTC (rev 493) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /SQLStringVisitor.java 2009-02-25 03:49:48 UTC (rev 494) @@ -437,12 +437,9 @@ buffer.append(((ILiteral)args.get(0)).getValue()); = for(int i=3D1; i 0) { @@ -277,13 +279,21 @@ Object[] args) throws Throwable { if (method.getName().equals("getConnection")) { Properties p =3D new Properties(); - if (args.length =3D=3D 2) { - p.put("user", args[0]); - p.put("password", args[1]); + String user =3D null; + String password =3D null; + if (args !=3D null && args.length =3D=3D 2) { + user =3D (String)args[0]; + password =3D (String)args[1]; } else { - p.put("user", connectionProps.getProperty(JDBCPropertyNames.USER= NAME)); - p.put("password", connectionProps.getProperty(JDBCPropertyNames.= PASSWORD)); + user =3D connectionProps.getProperty(JDBCPropertyNames.USERNAME); + password =3D connectionProps.getProperty(JDBCPropertyNames.PASSW= ORD); } + if (user !=3D null) { + p.put("user", user); + } + if (password !=3D null) { + p.put("password", password); + } return driver.connect(url, p); } = throw new UnsupportedOperationException("Driver DataSource proxy o= nly provides Connections"); Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/derby/DerbyConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbyConvertModifier.java 2009-02-24 21:55:33 UTC (rev 493) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbyConvertModifier.java 2009-02-25 03:49:48 UTC (rev 494) @@ -46,25 +46,6 @@ this.langFactory =3D langFactory; } = - /** = - * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#tran= slate(com.metamatrix.connector.language.IFunction) - * @since 5.0 - */ - public List translate(IFunction function) { - // For anything that doesn't get modified to some other function, = translate the convert(expr, type) - // to cast(expr as type). - = - List parts =3D new ArrayList(); - parts.add("cast("); //$NON-NLS-1$ - parts.add(function.getParameters().get(0)); - parts.add(" as "); //$NON-NLS-1$ - ILiteral type =3D (ILiteral) function.getParameters().get(1); = = - parts.add(type.getValue()); - parts.add(")"); //$NON-NLS-1$ - = - return parts; - } - = public IExpression modify(IFunction function) { List args =3D function.getParameters(); Class sourceType =3D args.get(0).getType(); @@ -252,11 +233,11 @@ = // BEFORE: convert(string_expr, float) // AFTER: cast(cast(string_expr as decimal) as float) - IFunction inner =3D langFactory.createFunction("convert", //$= NON-NLS-1$ + IFunction inner =3D langFactory.createFunction("cast", //$NON= -NLS-1$ Arrays.asList( expression, langFactory.createLiteral("deci= mal", TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); = - IFunction outer =3D langFactory.createFunction("convert", //$= NON-NLS-1$ + IFunction outer =3D langFactory.createFunction("cast", //$NON= -NLS-1$ Arrays.asList( inner, langFactory.createLiteral("float", T= ypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ TypeFacility.RUNTIME_TYPES.FLOAT); = @@ -267,7 +248,7 @@ = // BEFORE: convert(num_expr, float) // AFTER: cast(num_expr as float) - return langFactory.createFunction("convert", //$NON-NLS-1$ + return langFactory.createFunction("cast", //$NON-NLS-1$ Arrays.asList( expression, langFactory.createLiteral("floa= t", TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ TypeFacility.RUNTIME_TYPES.FLOAT); } @@ -281,11 +262,11 @@ if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)){ // BEFORE: convert(string_expr, double) // AFTER: cast(cast(string_expr as decimal) as double) - IFunction inner =3D langFactory.createFunction("convert", //$= NON-NLS-1$ + IFunction inner =3D langFactory.createFunction("cast", //$NON= -NLS-1$ Arrays.asList( expression, langFactory.createLiteral("deci= mal", TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); = - return langFactory.createFunction("convert", //$NON-NLS-1$ + return langFactory.createFunction("cast", //$NON-NLS-1$ Arrays.asList( inner, langFactory.createLiteral("double", = TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ TypeFacility.RUNTIME_TYPES.DOUBLE); } @@ -299,7 +280,7 @@ if(sourceType.equals(TypeFacility.RUNTIME_TYPES.STRING)){ // BEFORE: convert(string_expr, bigdecimal) // AFTER: cast(string_expr as decimal) - return langFactory.createFunction("convert", //$NON-NLS-1$ + return langFactory.createFunction("cast", //$NON-NLS-1$ Arrays.asList( expression, langFactory.createLiteral("deci= mal", TypeFacility.RUNTIME_TYPES.STRING) ), //$NON-NLS-1$ TypeFacility.RUNTIME_TYPES.BIG_DECIMAL); } Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/mysql/MySQLConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mysql/MySQLConvertModifier.java 2009-02-24 21:55:33 UTC (rev 493) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mysql/MySQLConvertModifier.java 2009-02-25 03:49:48 UTC (rev 494) @@ -29,7 +29,6 @@ import org.teiid.connector.jdbc.translator.DropFunctionModifier; = import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICriteria; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; @@ -50,10 +49,6 @@ this.langFactory =3D langFactory; } = - public List translate(IFunction function) { - return null; - } - public IExpression modify(IFunction function) { List args =3D function.getParameters(); = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/ConcatFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/ConcatFunctionModifier.java 2009-02-24 21:55:33 UTC (rev 493) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/ConcatFunctionModifier.java 2009-02-25 03:49:48 UTC (rev 494) @@ -58,7 +58,7 @@ /** = * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#modi= fy(com.metamatrix.connector.language.IFunction) */ - public IExpression modify(IFunction function) { + public IExpression modify(IFunction function) { List when =3D new ArrayList(); IExpression a =3D function.getParameters().get(0); IExpression b =3D function.getParameters().get(1); @@ -98,7 +98,7 @@ if (expr instanceof IFunction) { IFunction function =3D (IFunction)expr; if (function.getName().equalsIgnoreCase("NVL") || function.getName()= .equalsIgnoreCase(SourceSystemFunctions.IFNULL)) { //$NON-NLS-1$ - return isNotNull(function.getParameters().get(0)); + return isNotNull(function.getParameters().get(1)); } } return false; @@ -112,10 +112,4 @@ return false; } = - /** = - * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#tran= slate(com.metamatrix.connector.language.IFunction) - */ - public List translate(IFunction function) { - return null; //allow default translation - } } Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/OracleConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleConvertModifier.java 2009-02-24 21:55:33 UTC (rev 493) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleConvertModifier.java 2009-02-25 03:49:48 UTC (rev 494) @@ -45,15 +45,6 @@ this.langFactory =3D langFactory; } = - /** - * Intentionally return null, rely on the SQLStringVisitor being used = by caller - * (Oracle or Oracle8 SQLConversionVisitor (SQLConversionVisitor)) - * @see org.teiid.connector.jdbc.translator.FunctionModifier#translate= (com.metamatrix.connector.language.IFunction) - */ - public List translate(IFunction function) { - return null; - } = - = public IExpression modify(IFunction function) { List args =3D function.getParameters(); IExpression modified =3D null; Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/OracleSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleSQLTranslator.java 2009-02-24 21:55:33 UTC (rev 493) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleSQLTranslator.java 2009-02-25 03:49:48 UTC (rev 494) @@ -156,7 +156,7 @@ limitQuery.append(queryCommand); if (limit.getRowOffset() > 0) { limitQuery.append(") VIEW_FOR_LIMIT WHERE ROWNUM <=3D ").append( - limit.getRowLimit()).append(") WHERE ROWNUM_ > ").append( + limit.getRowLimit() + limit.getRowOffset()).append(") WHERE ROWNUM_ >= ").append( limit.getRowOffset()); } else { limitQuery.append(") WHERE ROWNUM <=3D ").append( Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/postgresql/PostgreSQLConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLConvertModifier.java 2009-02-24 21:55:33 UTC (rev 493) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLConvertModifier.java 2009-02-25 03:49:48 UTC (rev 494) @@ -47,10 +47,6 @@ this.langFactory =3D langFactory; } = - public List translate(IFunction function) { - return null; - } = - = public IExpression modify(IFunction function) { List args =3D function.getParameters(); = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/sybase/ModFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/ModFunctionModifier.java 2009-02-24 21:55:33 UTC (rev 493) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/ModFunctionModifier.java 2009-02-25 03:49:48 UTC (rev 494) @@ -61,9 +61,4 @@ return langFactory.createFunction("-", minusArgs, minusArgs.get(0).getTy= pe()); //$NON-NLS-1$ } = - @Override - public List translate(IFunction function) { - return null; - } - } Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/BasicFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/BasicFunctionModifier.java 2009-02-24 21:55:33 UTC (rev 493) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/BasicFunctionModifier.java 2009-02-25 03:49:48 UTC (rev 494) @@ -24,10 +24,9 @@ */ package org.teiid.connector.jdbc.translator; = -import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; = import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.language.IExpression; @@ -95,22 +94,7 @@ * @see org.teiid.connector.jdbc.translator.FunctionModifier#translate= (com.metamatrix.connector.language.IFunction) */ public List translate(IFunction function) { - List objs =3D new ArrayList(); - objs.add(function.getName()); - objs.add("("); //$NON-NLS-1$ - List params =3D function.getParameters(); - if(params.size() > 0) { = - objs.add(params.get(0)); - if(params.size() > 1) { - for(int i=3D1; i 50"; //$NON-NLS-1$ + String output =3D "SELECT * FROM (SELECT VIEW_FOR_LIMIT.*, ROWNUM = ROWNUM_ FROM (SELECT SmallA.IntKey FROM SmallA) VIEW_FOR_LIMIT WHERE ROWNUM= <=3D 150) WHERE ROWNUM_ > 50"; //$NON-NLS-1$ = helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), input, = - MODIFIERS, EMPTY_CONTEXT, null, - output); = + EMPTY_CONTEXT, null, output); = } = public void testLimitWithNestedInlineView() throws Exception { @@ -525,8 +474,7 @@ = helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), input, = - MODIFIERS, EMPTY_CONTEXT, null, - output); = + EMPTY_CONTEXT, null, output); = } = public void testExceptAsMinus() throws Exception { @@ -535,8 +483,31 @@ = helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), input, = - MODIFIERS, EMPTY_CONTEXT, null, - output); = + EMPTY_CONTEXT, null, output); = + } + = + public void testConcat2_useLiteral() throws Exception { + String sql =3D "select concat2(stringnum,'_xx') from BQT1.Smalla";= //$NON-NLS-1$ = + String expected =3D "SELECT concat(nvl(SmallA.StringNum, ''), '_xx= ') FROM SmallA"; //$NON-NLS-1$ + helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), sql, EMPTY= _CONTEXT, null, expected); + } + + public void testConcat2() throws Exception { + String sql =3D "select concat2(stringnum, stringnum) from BQT1.Sma= lla"; //$NON-NLS-1$ = + String expected =3D "SELECT CASE WHEN SmallA.StringNum IS NULL THE= N NULL ELSE concat(nvl(SmallA.StringNum, ''), nvl(SmallA.StringNum, '')) EN= D FROM SmallA"; + helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), sql, EMPTY= _CONTEXT, null, expected); + } + = + public void testConcat() throws Exception { + String sql =3D "select concat(stringnum, stringkey) from BQT1.Smal= la"; //$NON-NLS-1$ = + String expected =3D "SELECT CASE WHEN (SmallA.StringNum IS NULL) O= R (SmallA.StringKey IS NULL) THEN NULL ELSE concat(SmallA.StringNum, SmallA= .StringKey) END FROM SmallA"; + helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), sql, EMPTY= _CONTEXT, null, expected); + } + = + public void testConcat_withLiteral() throws Exception { + String sql =3D "select stringnum || '1' from BQT1.Smalla"; //$NON-= NLS-1$ = + String expected =3D "SELECT CASE WHEN SmallA.StringNum IS NULL THE= N NULL ELSE concat(SmallA.StringNum, '1') END FROM SmallA"; + helpTestVisitor(FakeMetadataFactory.exampleBQTCached(), sql, EMPTY= _CONTEXT, null, expected); } = } Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/= util/TestSQLStringVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estSQLStringVisitor.java 2009-02-24 21:55:33 UTC (rev 493) +++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estSQLStringVisitor.java 2009-02-25 03:49:48 UTC (rev 494) @@ -30,13 +30,16 @@ = import junit.framework.TestCase; = +import com.metamatrix.cdk.unittest.FakeTranslationFactory; import com.metamatrix.common.types.DataTypeManager; +import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IExpression; import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.IGroup; import com.metamatrix.connector.language.ILanguageObject; import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import com.metamatrix.connector.visitor.util.SQLReservedWords; import com.metamatrix.connector.visitor.util.SQLStringVisitor; import com.metamatrix.dqp.internal.datamgr.language.AggregateImpl; import com.metamatrix.dqp.internal.datamgr.language.ElementImpl; @@ -445,4 +448,11 @@ String expected =3D "EXEC sq3(, x, 1)"; //$NON-NLS-1$ assertEquals(expected, getString(TestProcedureImpl.example())); } + = + public void testTimestampAddFunction() throws Exception { + String sql =3D "select timestampadd(" +SQLReservedWords.SQL_TSI_DAY+ = ", 2, timestampvalue) from bqt1.smalla"; //$NON-NLS-1$ + = + ICommand command =3D FakeTranslationFactory.getInstance().getBQTTrans= lationUtility().parseCommand(sql); + assertEquals("SELECT timestampadd(SQL_TSI_DAY, 2, SmallA.TimestampVal= ue) FROM SmallA", command.toString()); //$NON-NLS-1$ + } } --===============2188445510574597471==-- From teiid-commits at lists.jboss.org Tue Feb 24 22:49:53 2009 Content-Type: multipart/mixed; boundary="===============8642122690450010481==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r495 - in trunk/connectors/connector-jdbc/src: test/java/com/metamatrix/connector/jdbc and 1 other directory. Date: Tue, 24 Feb 2009 22:49:52 -0500 Message-ID: --===============8642122690450010481== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-24 22:49:52 -0500 (Tue, 24 Feb 2009) New Revision: 495 Removed: trunk/connectors/connector-jdbc/src/main/java/com/metamatrix/connector/j= dbc/ trunk/connectors/connector-jdbc/src/test/java/com/metamatrix/connector/j= dbc/extension/ Log: TEIID-164 fixes from rewiring integration tests --===============8642122690450010481==-- From teiid-commits at lists.jboss.org Wed Feb 25 10:28:36 2009 Content-Type: multipart/mixed; boundary="===============0165696134209934513==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r496 - in trunk: common-internal/src/main/java/com/metamatrix/common/config and 7 other directories. Date: Wed, 25 Feb 2009 10:28:27 -0500 Message-ID: --===============0165696134209934513== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-25 10:28:27 -0500 (Wed, 25 Feb 2009) New Revision: 496 Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/SocketServerConnection.java trunk/common-internal/src/main/java/com/metamatrix/common/config/Current= Configuration.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VMC= omponentDefnType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicHost.java trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XML= Config_42_HelperImpl.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringA= dminImpl.java trunk/server/src/main/java/com/metamatrix/server/HostController.java trunk/server/src/main/java/com/metamatrix/server/Main.java trunk/server/src/main/resources/com/metamatrix/platform/i18n.properties trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCu= rrentConfiguration.java Log: TEIID-309: The host specific properties are moved to bootstrap properties, = since host properties are specific to a given host not to the entire system= . This way they can be configured correctly during the setupmm. = Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/SocketServerConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerConnection.java 2009-02-25 03:49:52 UTC (rev 495) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerConnection.java 2009-02-25 15:28:27 UTC (rev 496) @@ -117,7 +117,7 @@ List hostKeys =3D new ArrayList(this.serverDiscovery= .getKnownHosts()); List hostCopy =3D new ArrayList(hostKeys); int knownHosts =3D hostKeys.size(); - for (int i =3D 0; i < hostKeys.size(); i++) { + while (hostKeys.size() > 0) { HostInfo hostInfo =3D hostKeys.remove((int) (Math.random() * hostKeys.s= ize())); = SocketServerInstance instance =3D existingConnections.get(hostInfo); Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= CurrentConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/Curren= tConfiguration.java 2009-02-25 03:49:52 UTC (rev 495) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/Curren= tConfiguration.java 2009-02-25 15:28:27 UTC (rev 496) @@ -28,12 +28,16 @@ import java.util.Properties; = import com.metamatrix.common.CommonPlugin; +import com.metamatrix.common.config.api.ComponentTypeID; import com.metamatrix.common.config.api.Configuration; +import com.metamatrix.common.config.api.ConfigurationID; import com.metamatrix.common.config.api.ConfigurationModelContainer; import com.metamatrix.common.config.api.Host; +import com.metamatrix.common.config.api.HostID; import com.metamatrix.common.config.api.ResourceModel; import com.metamatrix.common.config.api.SharedResource; import com.metamatrix.common.config.api.exceptions.ConfigurationException; +import com.metamatrix.common.config.model.BasicHost; import com.metamatrix.common.config.reader.CurrentConfigurationReader; import com.metamatrix.common.config.reader.PropertiesConfigurationReader; import com.metamatrix.common.properties.UnmodifiableProperties; @@ -69,7 +73,7 @@ public static final String BOOTSTRAP_FILE_NAME =3D "metamatrix.propert= ies"; //$NON-NLS-1$ public static final String CONFIGURATION_READER_CLASS_PROPERTY_NAME = =3D "metamatrix.config.reader"; //$NON-NLS-1$ public static final String CLUSTER_NAME =3D "metamatrix.cluster.name";= //$NON-NLS-1$ - private static final String CONFIGURATION_NAME=3D "configuration.name"= ; //$NON-NLS-1$ + public static final String CONFIGURATION_NAME=3D "configuration.name";= //$NON-NLS-1$ = private CurrentConfigurationReader reader; private Properties bootstrapProperties; @@ -212,12 +216,11 @@ */ public Host getDefaultHost() throws ConfigurationException { String name =3D getBootStrapProperties().getProperty(CONFIGURATION_NA= ME); - return getReader().getConfigurationModel().getHost(name); + BasicHost host =3D new BasicHost(new ConfigurationID(name), new HostI= D(name), new ComponentTypeID(name)); + host.setProperties(getBootStrapProperties()); + return host; } = = - public Host getHost(String name) throws ConfigurationException { - return getReader().getConfigurationModel().getHost(name); - } = = /** * Reset causes not just a refresh, but the bootstrapping process Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/VMComponentDefnType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VM= ComponentDefnType.java 2009-02-25 03:49:52 UTC (rev 495) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/VM= ComponentDefnType.java 2009-02-25 15:28:27 UTC (rev 496) @@ -62,10 +62,4 @@ */ = public static final String JAVA_OPTS =3D "vm.starter.cmd.java_opts"; /= /$NON-NLS-1$ - public static final String JAVA_MAIN =3D "vm.starter.cmd.java_main"; /= /$NON-NLS-1$ - public static final String JAVA_ARGS =3D "vm.starter.cmd.java_args"; /= /$NON-NLS-1$ - = - = - = - = } = Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicHost.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicHost.java 2009-02-25 03:49:52 UTC (rev 495) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicHost.java 2009-02-25 15:28:27 UTC (rev 496) @@ -23,7 +23,9 @@ package com.metamatrix.common.config.model; = = +import java.io.File; import java.io.Serializable; +import java.util.Properties; = import com.metamatrix.common.config.api.ComponentTypeID; import com.metamatrix.common.config.api.ConfigurationID; @@ -49,7 +51,7 @@ * @since 4.3 */ public String getDataDirectory() { - return getProperty(HostType.DATA_DIRECTORY); + return getProperty(HostType.HOST_DIRECTORY)+File.separator+ "data"= ; //$NON-NLS-1$ } /** = * @see com.metamatrix.common.config.api.Host#getLogDirectory() @@ -103,4 +105,8 @@ public String getHostAddress() { return getProperty(HostType.HOST_PHYSICAL_ADDRESS); } + = + public void setProperties(Properties props) { + super.setProperties(props); + } } Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= xml/XMLConfig_42_HelperImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfig_42_HelperImpl.java 2009-02-25 03:49:52 UTC (rev 495) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/xml/XM= LConfig_42_HelperImpl.java 2009-02-25 15:28:27 UTC (rev 496) @@ -2377,23 +2377,22 @@ public ComponentObject addProperties(Element propertiesElement, Compon= entObject object, ConfigurationObjectEditor editor) throws InvalidConfigura= tionElementException{ = if (!propertiesElement.getName().equals(XMLConfig_42_ElementNames.= Properties.ELEMENT)) { - propertiesElement =3D propertiesElement.getChild(XMLConfig_42_= ElementNames.Properties.ELEMENT); + } = - if (propertiesElement =3D=3D null) { = - throw new InvalidConfigurationElementException("A Properti= es object cannot be created from a null properties element", null); //$NON-= NLS-1$ = - = - } + Properties props =3D null; + if (propertiesElement =3D=3D null) { = + props =3D new Properties(); } + else { + props =3D getProperties(propertiesElement); + } = - Properties props =3D getProperties(propertiesElement); - object =3D editor.modifyProperties(object, props, ConfigurationObj= ectEditor.ADD); return object; } = = - private Properties getProperties(Element propertiesElement) { Properties props =3D new Properties(); = Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerMoni= toringAdminImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoring= AdminImpl.java 2009-02-25 03:49:52 UTC (rev 495) +++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoring= AdminImpl.java 2009-02-25 15:28:27 UTC (rev 496) @@ -628,6 +628,7 @@ process.setQueueWorkerPool(workerPool); } } + process.setInetAddress(getRuntimeStateAdminAPIHelper().= getVMHostName(processID)); } catch (MetaMatrixComponentException e) { //do nothing: sometimes when the process is just = starting the RMI stub //for SocketVMController is not initialized yet @@ -635,7 +636,6 @@ } = process.setDeployed(false); = - process.setInetAddress(getRuntimeStateAdminAPIHelper().ge= tVMHostName(processID)); String key =3D MMAdminObject.buildIdentifier(identifierPa= rts).toUpperCase(); runtimeMap.put(key, process); results.add(process); Modified: trunk/server/src/main/java/com/metamatrix/server/HostController.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/HostController.java 20= 09-02-25 03:49:52 UTC (rev 495) +++ trunk/server/src/main/java/com/metamatrix/server/HostController.java 20= 09-02-25 15:28:27 UTC (rev 496) @@ -23,7 +23,6 @@ package com.metamatrix.server; = import java.io.File; -import java.io.IOException; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; @@ -39,7 +38,6 @@ import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.config.CurrentConfiguration; import com.metamatrix.common.config.StartupStateController; -import com.metamatrix.common.config.StartupStateException; import com.metamatrix.common.config.api.ConfigurationModelContainer; import com.metamatrix.common.config.api.Host; import com.metamatrix.common.config.api.VMComponentDefn; @@ -82,7 +80,7 @@ this.messageBus =3D bus; = } = - public void run(boolean startProcesses) throws ConfigurationException,= IOException, StartupStateException { + public void run(boolean startProcesses) throws Throwable { = if (isHostRunning()) { System.err.println(PlatformPlugin.Util.getString("HostController.Hos= t_is_already_running_startprocesses", host.getFullName())); //$NON-NLS-1$ @@ -101,8 +99,9 @@ if (startProcesses ) { try { startServers(host.getFullName()); - } catch (MetaMatrixComponentException e) { + } catch (Throwable e) { LogManager.logError(LogCommonConstants.CTX_CONTROLLER, e, e.getMessage= ()); + shutdown(this.host.getFullName()); } } = } @@ -146,7 +145,7 @@ return null; } = - private void createTempDirectories() throws ConfigurationException, IO= Exception { + private void createTempDirectories() { // If the java-i-tmp directory doesn't exist, it needs to be creat= ed // because extension jars class loading will fail because // java internals can' write to a non-existent directory. @@ -280,6 +279,7 @@ = } catch (Throwable e) { LogManager.logError(LogCommonConstants.CTX_CONTROLLER, e, "ERR= OR " + PlatformPlugin.Util.getString(ErrorMessageKeys.HOST_0011));//$NON-NL= S-1$ + e.printStackTrace(); System.exit(1); } } @@ -291,12 +291,12 @@ } = = private Process startDeployVM( String vmName, String hostName, Properti= es vmprops) { - LogManager.logInfo(LogCommonConstants.CTX_CONTROLLER, "Start deploy VM= " + vmName + " on host"+ hostName); //$NON-NLS-1$ //$NON-NLS-2$ - String command =3D buildVMCommand(vmprops); + LogManager.logInfo(LogCommonConstants.CTX_CONTROLLER, "Start deploy VM= =3D " + vmName + " on host =3D "+ hostName); //$NON-NLS-1$ //$NON-NLS-2$ + String command =3D buildVMCommand(vmName, vmprops); return execCommand(command); } = - private String buildVMCommand(Properties vmprops) { + private String buildVMCommand(String vmName, Properties vmprops) { String java =3D null; String java_home =3D System.getProperty("java.home"); //$NON-NLS-1$ if (java_home !=3D null) { @@ -306,15 +306,11 @@ } String java_opts =3D vmprops.getProperty(VMComponentDefnType.JAVA_OPTS= , ""); //$NON-NLS-1$ java_opts =3D java_opts + " -Dcom.sun.management.jmxremote " + System.= getProperty(VMComponentDefnType.JAVA_OPTS, ""); //$NON-NLS-1$ //$NON-NLS-2$ - String java_main =3D vmprops.getProperty(VMComponentDefnType.JAVA_MAIN= , DEFAULT_JAVA_MAIN); - String java_args =3D vmprops.getProperty(VMComponentDefnType.JAVA_ARGS= , ""); //$NON-NLS-1$ = java =3D replaceToken(java, vmprops); java_opts =3D replaceToken(java_opts, vmprops); - java_main =3D replaceToken(java_main, vmprops); - java_args =3D replaceToken(java_args, vmprops); = - String cmd =3D java + " " +java_opts+ " " +java_main + " " +java_args;= //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + String cmd =3D java + " " +java_opts+ " " + DEFAULT_JAVA_MAIN + " " + = vmName; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ = return cmd; } = @@ -332,7 +328,7 @@ if (endidx < startidx) return rtn; = String tokenprop =3D rtn.substring(startidx + 2, endidx); - String tokenvalue =3D props.getProperty(tokenprop); + String tokenvalue =3D props.getProperty(tokenprop).trim(); StringBuffer buf =3D new StringBuffer(rtn); rtn =3D buf.replace(startidx, endidx + 1, tokenvalue).toString(); } Modified: trunk/server/src/main/java/com/metamatrix/server/Main.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/Main.java 2009-02-25 0= 3:49:52 UTC (rev 495) +++ trunk/server/src/main/java/com/metamatrix/server/Main.java 2009-02-25 1= 5:28:27 UTC (rev 496) @@ -58,26 +58,25 @@ public static void main(String[] args) { = try { - if (args.length < 2 || args.length > 4) { - System.out.println("Usage: java com.metamatrix.server.Main "); //$NON-NLS-1$ + if (args.length !=3D 1) { + System.out.println("Usage: java com.metamatrix.server.Main "); //$NON-NLS-1$ System.exit(1); = } = String vmName =3D args[0]; - String hostName =3D args[1]; = Host host =3D null; try { - host =3D CurrentConfiguration.getInstance().getHost(hostName); = + host =3D CurrentConfiguration.getInstance().getDefaultHost(); = } catch (ConfigurationException e) { } = if (host =3D=3D null) { - System.err.println(PlatformPlugin.Util.getString("SocketVMControlle= r.5", hostName)); //$NON-NLS-1$ + System.err.println(PlatformPlugin.Util.getString("SocketVMControlle= r.5")); //$NON-NLS-1$ System.exit(-1); } = - VMComponentDefn deployedVM =3D CurrentConfiguration.getInstance().getCo= nfiguration().getVMForHost(hostName, vmName); + VMComponentDefn deployedVM =3D CurrentConfiguration.getInstance().getCo= nfiguration().getVMForHost(host.getName(), vmName); String bindAddress =3D deployedVM.getBindAddress(); = VMNaming.setVMName(vmName); Modified: trunk/server/src/main/resources/com/metamatrix/platform/i18n.prop= erties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/resources/com/metamatrix/platform/i18n.properties= 2009-02-25 03:49:52 UTC (rev 495) +++ trunk/server/src/main/resources/com/metamatrix/platform/i18n.properties= 2009-02-25 15:28:27 UTC (rev 496) @@ -1281,7 +1281,7 @@ SocketVMController.2=3DProblem starting server binding to address {0} and = listening on port {1} SocketVMController.3=3DSetting Server Listener listenerFilter=3D{0} SocketVMController.4=3DGetting ServerListener Registry: {0} -SocketVMController.5=3DCould not find host <{0}> in configuration. +SocketVMController.5=3DCould not find host information. Run the "setupmm" = to configure the server before trying to start. = RemoteProxy.localCallFailed=3DRemote client could not invoke local service= method {0} on {1} JGroupsMessageBus.noResponse=3DNo response for remote method call \ No newline at end of file Modified: trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml= /TestCurrentConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestC= urrentConfiguration.java 2009-02-25 03:49:52 UTC (rev 495) +++ trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestC= urrentConfiguration.java 2009-02-25 15:28:27 UTC (rev 496) @@ -135,30 +135,7 @@ printMsg("Completed testCurrentHost"); //$NON-NLS-1$ = } = = - public void testFindHostByFullyQualifiedName() { - = - printMsg("Starting testFindHostByFullyQualifiedName"); //$NO= N-NLS-1$ - - try { - init(CONFIG_FILE); - = - CurrentConfiguration.getInstance().performSystemInitialization= (true); = - - Host host =3D CurrentConfiguration.getInstance().getHost("slwx= p141.quadrian.com"); //$NON-NLS-1$ - = - if (host =3D=3D null) { = - fail(" host was not found in configuration");//$NON-NLS-1$ - } - = - = - } catch (Exception e) { - e.printStackTrace(); - fail(e.getMessage()); - } - = - printMsg("Completed testFindHostByFullyQualifiedName"); //$NON= -NLS-1$ = - } = - = + = public void test30SystemInitialization() { = printMsg("**** Starting test30SystemInitialization"); //$NON= -NLS-1$ --===============0165696134209934513==-- From teiid-commits at lists.jboss.org Wed Feb 25 12:45:32 2009 Content-Type: multipart/mixed; boundary="===============6890351280164799015==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r497 - trunk/server/src/main/java/com/metamatrix/server. Date: Wed, 25 Feb 2009 12:45:32 -0500 Message-ID: --===============6890351280164799015== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-25 12:45:32 -0500 (Wed, 25 Feb 2009) New Revision: 497 Modified: trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceModu= le.java trunk/server/src/main/java/com/metamatrix/server/ServiceManagerGuiceModu= le.java Log: TEIID-383 Modified: trunk/server/src/main/java/com/metamatrix/server/HostControllerGu= iceModule.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceMod= ule.java 2009-02-25 15:28:27 UTC (rev 496) +++ trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceMod= ule.java 2009-02-25 17:45:32 UTC (rev 497) @@ -53,6 +53,21 @@ @Override protected void configure() { = + commonComponents(); + = + bind(LogConfiguration.class).toProvider(LogConfigurationProvider.class).= in(Scopes.SINGLETON); = + = + bind(LogListener.class).toProvider(FileLogListenerProvider.class).in(Sco= pes.SINGLETON); = + + // this needs to be removed. + binder().requestStaticInjection(LogManager.class); = + } + = + /** + * These resources are common between hostcontroller and svcmgr. + */ + protected void commonComponents() { + = String systemName =3D null; try { systemName =3D CurrentConfiguration.getInstance().getClusterName(); @@ -66,7 +81,6 @@ bindConstant().annotatedWith(Names.named(Configuration.CLUSTERNAME)).to(= systemName); bindConstant().annotatedWith(Names.named(Configuration.LOGFILE)).to(Stri= ngUtil.replaceAll(host.getFullName(), ".", "_")+"_hc.log"); //$NON-NLS-1$ /= /$NON-NLS-2$ //$NON-NLS-3$ bindConstant().annotatedWith(Names.named(Configuration.LOGDIR)).to(host.= getLogDirectory()); - = = Names.bindProperties(binder(), CurrentConfiguration.getInstance().getPro= perties()); = @@ -76,14 +90,7 @@ bind(CacheFactory.class).to(JBossCacheFactory.class).in(Scopes.SINGLETON= ); bind(ClusteredRegistryState.class).in(Scopes.SINGLETON); bind(MessageBus.class).to(VMMessageBus.class).in(Scopes.SINGLETON); // V= M Message bus is in common-internal - bind(HostMonitor.class).in(Scopes.SINGLETON); - = - bind(LogConfiguration.class).toProvider(LogConfigurationProvider.class).= in(Scopes.SINGLETON); = - = - bind(LogListener.class).toProvider(FileLogListenerProvider.class).in(Sco= pes.SINGLETON); = - - // this needs to be removed. - binder().requestStaticInjection(LogManager.class); = + bind(HostMonitor.class).in(Scopes.SINGLETON); = } = } Modified: trunk/server/src/main/java/com/metamatrix/server/ServiceManagerGu= iceModule.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/ServiceManagerGuiceMod= ule.java 2009-02-25 15:28:27 UTC (rev 496) +++ trunk/server/src/main/java/com/metamatrix/server/ServiceManagerGuiceMod= ule.java 2009-02-25 17:45:32 UTC (rev 497) @@ -34,7 +34,13 @@ = @Override protected void configure() { - super.configure(); + = + super.commonComponents(); + = bind(HostManagement.class).toProvider(HostManagementProvider.class).in(S= copes.SINGLETON); + = + // no logging is required for svcmgr, as it writes using the system.out = any log = + // messages will be sent to null logger. One thing we do not want to do = is capture = + // the system streams for svcmgr. } } --===============6890351280164799015==-- From teiid-commits at lists.jboss.org Wed Feb 25 13:12:41 2009 Content-Type: multipart/mixed; boundary="===============0324899147076287018==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r498 - in trunk: common-internal/src/main/java/com/metamatrix/common/config/api and 7 other directories. Date: Wed, 25 Feb 2009 13:12:41 -0500 Message-ID: --===============0324899147076287018== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-25 13:12:40 -0500 (Wed, 25 Feb 2009) New Revision: 498 Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Hos= t.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Hos= tType.java trunk/common-internal/src/main/java/com/metamatrix/common/config/model/B= asicHost.java trunk/common-internal/src/main/java/com/metamatrix/platform/service/api/= ServiceState.java trunk/console/src/main/java/com/metamatrix/console/models/SummaryManager= .java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/= PropertyConstants.java trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/Summ= aryHostInfo.java trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/Summ= aryPanel.java trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigA= dminImpl.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/Helper= TestConfiguration.java Log: TEIID-283: removing port information from the Host properties. Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java 2= 009-02-25 17:45:32 UTC (rev 497) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java 2= 009-02-25 18:12:40 UTC (rev 498) @@ -32,15 +32,8 @@ * @since 4.3 */ public interface Host extends AdminObject { - = = - /** - * Port Number Property - */ - public static final String PORT_NUMBER =3D "hostControllerPortNumber";= //$NON-NLS-1$ = - = - /** * Install Directory Property */ public static final String INSTALL_DIR =3D "metamatrix.installationDir= "; //$NON-NLS-1$ = Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/Host.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ho= st.java 2009-02-25 17:45:32 UTC (rev 497) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ho= st.java 2009-02-25 18:12:40 UTC (rev 498) @@ -55,17 +55,8 @@ */ = String getTempDirectory(); = = - = + = /** - * returns the host controller port number; - * @return - * @since 4.3 - */ - String getPort(); - = - = - = - /** * Return the address that should be used to bind to the host = * @return * @since 4.3 Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/HostType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ho= stType.java 2009-02-25 17:45:32 UTC (rev 497) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ho= stType.java 2009-02-25 18:12:40 UTC (rev 498) @@ -30,8 +30,6 @@ = public static final String COMPONENT_TYPE_NAME =3D "Host"; //$NON-NLS-= 1$ = - public static final String PORT_NUMBER =3D com.metamatrix.admin.api.ob= jects.Host.PORT_NUMBER; - = public static final String INSTALL_DIR =3D com.metamatrix.admin.api.ob= jects.Host.INSTALL_DIR; = public static final String LOG_DIRECTORY =3D com.metamatrix.admin.api.= objects.Host.LOG_DIRECTORY; Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= model/BasicHost.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicHost.java 2009-02-25 17:45:32 UTC (rev 497) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/= BasicHost.java 2009-02-25 18:12:40 UTC (rev 498) @@ -70,13 +70,7 @@ return FileUtils.buildDirectoryPath(new String[] {datadir, "temp"}= ); //$NON-NLS-1$ = } - /** = - * @see com.metamatrix.common.config.api.Host#getPort() - * @since 4.3 - */ - public String getPort() { - return getProperty(HostType.PORT_NUMBER); - } + /** * Return a deep cloned instance of this object. Subclasses must override * this method. Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/servi= ce/api/ServiceState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/service/api= /ServiceState.java 2009-02-25 17:45:32 UTC (rev 497) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/service/api= /ServiceState.java 2009-02-25 18:12:40 UTC (rev 498) @@ -30,4 +30,12 @@ public static final int STATE_INIT_FAILED =3D 4; public static final int STATE_NOT_REGISTERED =3D 5; public static final int STATE_DATA_SOURCE_UNAVAILABLE =3D 6; + = + public final static String[] stateAsString =3D {"Not_Initialized", //$= NON-NLS-1$ + "Running", //$NON-NLS-1$ + "Closed", //$NON-NLS-1$ + "Failed", //$NON-NLS-1$ + "Init_Failed", //$NON-NLS-1$ + "Not_Registered", //$NON-NLS-1$ + "Data_Source_Unavailable"}; //$NON-NLS-1$ = } Modified: trunk/console/src/main/java/com/metamatrix/console/models/Summary= Manager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/console/src/main/java/com/metamatrix/console/models/SummaryManage= r.java 2009-02-25 17:45:32 UTC (rev 497) +++ trunk/console/src/main/java/com/metamatrix/console/models/SummaryManage= r.java 2009-02-25 18:12:40 UTC (rev 498) @@ -120,9 +120,7 @@ it =3D hosts.iterator(); for (int i =3D 0; it.hasNext(); i++) { Host curHost =3D (Host)it.next(); - info[i] =3D new SummaryHostInfo(curHost.getName(), - curHost.getProperty(HostType.PORT_NUMBER), - hostStatus(curHost.getName(), hostData)); + info[i] =3D new SummaryHostInfo(curHost.getName(), hostStatus(= curHost.getName(), hostData)); } return info; } Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deplo= y/util/PropertyConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util= /PropertyConstants.java 2009-02-25 17:45:32 UTC (rev 497) +++ trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util= /PropertyConstants.java 2009-02-25 18:12:40 UTC (rev 498) @@ -37,21 +37,7 @@ static final String ESSENTIAL_PROP =3D DeployPkgUtils.getString("property.service.essential"); //$NON-NLS= -1$ = - // - // Process - // -// static final String LOG_PROP =3D -// DeployPkgUtils.getString("property.process.logfile"); //$NON-NLS= -1$ -// static final String MAX_HEAP_PROP =3D -// DeployPkgUtils.getString("property.process.maxheap"); //$NON-NLS= -1$ -// static final String MIN_HEAP_PROP =3D -// DeployPkgUtils.getString("property.process.minheap"); //$NON-NLS= -1$ = - // - // Host - // - static final String PORT_PROP =3D HostType.PORT_NUMBER; -// DeployPkgUtils.getString("property.host.portnumber"); //$NON-NLS= -1$ = = } Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/summa= ry/SummaryHostInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/Sum= maryHostInfo.java 2009-02-25 17:45:32 UTC (rev 497) +++ trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/Sum= maryHostInfo.java 2009-02-25 18:12:40 UTC (rev 498) @@ -29,12 +29,10 @@ public static final int NOT_RUNNING =3D 2; = private String hostName; - private String hostPortNum; private int hostStatus; = - public SummaryHostInfo(String hostName, String hostPortNum, int status= ){ + public SummaryHostInfo(String hostName, int status){ this.hostName =3D hostName; - this.hostPortNum =3D hostPortNum; this.hostStatus =3D status; } = @@ -42,10 +40,6 @@ return hostName; } = - public String getHostPortNum(){ - return hostPortNum; - } - public int getHostStatus(){ return hostStatus; } Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/summa= ry/SummaryPanel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/Sum= maryPanel.java 2009-02-25 17:45:32 UTC (rev 497) +++ trunk/console/src/main/java/com/metamatrix/console/ui/views/summary/Sum= maryPanel.java 2009-02-25 18:12:40 UTC (rev 498) @@ -92,7 +92,7 @@ private JPanel stopLightPanel; private String[] connectionsTableColumns =3D {"Product", "Connections"}; private TableWidget hostTable; - private String[] hostTableColumns =3D {"Host Identifier", "Port Number= ", "Status"}; + private String[] hostTableColumns =3D {"Host Identifier", "Status"}; private GridBagLayout sysStateLayout; private AutoRefresher arRefresher; = @@ -314,17 +314,15 @@ data =3D new Object[1][3]; data[0][0] =3D ""; data[0][1] =3D ""; - data[0][2] =3D ""; } else { data =3D new Object[hostInfo.length][3]; for (int i =3D 0; i < hostInfo.length; i++) { data[i][0] =3D hostInfo[i].getHostName(); - data[i][1] =3D hostInfo[i].getHostPortNum(); if (hostInfo[i].getHostStatus() =3D=3D SummaryHostInfo.RUN= NING) { - data[i][2] =3D "Running"; + data[i][1] =3D "Running"; } else if (hostInfo[i].getHostStatus() =3D=3D = SummaryHostInfo.NOT_RUNNING) { - data[i][2] =3D "Not Running"; + data[i][1] =3D "Not Running"; } } } Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServer= ConfigAdminImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfig= AdminImpl.java 2009-02-25 17:45:32 UTC (rev 497) +++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfig= AdminImpl.java 2009-02-25 18:12:40 UTC (rev 498) @@ -151,7 +151,6 @@ public void testAddHost() throws Exception { String hostIdentifier =3D BOGUS_HOST; = Properties hostProperties =3D new Properties(); - hostProperties.setProperty(Host.PORT_NUMBER, String.valueOf(15001)= ); hostProperties.setProperty(Host.INSTALL_DIR, "D:\\MetaMatrix\\s434= 01\\"); //$NON-NLS-1$ hostProperties.setProperty(Host.DATA_DIRECTORY, "D:\\MetaMatrix\\s= 43401\\data"); //$NON-NLS-1$ hostProperties.setProperty(Host.LOG_DIRECTORY, "D:\\MetaMatrix\\s4= 3401\\log"); //$NON-NLS-1$ @@ -162,7 +161,6 @@ public void testAddHostIP() throws Exception { String hostIdentifier =3D BOGUS_HOST_IP; = Properties hostProperties =3D new Properties(); - hostProperties.setProperty(Host.PORT_NUMBER, String.valueOf(15001)= ); hostProperties.setProperty(Host.INSTALL_DIR, "D:\\MetaMatrix\\s434= 01\\"); //$NON-NLS-1$ hostProperties.setProperty(Host.DATA_DIRECTORY, "D:\\MetaMatrix\\s= 43401\\data"); //$NON-NLS-1$ hostProperties.setProperty(Host.LOG_DIRECTORY, "D:\\MetaMatrix\\s4= 3401\\log"); //$NON-NLS-1$ @@ -173,7 +171,6 @@ public void testAddHostFullyQualifiedName() throws Exception { String hostIdentifier =3D BOGUS_HOST_FULLY_QUALIFIED; = Properties hostProperties =3D new Properties(); - hostProperties.setProperty(Host.PORT_NUMBER, String.valueOf(15001)= ); hostProperties.setProperty(Host.INSTALL_DIR, "D:\\MetaMatrix\\s434= 01\\"); //$NON-NLS-1$ hostProperties.setProperty(Host.DATA_DIRECTORY, "D:\\MetaMatrix\\s= 43401\\data"); //$NON-NLS-1$ hostProperties.setProperty(Host.LOG_DIRECTORY, "D:\\MetaMatrix\\s4= 3401\\log"); //$NON-NLS-1$ Modified: trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml= /HelperTestConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/Helpe= rTestConfiguration.java 2009-02-25 17:45:32 UTC (rev 497) +++ trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/Helpe= rTestConfiguration.java 2009-02-25 18:12:40 UTC (rev 498) @@ -113,10 +113,6 @@ validateComponentObject(h); = ArgCheck.isNotNull(h.getProperties(), "Host does not have any propert= ies"); //$NON-NLS-1$ - String hostPortNumber =3D h.getProperty(HostType.PORT_NUMBER); - ArgCheck.isNotNull(hostPortNumber, "Host " + h.getFullName() + " does= not have a host port number"); //$NON-NLS-1$ //$NON-NLS-2$ - = - = } = public static void validateAuthenticationProviders(Collection provider= s) throws ConfigurationException { --===============0324899147076287018==-- From teiid-commits at lists.jboss.org Wed Feb 25 13:27:24 2009 Content-Type: multipart/mixed; boundary="===============7268071697799076921==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r499 - in trunk: connector-api/src/main/java/com/metamatrix/connector/visitor/util and 14 other directories. Date: Wed, 25 Feb 2009 13:27:24 -0500 Message-ID: --===============7268071697799076921== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-25 13:27:23 -0500 (Wed, 25 Feb 2009) New Revision: 499 Added: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCExecutionException.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/ReplacementVisitor.java trunk/test-integration/teiid/ Removed: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/FunctionReplacementVisitor.java Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/frame= work/HierarchyVisitor.java trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/= SQLStringVisitor.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCBaseExecution.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCConnector.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCQueryExecution.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCUpdateExecution.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/a= ccess/AccessSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= b2/DB2SQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/OracleSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/PostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/SybaseSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/SQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/TranslatedCommand.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/Translator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/a= ccess/TestAccessSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/s= qlserver/TestSqlServerConversionVisitor.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/s= ybase/TestSybaseSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/u= til/TestFunctionReplacementVisitor.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exten= sion/TestSQLConversionVisitor.java Log: TEIID-164 fixes from rewiring integration tests Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/framework/HierarchyVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/HierarchyVisitor.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/HierarchyVisitor.java 2009-02-25 18:27:23 UTC (rev 499) @@ -27,11 +27,9 @@ import com.metamatrix.connector.language.ICompareCriteria; import com.metamatrix.connector.language.ICompoundCriteria; import com.metamatrix.connector.language.IDelete; -import com.metamatrix.connector.language.IElement; import com.metamatrix.connector.language.IExistsCriteria; import com.metamatrix.connector.language.IFrom; import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; import com.metamatrix.connector.language.IGroupBy; import com.metamatrix.connector.language.IInCriteria; import com.metamatrix.connector.language.IInlineView; @@ -39,11 +37,8 @@ import com.metamatrix.connector.language.IIsNullCriteria; import com.metamatrix.connector.language.IJoin; import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.ILiteral; import com.metamatrix.connector.language.INotCriteria; import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.IOrderByItem; -import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.IProcedure; import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.IScalarSubquery; @@ -70,7 +65,14 @@ */ public abstract class HierarchyVisitor extends AbstractLanguageVisitor { = - public HierarchyVisitor() { + private boolean visitSubcommands; + = + public HierarchyVisitor() { + this(true); + } + = + public HierarchyVisitor(boolean visitSubcommands) { + this.visitSubcommands =3D visitSubcommands; } = public void visit(IAggregate obj) { @@ -95,15 +97,14 @@ visitNode(obj.getCriteria()); } = - public void visit(IElement obj) { - } - = public void visit(IProcedure obj) { visitNodes(obj.getParameters()); } = public void visit(IExistsCriteria obj) { - visitNode(obj.getQuery()); + if (visitSubcommands) { + visitNode(obj.getQuery()); + } } = public void visit(IFrom obj) { @@ -114,12 +115,6 @@ visitNodes(obj.getParameters()); } = - public void visit(IGroup obj) { - } - = -// public void visit(IGroup obj) { -// } - = public void visit(IGroupBy obj) { visitNodes(obj.getElements()); } @@ -152,9 +147,6 @@ visitNode(obj.getRightExpression()); } = - public void visit(ILiteral obj) { - } - = public void visit(INotCriteria obj) { visitNode(obj.getCriteria()); } @@ -163,12 +155,6 @@ visitNodes(obj.getItems()); } = - public void visit(IOrderByItem obj) { - } - - public void visit(IParameter obj) { - } - = public void visit(IQuery obj) { visitNode(obj.getSelect()); visitNode(obj.getFrom()); @@ -180,7 +166,9 @@ } = public void visit(IScalarSubquery obj) { - visitNode(obj.getQuery()); + if (visitSubcommands) { + visitNode(obj.getQuery()); + } } = public void visit(ISearchedCaseExpression obj) { @@ -202,17 +190,23 @@ = public void visit(ISubqueryCompareCriteria obj) { visitNode(obj.getLeftExpression()); - visitNode(obj.getQuery()); + if (visitSubcommands) { + visitNode(obj.getQuery()); + } } = public void visit(ISubqueryInCriteria obj) { visitNode(obj.getLeftExpression()); = - visitNode(obj.getQuery()); + if (visitSubcommands) { + visitNode(obj.getQuery()); + } } = public void visit(ISetQuery obj) { - visitNode(obj.getLeftQuery()); - visitNode(obj.getRightQuery()); = + if (visitSubcommands) { + visitNode(obj.getLeftQuery()); + visitNode(obj.getRightQuery()); + } visitNode(obj.getOrderBy()); visitNode(obj.getLimit()); } @@ -225,7 +219,9 @@ = @Override public void visit(IInlineView obj) { - visitNode(obj.getQuery()); + if (visitSubcommands) { + visitNode(obj.getQuery()); + } } = @Override Modified: trunk/connector-api/src/main/java/com/metamatrix/connector/visito= r/util/SQLStringVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /SQLStringVisitor.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /SQLStringVisitor.java 2009-02-25 18:27:23 UTC (rev 499) @@ -780,7 +780,7 @@ String name =3D getShortName(obj.getName()); buffer.append(name); } else if (obj.getElement() !=3D null) { - visit(obj.getElement()); = + append(obj.getElement()); = } else { buffer.append(UNDEFINED); } @@ -879,7 +879,6 @@ } append(obj.getSelectSymbols()); } - = = protected String getSourceComment(ICommand command) { return ""; //$NON-NLS-1$ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCBaseExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCBaseExecution.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCBaseExecution.java 2009-02-25 18:27:23 UTC (rev 499) @@ -28,8 +28,7 @@ import java.sql.SQLException; import java.sql.SQLWarning; import java.sql.Statement; -import java.util.Iterator; -import java.util.List; +import java.util.Arrays; import java.util.Properties; = import org.teiid.connector.jdbc.translator.TranslatedCommand; @@ -95,91 +94,6 @@ // Methods // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D = - private void addSql(TranslatedCommand command, - StringBuffer message) { - String sql =3D command.getSql(); - int ndx =3D sql.indexOf('?'); - if (ndx >=3D 0) { - message.append(sql.substring(0, ndx)); - int len =3D sql.length(); - for (Iterator itr =3D command.getPreparedValues().iterator(); = itr.hasNext() && ndx < len;) { - message.append(itr.next()); - int nextNdx =3D sql.indexOf('?', ++ndx); - if (nextNdx >=3D 0) { - message.append(sql.substring(ndx, nextNdx)); - } else { - message.append(sql.substring(ndx)); - } - ndx =3D nextNdx; - } - } else { - message.append(sql); - } - } - - /** - * @param error - * @param command - * @return - * @since 5.5 - */ - protected ConnectorException createAndLogError(SQLException error, - TranslatedCommand comma= nd) { - ConnectorException connectorErr =3D createError(error, command); - this.logger.logError(connectorErr.getMessage()); - return connectorErr; - } - - /** - * @param error - * @param messageKey - * @param commands - * @return - * @throws ConnectorException - * @since 5.5 - */ - protected ConnectorException createAndLogError(Throwable error, - String messageKey, - List commands) throws C= onnectorException { - String msg; - if (commands.isEmpty()) { - msg =3D error.getMessage(); - } else { - msg =3D JDBCPlugin.Util.getString(messageKey, error.getMessage= ()); - StringBuffer buf =3D new StringBuffer(msg); - for (Iterator itr =3D commands.iterator(); itr.hasNext();) { - buf.append("\n "); //$NON-NLS-1$ - addSql((TranslatedCommand)itr.next(), buf); - } - msg =3D buf.toString(); - } - this.logger.logError(msg); - if (error instanceof ConnectorException) { - error =3D ((ConnectorException)error).getCause(); - } - throw new ConnectorException(error, msg); - } - - /** - * @param error - * @param command - * @return - * @since 5.5 - */ - protected ConnectorException createError(SQLException error, - TranslatedCommand command) { - String msg =3D (command =3D=3D null ? error.getMessage() - : JDBCPlugin.Util.getString("JDBCQueryExecution.Er= ror_executing_query__1", //$NON-NLS-1$ - error.getMessage(), cr= eateSql(command))); - return new ConnectorException(error, msg); - } - - private String createSql(TranslatedCommand command) { - StringBuffer msg =3D new StringBuffer(); - addSql(command, msg); - return msg.toString(); - } - protected TranslatedCommand translateCommand(ICommand command) throws = ConnectorException { TranslatedCommand translatedCommand =3D new TranslatedCommand(cont= ext, sqlTranslator); translatedCommand.translateCommand(command); Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCConnector.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCConnector.java 2009-02-25 18:27:23 UTC (rev 499) @@ -20,8 +20,6 @@ * 02110-1301 USA. */ = -/* - */ package org.teiid.connector.jdbc; = import java.lang.reflect.InvocationHandler; Added: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jd= bc/JDBCExecutionException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCExecutionException.java (rev 0) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCExecutionException.java 2009-02-25 18:27:23 UTC (rev 499) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.jdbc; + +import java.sql.SQLException; +import java.util.Arrays; + +import org.teiid.connector.jdbc.translator.TranslatedCommand; + +import com.metamatrix.connector.api.ConnectorException; + +public class JDBCExecutionException extends ConnectorException { + + public JDBCExecutionException(SQLException error, + TranslatedCommand... commands) { + super(commands =3D=3D null ? error.getMessage() : JDBCPlugin.Util + .getString("JDBCQueryExecution.Error_executing_query__1", //$NON-NLS-1$ + error.getMessage(), Arrays.toString(commands))); + } + +} Property changes on: trunk/connectors/connector-jdbc/src/main/java/org/teii= d/connector/jdbc/JDBCExecutionException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCQueryExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCQueryExecution.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCQueryExecution.java 2009-02-25 18:27:23 UTC (rev 499) @@ -105,7 +105,7 @@ initResultSetInfo(); = } catch (SQLException e) { - throw createAndLogError(e, translatedComm); + throw new JDBCExecutionException(e, translatedComm); } } = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCUpdateExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCUpdateExecution.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCUpdateExecution.java 2009-02-25 18:27:23 UTC (rev 499) @@ -94,6 +94,8 @@ ICommand[] commands =3D (ICommand[])batchedCommand.getUpdateComman= ds().toArray(new ICommand[batchedCommand.getUpdateCommands().size()]); int[] results =3D new int[commands.length]; = + TranslatedCommand command =3D null; + = try { // temporarily turn the auto commit off, and set it back to wh= at it was // before at the end of the command execution. @@ -101,12 +103,12 @@ connection.setAutoCommit(false); } = - List executedCmds =3D new ArrayList(); - = + List executedCmds =3D new ArrayList(); + TranslatedCommand previousCommand =3D null; = for (int i =3D 0; i < commands.length; i++) { - TranslatedCommand command =3D translateCommand(commands[i]= ); + command =3D translateCommand(commands[i]); if (command.isPrepared()) { PreparedStatement pstmt =3D null; if (previousCommand !=3D null && previousCommand.isPre= pared() && previousCommand.getSql().equals(command.getSql())) { @@ -137,7 +139,7 @@ } succeeded =3D true; } catch (SQLException e) { - throw createAndLogError(e, null); + throw new JDBCExecutionException(e, command); } finally { if (commitType) { restoreAutoCommit(!succeeded, null); @@ -176,7 +178,7 @@ addStatementWarnings(); succeeded =3D true; } catch (SQLException e) { - throw createAndLogError(e, translatedComm); + throw new JDBCExecutionException(e, translatedComm); } finally { if (commitType) { restoreAutoCommit(!succeeded, translatedComm); @@ -187,7 +189,7 @@ = private void executeBatch(int commandCount, int[] results, - List commands) throws ConnectorException { + List commands) throws Con= nectorException { try { int[] batchResults =3D statement.executeBatch(); addStatementWarnings(); @@ -196,7 +198,7 @@ } commands.clear(); } catch (SQLException err) { - throw createAndLogError(err, "JDBCQueryExecution.Error_executi= ng_query__3", commands); //$NON-NLS-1$ + throw new JDBCExecutionException(err, commands.toArray(new Tra= nslatedCommand[commands.size()])); //$NON-NLS-1$ } } = @@ -221,7 +223,7 @@ addStatementWarnings(); return updateCount; } catch (SQLException err) { - throw createError(err, translatedComm); + throw new JDBCExecutionException(err, translatedComm); } } = @@ -234,7 +236,7 @@ try { return connection.getAutoCommit(); } catch (SQLException err) { - throw createAndLogError(err, command); + throw new JDBCExecutionException(err, command); } } = @@ -253,7 +255,7 @@ } connection.setAutoCommit(true); } catch (SQLException err) { - throw createAndLogError(err, command); + throw new JDBCExecutionException(err, command); } } = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/access/AccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= access/AccessSQLTranslator.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= access/AccessSQLTranslator.java 2009-02-25 18:27:23 UTC (rev 499) @@ -24,9 +24,16 @@ */ package org.teiid.connector.jdbc.access; = +import java.util.ArrayList; +import java.util.List; + import org.teiid.connector.jdbc.translator.Translator; = +import com.metamatrix.connector.api.ExecutionContext; +import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.IOrderBy; +import com.metamatrix.connector.language.IQueryCommand; = public class AccessSQLTranslator extends Translator { = @@ -44,12 +51,30 @@ } = @Override - public String addLimitString(String queryCommand, ILimit limit) { - int index =3D queryCommand.startsWith("SELECT DISTINCT")?15:6; - return new StringBuffer(queryCommand.length() + 8).append(queryComman= d) - .insert(index, " TOP " + limit.getRowLimit()).toString(); + public List translateCommand(ICommand command, ExecutionContext con= text) { + if (!(command instanceof IQueryCommand)) { + return null; + } + IQueryCommand queryCommand =3D (IQueryCommand)command; + if (queryCommand.getLimit() =3D=3D null) { + return null; + } + ILimit limit =3D queryCommand.getLimit(); + IOrderBy orderBy =3D queryCommand.getOrderBy(); + queryCommand.setLimit(null); + queryCommand.setOrderBy(null); + List parts =3D new ArrayList(6); + parts.add("SELECT TOP "); + parts.add(limit.getRowLimit()); + parts.add(" * FROM ("); + parts.add(queryCommand); + parts.add(") AS X"); + if (orderBy !=3D null) { + parts.add(orderBy); + } + return parts; } - = + = @Override public boolean addSourceComment() { return false; Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/db2/DB2SQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2SQLTranslator.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2SQLTranslator.java 2009-02-25 18:27:23 UTC (rev 499) @@ -20,10 +20,11 @@ * 02110-1301 USA. */ = -/* - */ package org.teiid.connector.jdbc.db2; = +import java.util.Arrays; +import java.util.List; + import org.teiid.connector.jdbc.translator.AliasModifier; import org.teiid.connector.jdbc.translator.Translator; = @@ -36,6 +37,7 @@ import com.metamatrix.connector.language.IJoin; import com.metamatrix.connector.language.ILimit; import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.language.IJoin.JoinType; import com.metamatrix.connector.visitor.framework.HierarchyVisitor; @@ -53,28 +55,30 @@ registerFunctionModifier(SourceSystemFunctions.IFNULL, new AliasMo= difier("coalesce")); //$NON-NLS-1$ //$NON-NLS-2$ registerFunctionModifier(SourceSystemFunctions.SUBSTRING, new Alia= sModifier("substr")); //$NON-NLS-1$ //$NON-NLS-2$ } - = + = + @SuppressWarnings("unchecked") @Override - public String addLimitString(String queryCommand, ILimit limit) { - return queryCommand + " FETCH FIRST " + limit.getRowLimit() + " ROWS ONL= Y"; //$NON-NLS-1$ + public List translateLimit(ILimit limit, ExecutionContext context) { + return Arrays.asList("FETCH FIRST ", limit.getRowLimit(), " ROWS ONLY");= //$NON-NLS-1$ //$NON-NLS-2$ = } = @Override - public ICommand modifyCommand(ICommand command, ExecutionContext context) - throws ConnectorException { - HierarchyVisitor hierarchyVisitor =3D new HierarchyVisitor() { - @Override - public void visit(IJoin obj) { - if (obj.getJoinType() !=3D JoinType.CROSS_JOIN) { - return; + public ICommand modifyCommand(ICommand command, ExecutionContext context)= { + if (command instanceof IQuery) { + HierarchyVisitor hierarchyVisitor =3D new HierarchyVisitor(false) { + @Override + public void visit(IJoin obj) { + if (obj.getJoinType() !=3D JoinType.CROSS_JOIN) { + return; + } + ILiteral one =3D getLanguageFactory().createLiteral(1, TypeFacility.R= UNTIME_TYPES.INTEGER); + obj.getCriteria().add(getLanguageFactory().createCompareCriteria(Oper= ator.EQ, one, one)); + obj.setJoinType(JoinType.INNER_JOIN); } - ILiteral one =3D getLanguageFactory().createLiteral(1, TypeFacility.RU= NTIME_TYPES.INTEGER); - obj.getCriteria().add(getLanguageFactory().createCompareCriteria(Opera= tor.EQ, one, one)); - obj.setJoinType(JoinType.INNER_JOIN); - } - }; - = - command.acceptVisitor(hierarchyVisitor); + }; + = + command.acceptVisitor(hierarchyVisitor); + } return command; } = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/OracleSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleSQLTranslator.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleSQLTranslator.java 2009-02-25 18:27:23 UTC (rev 499) @@ -30,6 +30,7 @@ import java.sql.SQLException; import java.sql.Statement; import java.sql.Types; +import java.util.ArrayList; import java.util.List; = import org.teiid.connector.jdbc.JDBCPlugin; @@ -45,6 +46,7 @@ import com.metamatrix.connector.language.IGroup; import com.metamatrix.connector.language.IInsert; import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.IQueryCommand; import com.metamatrix.connector.language.ISetQuery.Operation; import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.visitor.util.SQLReservedWords; @@ -88,8 +90,7 @@ } = @Override - public ICommand modifyCommand(ICommand command, ExecutionContext conte= xt) - throws ConnectorException { + public ICommand modifyCommand(ICommand command, ExecutionContext conte= xt) throws ConnectorException { if (!(command instanceof IInsert)) { return command; } @@ -143,28 +144,38 @@ insert.getValues().add(index, sequenceElement); } return command; - } - + } + = @Override - public String addLimitString(String queryCommand, ILimit limit) { - StringBuffer limitQuery =3D new StringBuffer(queryCommand.length()); + public List translateCommand(ICommand command, ExecutionContext con= text) { + if (!(command instanceof IQueryCommand)) { + return null; + } + IQueryCommand queryCommand =3D (IQueryCommand)command; + if (queryCommand.getLimit() =3D=3D null) { + return null; + } + ILimit limit =3D queryCommand.getLimit(); + queryCommand.setLimit(null); + List parts =3D new ArrayList(); if (limit.getRowOffset() > 0) { - limitQuery.append("SELECT * FROM (SELECT VIEW_FOR_LIMIT.*, ROWNUM ROWNU= M_ FROM ("); + parts.add("SELECT * FROM (SELECT VIEW_FOR_LIMIT.*, ROWNUM ROWNUM_ FROM = ("); } else { - limitQuery.append("SELECT * FROM ("); + parts.add("SELECT * FROM ("); } - limitQuery.append(queryCommand); + parts.add(queryCommand); if (limit.getRowOffset() > 0) { - limitQuery.append(") VIEW_FOR_LIMIT WHERE ROWNUM <=3D ").append( - limit.getRowLimit() + limit.getRowOffset()).append(") WHERE ROWNUM_ >= ").append( - limit.getRowOffset()); + parts.add(") VIEW_FOR_LIMIT WHERE ROWNUM <=3D "); + parts.add(limit.getRowLimit() + limit.getRowOffset()); + parts.add(") WHERE ROWNUM_ > "); + parts.add(limit.getRowOffset()); } else { - limitQuery.append(") WHERE ROWNUM <=3D ").append( - limit.getRowLimit()); + parts.add(") WHERE ROWNUM <=3D "); + parts.add(limit.getRowLimit()); } - return limitQuery.toString(); + return parts; } - = + @Override public boolean useAsInGroupAlias(){ return false; Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/postgresql/PostgreSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLTranslator.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLTranslator.java 2009-02-25 18:27:23 UTC (rev 499) @@ -25,6 +25,8 @@ import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; +import java.util.Arrays; +import java.util.List; = import org.teiid.connector.jdbc.oracle.LeftOrRightFunctionModifier; import org.teiid.connector.jdbc.oracle.MonthOrDayNameFunctionModifier; @@ -39,6 +41,8 @@ import com.metamatrix.connector.language.IAggregate; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.IOrderBy; +import com.metamatrix.connector.language.ISetQuery; import com.metamatrix.connector.visitor.framework.HierarchyVisitor; import com.metamatrix.connector.visitor.util.SQLReservedWords; = @@ -107,14 +111,13 @@ return 6; } = - @Override - public String addLimitString(String queryCommand, ILimit limit) { - StringBuffer sb =3D new StringBuffer(queryCommand); - sb.append(" LIMIT ").append(limit.getRowLimit()); - if (limit.getRowOffset() > 0) { - sb.append(" OFFSET ").append(limit.getRowOffset()); - } - return sb.toString(); + @SuppressWarnings("unchecked") + @Override + public List translateLimit(ILimit limit, ExecutionContext context) { + if (limit.getRowOffset() > 0) { + return Arrays.asList("LIMIT ", limit.getRowLimit(), " OFFSET ", limi= t.getRowOffset()); //$NON-NLS-1$ //$NON-NLS-2$ = + } + return null; } = /** Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/sybase/SybaseSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseSQLTranslator.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseSQLTranslator.java 2009-02-25 18:27:23 UTC (rev 499) @@ -24,14 +24,21 @@ */ package org.teiid.connector.jdbc.sybase; = +import java.util.ArrayList; +import java.util.List; + import org.teiid.connector.jdbc.translator.AliasModifier; import org.teiid.connector.jdbc.translator.SubstringFunctionModifier; import org.teiid.connector.jdbc.translator.Translator; = import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.api.ConnectorException; +import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.SourceSystemFunctions; +import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ILimit; +import com.metamatrix.connector.language.IOrderBy; +import com.metamatrix.connector.language.IQueryCommand; = /** */ @@ -67,8 +74,28 @@ } = @Override - public String addLimitString(String queryCommand, ILimit limit) { - return "SELECT TOP " + limit.getRowLimit() + " * FROM (" + queryComma= nd + ") AS X"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + public List translateCommand(ICommand command, ExecutionContext con= text) { + if (!(command instanceof IQueryCommand)) { + return null; + } + IQueryCommand queryCommand =3D (IQueryCommand)command; + if (queryCommand.getLimit() =3D=3D null) { + return null; + } + ILimit limit =3D queryCommand.getLimit(); + IOrderBy orderBy =3D queryCommand.getOrderBy(); + queryCommand.setLimit(null); + queryCommand.setOrderBy(null); + List parts =3D new ArrayList(6); + parts.add("SELECT TOP "); + parts.add(limit.getRowLimit()); + parts.add(" * FROM ("); + parts.add(queryCommand); + parts.add(") AS X"); + if (orderBy !=3D null) { + parts.add(orderBy); + } + return parts; } = } Deleted: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/= jdbc/translator/FunctionReplacementVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/FunctionReplacementVisitor.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/FunctionReplacementVisitor.java 2009-02-25 18:27:23 UTC (rev 499) @@ -1,204 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.connector.jdbc.translator; - -import java.util.List; -import java.util.Map; - - -import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroupBy; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.IInlineView; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.IIsNullCriteria; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.ISearchedCaseExpression; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.language.ISubqueryCompareCriteria; -import com.metamatrix.connector.language.ISubqueryInCriteria; -import com.metamatrix.connector.visitor.framework.HierarchyVisitor; - -/** - */ -public class FunctionReplacementVisitor extends HierarchyVisitor { - - private Map functionModifiers; = - - /** - * Set the functon modifiers. = - * @param Map of function names to function modifiers. - */ - public FunctionReplacementVisitor(Map functionModifiers){ - super(); - this.functionModifiers =3D functionModifiers; - } - = - /* = - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.IAggregate) - */ - public void visit(IAggregate obj) { - super.visit(obj); - obj.setExpression(replaceFunction(obj.getExpression())); - } - = - public void visit(IInlineView obj) { - visitNode(obj.getQuery()); - } - - /* = - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.ICompareCriteria) - */ - public void visit(ICompareCriteria obj) { - super.visit(obj); - obj.setLeftExpression(replaceFunction(obj.getLeftExpression())); - obj.setRightExpression(replaceFunction(obj.getRightExpression())); - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IFunction) - */ - public void visit(IFunction obj) { - super.visit(obj); - List args =3D obj.getParameters(); - for(int i=3D0; i expressions =3D obj.getElements(); - = - for (int i=3D0; i rightExprs =3D obj.getRightExpressions(); - = - for(int i=3D0; i values =3D obj.getValues(); - = - for(int i=3D0; i functionModifiers; + private ExecutionContext context; + + /** + * Set the functon modifiers. = + * @param Map of function names to function modifiers. + */ + public ReplacementVisitor(ExecutionContext context, Translator transla= tor){ + this.translator =3D translator; + this.functionModifiers =3D translator.getFunctionModifiers(); + this.context =3D context; + } + = + /* = + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.IAggregate) + */ + public void visit(IAggregate obj) { + obj.setExpression(replaceFunction(obj.getExpression())); + } + = + public void visit(IInlineView obj) { + try { + obj.setQuery((IQueryCommand)translator.modifyCommand(obj.getQuery(), co= ntext)); + } catch (ConnectorException e) { + throw new MetaMatrixRuntimeException(e); + } + } + + /* = + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.ICompareCriteria) + */ + public void visit(ICompareCriteria obj) { + obj.setLeftExpression(replaceFunction(obj.getLeftExpression())); + obj.setRightExpression(replaceFunction(obj.getRightExpression())); + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IFunction) + */ + public void visit(IFunction obj) { + List args =3D obj.getParameters(); + for(int i=3D0; i expressions =3D obj.getElements(); + = + for (int i=3D0; i rightExprs =3D obj.getRightExpressions(); + = + for(int i=3D0; i values =3D obj.getValues(); + = + for(int i=3D0; i modifiers; private ExecutionContext context; private Translator translator; = @@ -73,11 +72,55 @@ private List preparedValues =3D new ArrayList(); private List preparedTypes =3D new ArrayList(); = + private Set recursionObjects =3D Collections.newSetFr= omMap(new IdentityHashMap()); + = public SQLConversionVisitor(Translator translator) { this.translator =3D translator; this.prepared =3D translator.usePreparedStatements(); - this.modifiers =3D translator.getFunctionModifiers(); } + = + @Override + public void append(ILanguageObject obj) { + if ((obj instanceof IFunction || obj instanceof ICommand || obj insta= nceof ILimit) && !recursionObjects.contains(obj)) { + recursionObjects.add(obj); + try { + List parts =3D null; + if (obj instanceof IFunction) { + IFunction function =3D (IFunction)obj; + Map functionModifiers =3D translator.= getFunctionModifiers(); + if (functionModifiers !=3D null) { + FunctionModifier modifier =3D functionModifiers.get(function.g= etName().toLowerCase()); + if (modifier !=3D null) { + parts =3D modifier.translate(function); + } + } + } else if (obj instanceof ICommand) { + parts =3D translator.translateCommand((ICommand)obj, context); + } else if (obj instanceof ILimit) { + parts =3D translator.translateLimit((ILimit)obj, context); + } + if (parts !=3D null) { + this.appendParts(parts); + return; + } + } finally { + recursionObjects.remove(obj); + } + } = + super.append(obj); + } + = + private void appendParts(List parts) { + Iterator iter =3D parts.iterator(); + while(iter.hasNext()) { + Object part =3D iter.next(); + if(part instanceof ILanguageObject) { + append((ILanguageObject)part); + } else { + buffer.append(part); + } + } + } = public void visit(IBulkInsert obj) { this.prepared =3D true; @@ -150,37 +193,10 @@ * preparedValues is now a list of procedure params instead of jus= t values */ this.preparedValues =3D obj.getParameters(); - super.buffer.append(generateSqlForStoredProcedure(obj)); + buffer.append(generateSqlForStoredProcedure(obj)); } = /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IFunction) - */ - public void visit(IFunction obj) { - if(this.modifiers !=3D null) { - FunctionModifier functionModifier =3D (FunctionModifier)this.m= odifiers.get(obj.getName().toLowerCase()); - if(functionModifier !=3D null) { - List parts =3D functionModifier.translate(obj); - = - // null means the FunctionModifier will rely on default tr= anslation - if (parts !=3D null) { - Iterator iter =3D parts.iterator(); - while(iter.hasNext()) { - Object part =3D iter.next(); - if(part instanceof String) { - buffer.append(part); - } else { - append((ILanguageObject)part); - } - } - return; - } = - } = - } = - super.visit(obj); - } - - /** * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.ILiteral) */ public void visit(ILiteral obj) { @@ -292,41 +308,12 @@ protected boolean useAsInGroupAlias() { return this.translator.useAsInGroupAlias(); } - = + = @Override - public void visit(IQuery obj) { - if (obj.getLimit() !=3D null) { - handleLimit(obj); - } else { - super.visit(obj); - } - } - = - @Override - public void visit(ISetQuery obj) { - if (obj.getLimit() !=3D null) { - handleLimit(obj); - } else { - super.visit(obj); - } - } - = - @Override protected boolean useParensForSetQueries() { return translator.useParensForSetQueries(); } - = - private void handleLimit(IQueryCommand obj) { - ILimit limit =3D obj.getLimit(); - obj.setLimit(null); - StringBuffer current =3D this.buffer; - this.buffer =3D new StringBuffer(); - append(obj); - current.append(this.translator.addLimitString(this.buffer.toString(),= limit)); - this.buffer =3D current; - obj.setLimit(limit); - } - = + = @Override protected String replaceElementName(String group, String element) { return translator.replaceElementName(group, element); Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/TranslatedCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/TranslatedCommand.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/TranslatedCommand.java 2009-02-25 18:27:23 UTC (rev 499) @@ -25,14 +25,13 @@ package org.teiid.connector.jdbc.translator; = import java.util.List; -import java.util.Map; = - import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.api.TypeFacility; import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.language.ILiteral; +import com.metamatrix.connector.visitor.framework.DelegatingHierarchyVisit= or; import com.metamatrix.connector.visitor.util.CollectorVisitor; = /** @@ -48,7 +47,7 @@ private List preparedTypes; = private SQLConversionVisitor sqlConversionVisitor; - private FunctionReplacementVisitor functionVisitor; + private ReplacementVisitor functionVisitor; private ExecutionContext context; private Translator sqlTranslator; = @@ -59,20 +58,11 @@ public TranslatedCommand(ExecutionContext context, Translator sqlTrans= lator){ this.context =3D context; this.sqlTranslator =3D sqlTranslator; - = - Map modifiers =3D sqlTranslator.getFunction= Modifiers(); this.sqlConversionVisitor =3D sqlTranslator.getSQLConversionVisito= r(); - sqlConversionVisitor.setExecutionContext(context); - this.functionVisitor =3D new FunctionReplacementVisitor(modifiers); + this.sqlConversionVisitor.setExecutionContext(context); + this.functionVisitor =3D new ReplacementVisitor(context, sqlTransl= ator); } = - public TranslatedCommand(ExecutionContext context, Translator sqlTrans= lator, SQLConversionVisitor sqlConversionVisitor, FunctionReplacementVisito= r functionVisitor) { - this.context =3D context; - this.sqlTranslator =3D sqlTranslator; - this.sqlConversionVisitor =3D sqlConversionVisitor; - this.functionVisitor =3D functionVisitor; - } - = /** * The method to cause this object to do it's thing. This method shou= ld * be called right after the constructor; afterward, all of the getter= methods @@ -89,7 +79,7 @@ = private String getSQL(ICommand command) throws ConnectorException { command =3D sqlTranslator.modifyCommand(command, context); - command.acceptVisitor(functionVisitor); + command.acceptVisitor(new DelegatingHierarchyVisitor(null, this.function= Visitor)); = if (sqlTranslator.usePreparedStatements() || hasBindValue(command)= ) { this.sqlConversionVisitor.setPrepared(true); @@ -167,5 +157,15 @@ public boolean isPrepared() { return prepared; } + = + @Override + public String toString() { + StringBuffer sb =3D new StringBuffer(); + if (prepared) { + sb.append("Prepared Values: ").append(preparedValues).append(" "); /= /$NON-NLS-1$ //$NON-NLS-2$ + } + sb.append("SQL: ").append(sql); //$NON-NLS-1$ + return sb.toString(); + } = } Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/Translator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/Translator.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/Translator.java 2009-02-25 18:27:23 UTC (rev 499) @@ -52,7 +52,9 @@ import com.metamatrix.connector.api.ValueTranslator; import com.metamatrix.connector.internal.ConnectorPropertyNames; import com.metamatrix.connector.language.ICommand; +import com.metamatrix.connector.language.IFunction; import com.metamatrix.connector.language.ILanguageFactory; +import com.metamatrix.connector.language.ILanguageObject; import com.metamatrix.connector.language.ILimit; import com.metamatrix.connector.language.IParameter; import com.metamatrix.connector.language.ISetQuery; @@ -192,6 +194,14 @@ return command; } = + public List translateCommand(ICommand command, ExecutionContext con= text) { + return null; + } + + public List translateLimit(ILimit limit, ExecutionContext context) { + return null; + } + = /** * Return a map of function name in lower case to FunctionModifier. * @return Map of function name to FunctionModifier. @@ -287,10 +297,6 @@ return useComments; } = = - public String addLimitString(String queryCommand, ILimit limit) { - return queryCommand + " " + limit.toString(); //$NON-NLS-1$ - } - = /** * Indicates whether group alias should be of the form * "...FROM groupA AS X" or "...FROM groupA X". Certain @@ -562,13 +568,25 @@ return new Float(value); } case TIME_CODE: { - return results.getTime(columnIndex, getDatabaseCalendar()= ); + Calendar cal =3D getDatabaseCalendar(); + if (cal !=3D null) { + return results.getTime(columnIndex, cal); + } + return results.getTime(columnIndex); } case DATE_CODE: { - return results.getDate(columnIndex, getDatabaseCalenda= r()); + Calendar cal =3D getDatabaseCalendar(); + if (cal !=3D null) { + return results.getDate(columnIndex, cal); + } + return results.getDate(columnIndex); } case TIMESTAMP_CODE: { - return results.getTimestamp(columnIndex, getDatabaseCa= lendar()); + Calendar cal =3D getDatabaseCalendar(); + if (cal !=3D null) { + return results.getTimestamp(columnIndex, cal); + } + return results.getTimestamp(columnIndex); } case BLOB_CODE: { try { @@ -635,13 +653,25 @@ return new Float(value); } case TIME_CODE: { - return results.getTime(parameterIndex, getDatabaseCale= ndar()); + Calendar cal =3D getDatabaseCalendar(); + if (cal !=3D null) { + return results.getTime(parameterIndex, cal); + } + return results.getTime(parameterIndex); } case DATE_CODE: { - return results.getDate(parameterIndex, getDatabaseCale= ndar()); + Calendar cal =3D getDatabaseCalendar(); + if (cal !=3D null) { + return results.getDate(parameterIndex, cal); + } + return results.getDate(parameterIndex); } case TIMESTAMP_CODE: { - return results.getTimestamp(parameterIndex, getDatabas= eCalendar()); + Calendar cal =3D getDatabaseCalendar(); + if (cal !=3D null) { + return results.getTimestamp(parameterIndex, cal); + } + return results.getTimestamp(parameterIndex); } case BLOB_CODE: { try { @@ -703,5 +733,5 @@ public SQLConversionVisitor getSQLConversionVisitor() { return new SQLConversionVisitor(this); } - + = } Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/access/TestAccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= access/TestAccessSQLTranslator.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= access/TestAccessSQLTranslator.java 2009-02-25 18:27:23 UTC (rev 499) @@ -66,7 +66,7 @@ = public void testRowLimit() throws Exception { String input =3D "select intkey from bqt1.smalla limit 100"; //$NO= N-NLS-1$ - String output =3D "SELECT TOP 100 SmallA.IntKey FROM SmallA"; //$= NON-NLS-1$ + String output =3D "SELECT TOP 100 * FROM (SELECT SmallA.IntKey FRO= M SmallA) AS X"; //$NON-NLS-1$ = helpTestVisitor( input, = @@ -76,7 +76,7 @@ = public void testRowLimit1() throws Exception { String input =3D "select distinct intkey from bqt1.smalla limit 10= 0"; //$NON-NLS-1$ - String output =3D "SELECT DISTINCT TOP 100 SmallA.IntKey FROM Smal= lA"; //$NON-NLS-1$ + String output =3D "SELECT TOP 100 * FROM (SELECT DISTINCT SmallA.I= ntKey FROM SmallA) AS X"; //$NON-NLS-1$ = helpTestVisitor( input, = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/sqlserver/TestSqlServerConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sqlserver/TestSqlServerConversionVisitor.java 2009-02-25 18:12:40 UTC (rev = 498) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sqlserver/TestSqlServerConversionVisitor.java 2009-02-25 18:27:23 UTC (rev = 499) @@ -22,48 +22,29 @@ = package org.teiid.connector.jdbc.sqlserver; = -import java.util.Map; import java.util.Properties; = +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; import org.teiid.connector.jdbc.MetadataFactory; -import org.teiid.connector.jdbc.sqlserver.SqlServerSQLTranslator; -import org.teiid.connector.jdbc.translator.FunctionReplacementVisitor; -import org.teiid.connector.jdbc.translator.SQLConversionVisitor; import org.teiid.connector.jdbc.translator.TranslatedCommand; = -import junit.framework.TestCase; - import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICommand; = /** */ -public class TestSqlServerConversionVisitor extends TestCase { +public class TestSqlServerConversionVisitor { = - private static final Properties EMPTY_PROPERTIES =3D new Properties(); - private static Map MODIFIERS; + private static SqlServerSQLTranslator trans =3D new SqlServerSQLTransl= ator(); = - static { - SqlServerSQLTranslator trans =3D new SqlServerSQLTranslator(); - = - try { - trans.initialize(EnvironmentUtility.createEnvironment(new Prop= erties(), false)); - } catch(ConnectorException e) { - e.printStackTrace(); - } - = - MODIFIERS =3D trans.getFunctionModifiers(); + @BeforeClass + public static void setup() throws ConnectorException { + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); } = - /** - * Constructor for TestSqlServerConversionVisitor. - * @param name - */ - public TestSqlServerConversionVisitor(String name) { - super(name); - } - public String getTestVDB() { return MetadataFactory.PARTS_VDB; } @@ -72,67 +53,54 @@ return MetadataFactory.BQT_VDB; } = - public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring expectedOutput) throws ConnectorException { - helpTestVisitor(vdb, input, modifiers, new String[] {expectedOutput}, EM= PTY_PROPERTIES); + public void helpTestVisitor(String vdb, String input, String expectedO= utput) throws ConnectorException { + helpTestVisitor(vdb, input, new String[] {expectedOutput}); } = - public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring[] expectedOutputs, Properties props) throws ConnectorException { - // Convert from sql to objects + public void helpTestVisitor(String vdb, String input, String[] expecte= dOutputs) throws ConnectorException { ICommand obj =3D MetadataFactory.helpTranslate(vdb, input); - = - // Apply function replacement - FunctionReplacementVisitor funcVisitor =3D new FunctionReplacement= Visitor(modifiers); - = - SqlServerSQLTranslator trans =3D new SqlServerSQLTranslator(); - trans.initialize(EnvironmentUtility.createEnvironment(props, false= )); - // Convert back to SQL - SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); - = - TranslatedCommand tc =3D new TranslatedCommand(EnvironmentUtility.= createSecurityContext("user"), trans, sqlVisitor, funcVisitor); //$NON-NLS-= 1$ + TranslatedCommand tc =3D new TranslatedCommand(EnvironmentUtility.= createSecurityContext("user"), trans); //$NON-NLS-1$ tc.translateCommand(obj); - = - // Check stuff - - assertEquals("Did not get correct sql", expectedOutputs[0], tc.get= Sql()); //$NON-NLS-1$ + Assert.assertEquals("Did not get correct sql", expectedOutputs[0],= tc.getSql()); //$NON-NLS-1$ } = + @Test public void testModFunction() throws Exception { String input =3D "SELECT mod(CONVERT(PART_ID, INTEGER), 13) FROM p= arts"; //$NON-NLS-1$ String output =3D "SELECT (convert(int, PARTS.PART_ID) % 13) FROM = PARTS"; //$NON-NLS-1$ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, output); } = = + @Test public void testConcatFunction() throws Exception { String input =3D "SELECT concat(part_name, 'b') FROM PARTS"; //$NO= N-NLS-1$ String output =3D "SELECT (PARTS.PART_NAME + 'b') FROM PARTS"; //$= NON-NLS-1$ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, output); } = = + @Test public void testDayOfMonthFunction() throws Exception { String input =3D "SELECT dayofmonth(convert(PARTS.PART_ID, date)) = FROM PARTS"; //$NON-NLS-1$ String output =3D "SELECT day(convert(datetime, PARTS.PART_ID)) FR= OM PARTS"; //$NON-NLS-1$ = helpTestVisitor(getTestVDB(), input, = - MODIFIERS, output); } = + @Test public void testRowLimit() throws Exception { String input =3D "select intkey from bqt1.smalla limit 100"; //$NO= N-NLS-1$ String output =3D "SELECT TOP 100 * FROM (SELECT SmallA.IntKey FRO= M SmallA) AS X"; //$NON-NLS-1$ = helpTestVisitor(getBQTVDB(), input, = - MODIFIERS, output); = } = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/sybase/TestSybaseSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sybase/TestSybaseSQLConversionVisitor.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sybase/TestSybaseSQLConversionVisitor.java 2009-02-25 18:27:23 UTC (rev 499) @@ -22,30 +22,28 @@ = package org.teiid.connector.jdbc.sybase; = +import static org.junit.Assert.assertEquals; + import java.util.Properties; = +import org.junit.BeforeClass; +import org.junit.Test; import org.teiid.connector.jdbc.MetadataFactory; -import org.teiid.connector.jdbc.sybase.SybaseSQLTranslator; -import org.teiid.connector.jdbc.translator.FunctionReplacementVisitor; -import org.teiid.connector.jdbc.translator.SQLConversionVisitor; import org.teiid.connector.jdbc.translator.TranslatedCommand; = -import junit.framework.TestCase; - import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.language.ICommand; = /** */ -public class TestSybaseSQLConversionVisitor extends TestCase { +public class TestSybaseSQLConversionVisitor { = - /** - * Constructor for TestSqlServerConversionVisitor. - * @param name - */ - public TestSybaseSQLConversionVisitor(String name) { - super(name); + private static SybaseSQLTranslator trans =3D new SybaseSQLTranslator(); + = + @BeforeClass + public static void setup() throws ConnectorException { + trans.initialize(EnvironmentUtility.createEnvironment(new Properti= es(), false)); } = public String getTestVDB() { @@ -60,30 +58,17 @@ // Convert from sql to objects ICommand obj =3D MetadataFactory.helpTranslate(vdb, input); = - // Apply function replacement - SybaseSQLTranslator trans =3D new SybaseSQLTranslator(); - try { - trans.initialize(EnvironmentUtility.createEnvironment(new Properties(),= false)); - } catch (ConnectorException e1) { - throw new RuntimeException(e1); - } - FunctionReplacementVisitor funcVisitor =3D new FunctionReplacement= Visitor(trans.getFunctionModifiers()); - - // Convert back to SQL - SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = - TranslatedCommand tc =3D new TranslatedCommand(EnvironmentUtility.= createSecurityContext("user"), trans, sqlVisitor, funcVisitor); + TranslatedCommand tc =3D new TranslatedCommand(EnvironmentUtility.= createSecurityContext("user"), trans); try { tc.translateCommand(obj); } catch (ConnectorException e) { throw new RuntimeException(e); } = - // Check stuff -// System.out.println("in: " + input); //$NON-NLS-1$ - //System.out.println("out: " + tc.getSql()); //$NON-NLS-1$ assertEquals("Did not get correct sql", expectedOutput, tc.getSql(= )); //$NON-NLS-1$ } = + @Test public void testModFunction() { String input =3D "SELECT mod(CONVERT(PART_ID, INTEGER), 13) FROM p= arts"; //$NON-NLS-1$ //String output =3D "SELECT (PARTS.PART_ID % 13) FROM PARTS"; //$= NON-NLS-1$ @@ -94,6 +79,7 @@ output); } = = + @Test public void testConcatFunction() { String input =3D "SELECT concat(part_name, 'b') FROM PARTS"; //$NO= N-NLS-1$ String output =3D "SELECT (PARTS.PART_NAME + 'b') FROM PARTS"; //$= NON-NLS-1$ @@ -103,6 +89,7 @@ output); } = = + @Test public void testLcaseFunction() { String input =3D "SELECT lcase(PART_NAME) FROM PARTS"; //$NON-NLS-= 1$ String output =3D "SELECT lower(PARTS.PART_NAME) FROM PARTS"; //$N= ON-NLS-1$ @@ -111,6 +98,7 @@ output); } = + @Test public void testUcaseFunction() { String input =3D "SELECT ucase(PART_NAME) FROM PARTS"; //$NON-NLS-= 1$ String output =3D "SELECT upper(PARTS.PART_NAME) FROM PARTS"; //$N= ON-NLS-1$ @@ -120,6 +108,7 @@ output); } = + @Test public void testLengthFunction() { String input =3D "SELECT length(PART_NAME) FROM PARTS"; //$NON-NLS= -1$ String output =3D "SELECT char_length(PARTS.PART_NAME) FROM PARTS"= ; //$NON-NLS-1$ @@ -129,6 +118,7 @@ output); } = + @Test public void testSubstring2ArgFunction() { String input =3D "SELECT substring(PART_NAME, 3) FROM PARTS"; //$N= ON-NLS-1$ String output =3D "SELECT substring(PARTS.PART_NAME, 3, char_lengt= h(PARTS.PART_NAME)) FROM PARTS"; //$NON-NLS-1$ @@ -138,6 +128,7 @@ output); } = + @Test public void testSubstring3ArgFunction() { String input =3D "SELECT substring(PART_NAME, 3, 5) FROM PARTS"; /= /$NON-NLS-1$ String output =3D "SELECT substring(PARTS.PART_NAME, 3, 5) FROM PA= RTS"; //$NON-NLS-1$ @@ -147,6 +138,7 @@ output); } = + @Test public void testConvertFunctionInteger() { String input =3D "SELECT convert(PARTS.PART_ID, integer) FROM PART= S"; //$NON-NLS-1$ //String output =3D "SELECT PARTS.PART_ID FROM PARTS"; //$NON-NLS-= 1$ @@ -157,6 +149,7 @@ output); } = + @Test public void testConvertFunctionChar() { String input =3D "SELECT convert(PART_NAME, char) FROM PARTS"; //$= NON-NLS-1$ String output =3D "SELECT convert(char, PARTS.PART_NAME) FROM PART= S"; //$NON-NLS-1$ @@ -166,6 +159,7 @@ output); } = + @Test public void testConvertFunctionBoolean() { String input =3D "SELECT convert(PART_ID, boolean) FROM PARTS"; //= $NON-NLS-1$ String output =3D "SELECT convert(bit, PARTS.PART_ID) FROM PARTS";= //$NON-NLS-1$ @@ -175,6 +169,7 @@ output); } = + @Test public void testIfNullFunction() { String input =3D "SELECT ifnull(PART_NAME, 'abc') FROM PARTS"; //$= NON-NLS-1$ String output =3D "SELECT isnull(PARTS.PART_NAME, 'abc') FROM PART= S"; //$NON-NLS-1$ @@ -184,24 +179,28 @@ output); } = = + @Test public void testDateLiteral() { helpTestVisitor(getTestVDB(), "select {d'2002-12-31'} FROM parts", //$NON-NLS-1$ "SELECT {d'2002-12-31'} FROM PARTS"); //$NON-NLS-1$ } = + @Test public void testTimeLiteral() { helpTestVisitor(getTestVDB(), "select {t'13:59:59'} FROM parts", //$NON-NLS-1$ "SELECT {ts'1970-01-01 13:59:59'} FROM PARTS"); //$NON-NLS-1$ } = + @Test public void testTimestampLiteral() { helpTestVisitor(getTestVDB(), "select {ts'2002-12-31 13:59:59'} FROM parts", //$NON-NLS-1$ "SELECT {ts'2002-12-31 13:59:59.0'} FROM PARTS"); //$NON-NLS-1$ } = + @Test public void testDefect12120() { helpTestVisitor(getBQTVDB(), "SELECT BQT1.SmallA.IntKey FROM BQT1.SmallA WHERE BQT1.SmallA.= BooleanValue IN ({b'false'}, {b'true'}) ORDER BY IntKey", //$NON-NLS-1$ @@ -209,6 +208,7 @@ = } = + @Test public void testConvertFunctionString() throws Exception { String input =3D "SELECT convert(PARTS.PART_ID, integer) FROM PART= S"; //$NON-NLS-1$ String output =3D "SELECT convert(int, PARTS.PART_ID) FROM PARTS";= //$NON-NLS-1$ @@ -217,7 +217,8 @@ input, = output); } - = + = + @Test public void testNonIntMod() throws Exception { String input =3D "select mod(intkey/1.5, 3) from bqt1.smalla"; //$NON= -NLS-1$ String output =3D "SELECT ((convert(float, SmallA.IntKey) / 1.5) -= (floor(((convert(float, SmallA.IntKey) / 1.5) / 3.0)) * 3.0)) FROM SmallA"= ; //$NON-NLS-1$ Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/util/TestFunctionReplacementVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= util/TestFunctionReplacementVisitor.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= util/TestFunctionReplacementVisitor.java 2009-02-25 18:27:23 UTC (rev 499) @@ -27,11 +27,14 @@ = import org.teiid.connector.jdbc.MetadataFactory; import org.teiid.connector.jdbc.translator.DropFunctionModifier; -import org.teiid.connector.jdbc.translator.FunctionReplacementVisitor; +import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.jdbc.translator.ReplacementVisitor; +import org.teiid.connector.jdbc.translator.Translator; = import junit.framework.TestCase; = import com.metamatrix.connector.language.ICommand; +import com.metamatrix.connector.visitor.framework.DelegatingHierarchyVisit= or; = /** */ @@ -43,7 +46,6 @@ */ public TestFunctionReplacementVisitor(String name) { super(name); - System.setProperty("metamatrix.config.none", "true"); } = public Map getModifierSet1() { @@ -58,11 +60,16 @@ return MetadataFactory.PARTS_VDB; } = - public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring expectedOutput) { + public void helpTestVisitor(String vdb, String input, final Map modifi= ers, String expectedOutput) { ICommand obj =3D MetadataFactory.helpTranslate(vdb, input); = - FunctionReplacementVisitor visitor =3D new FunctionReplacementVisi= tor(modifiers); - obj.acceptVisitor(visitor); + ReplacementVisitor visitor =3D new ReplacementVisitor(null, new Tr= anslator() { + @Override + public Map getFunctionModifiers() { + return modifiers; + } + }); + obj.acceptVisitor(new DelegatingHierarchyVisitor(null, visitor)); = //System.out.println(obj); = assertEquals("Did not get expected sql", expectedOutput, obj.toStr= ing()); //$NON-NLS-1$ Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-= 02-25 18:12:40 UTC (rev 498) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-= 02-25 18:27:23 UTC (rev 499) @@ -70,7 +70,7 @@ * This method is overridden to modify the incoming command to add the= hint to the ISelect in the command. */ @Override - public ICommand modifyCommand(ICommand command, com.metamatrix.connector.= api.ExecutionContext context) throws ConnectorException { + public ICommand modifyCommand(ICommand command, ExecutionContext context)= throws ConnectorException { if (command instanceof IQuery) { IQuery query =3D (IQuery)command; = Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/extension/TestSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-25 18:27:23 UTC (rev 499) @@ -22,18 +22,15 @@ = package com.metamatrix.connector.jdbc.extension; = -import java.util.HashMap; -import java.util.Map; import java.util.Properties; = +import junit.framework.TestCase; + import org.teiid.connector.jdbc.JDBCPropertyNames; -import org.teiid.connector.jdbc.translator.FunctionReplacementVisitor; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.jdbc.translator.Translator; = -import junit.framework.TestCase; - import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.connector.api.ConnectorException; @@ -96,20 +93,20 @@ return util.parseCommand(sql); } = - public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring expectedOutput) { - helpTestVisitor(vdb, input, modifiers, expectedOutput, false); + public void helpTestVisitor(String vdb, String input, String expectedO= utput) { + helpTestVisitor(vdb, input, expectedOutput, false); } = - public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring expectedOutput, boolean useMetadata) { - helpTestVisitor(vdb, input, modifiers, expectedOutput, useMetadata= , false); + public void helpTestVisitor(String vdb, String input, String expectedO= utput, boolean useMetadata) { + helpTestVisitor(vdb, input, expectedOutput, useMetadata, false); } = - public void helpTestVisitor(String vdb, String input, Map modifiers, S= tring expectedOutput, boolean useMetadata, boolean usePreparedStatement) { + public void helpTestVisitor(String vdb, String input, String expectedO= utput, boolean useMetadata, boolean usePreparedStatement) { // Convert from sql to objects ICommand obj =3D helpTranslate(vdb, input); = try { - helpTestVisitorWithCommand(modifiers, expectedOutput, obj, useMetadata,= usePreparedStatement); + helpTestVisitorWithCommand(expectedOutput, obj, useMetadata, usePrepare= dStatement); } catch (ConnectorException e) { throw new RuntimeException(e); } = @@ -128,28 +125,24 @@ } = = /** = - * @param modifiers * @param expectedOutput - * @param obj + * @param obj * @throws ConnectorException = * @since 4.2 */ - private void helpTestVisitorWithCommand(Map modifiers, - String expectedOutput, + private void helpTestVisitorWithCommand(String expectedOutput, ICommand obj, - boolean useMetadata, boolean u= sePreparedStatement) throws ConnectorException { + boolean useMetadata, + boolean usePreparedStatement) = throws ConnectorException { // Apply function replacement - FunctionReplacementVisitor funcVisitor =3D new FunctionReplacement= Visitor(modifiers); Translator trans =3D new Translator(); Properties p =3D new Properties(); if (usePreparedStatement) { p.setProperty(JDBCPropertyNames.USE_BIND_VARIABLES, Boolean.TRUE.= toString()); } trans.initialize(EnvironmentUtility.createEnvironment(p, false)); - // Convert back to SQL - SQLConversionVisitor sqlVisitor =3D trans.getSQLConversionVisitor(= ); = - TranslatedCommand tc =3D new TranslatedCommand(new FakeExecutionCo= ntextImpl(), trans, sqlVisitor, funcVisitor); + TranslatedCommand tc =3D new TranslatedCommand(new FakeExecutionCo= ntextImpl(), trans); tc.translateCommand(obj); = assertEquals("Did not get correct sql", expectedOutput, tc.getSql(= )); //$NON-NLS-1$ @@ -158,252 +151,216 @@ public void testSimple() { helpTestVisitor(getTestVDB(), "select part_name from parts", //$NON-NLS-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS"); //$NON-NLS-1$ } = public void testAliasInSelect() { helpTestVisitor(getTestVDB(), "select part_name as x from parts", //$NON-NLS-1$ - new HashMap(), "SELECT PARTS.PART_NAME AS x FROM PARTS"); //$NON-NLS-1$ } = public void testAliasedGroup() { helpTestVisitor(getTestVDB(), "select y.part_name from parts y", //$NON-NLS-1$ - new HashMap(), "SELECT y.PART_NAME FROM PARTS AS y"); //$NON-NLS-1$ } = public void testAliasedGroupAndElement() { helpTestVisitor(getTestVDB(), "select y.part_name AS z from parts y", //$NON-NLS-1$ - new HashMap(), "SELECT y.PART_NAME AS z FROM PARTS AS y"); //$NON-NLS-1$ } = public void testLiteralString() { helpTestVisitor(getTestVDB(), "select 'x' from parts", //$NON-NLS-1$ - new HashMap(), "SELECT 'x' FROM PARTS"); //$NON-NLS-1$ } = public void testLiteralInteger() { helpTestVisitor(getTestVDB(), "select 5 from parts", //$NON-NLS-1$ - new HashMap(), "SELECT 5 FROM PARTS"); //$NON-NLS-1$ } = public void testLiteralFloat() { helpTestVisitor(getTestVDB(), "select 5.2 from parts", //$NON-NLS-1$ - new HashMap(), "SELECT 5.2 FROM PARTS"); //$NON-NLS-1$ } = public void testLiteralLowFloat() { helpTestVisitor(getTestVDB(), "select 0.012 from parts", //$NON-NLS-1$ - new HashMap(), "SELECT 0.012 FROM PARTS"); //$NON-NLS-1$ } = public void testLiteralLowFloat2() { helpTestVisitor(getTestVDB(), "select 0.00012 from parts", //$NON-NLS-1$ - new HashMap(), "SELECT 0.00012 FROM PARTS"); //$NON-NLS-1$ } = = public void testLiteralHighFloat() { helpTestVisitor(getTestVDB(), "select 12345.123 from parts", //$NON-NLS-1$ - new HashMap(), "SELECT 12345.123 FROM PARTS"); //$NON-NLS-1$ } = public void testLiteralHighFloat2() { helpTestVisitor(getTestVDB(), "select 1234567890.1234567 from parts", //$NON-NLS-1$ - new HashMap(), "SELECT 1234567890.1234567 FROM PARTS"); //$NON-NLS-1$ } = public void testLiteralBoolean() { helpTestVisitor(getTestVDB(), "select {b'true'}, {b'false'} from parts", //$NON-NLS-1$ - new HashMap(), "SELECT 1, 0 FROM PARTS"); //$NON-NLS-1$ } = public void testLiteralDate() { helpTestVisitor(getTestVDB(), "select {d'2003-12-31'} from parts", //$NON-NLS-1$ - new HashMap(), "SELECT {d'2003-12-31'} FROM PARTS"); //$NON-NLS-1$ } = public void testLiteralTime() { helpTestVisitor(getTestVDB(), "select {t'23:59:59'} from parts", //$NON-NLS-1$ - new HashMap(), "SELECT {t'23:59:59'} FROM PARTS"); //$NON-NLS-1$ } = public void testLiteralNull() { helpTestVisitor(getTestVDB(), "select null from parts", //$NON-NLS-1$ - new HashMap(), "SELECT NULL FROM PARTS"); //$NON-NLS-1$ } = public void testLiteralTimestamp() { helpTestVisitor(getTestVDB(), "select {ts'2003-12-31 23:59:59.123'} from parts", //$NON-NLS-= 1$ - new HashMap(), "SELECT {ts'2003-12-31 23:59:59.123'} FROM PARTS"); //$NON-NLS= -1$ } = public void testSQL89Join() { helpTestVisitor(getTestVDB(), "select p.part_name from parts p, supplier_parts s where p.par= t_id =3D s.part_id", //$NON-NLS-1$ - new HashMap(), "SELECT p.PART_NAME FROM PARTS AS p, SUPPLIER_PARTS AS s WHERE= p.PART_ID =3D s.PART_ID"); //$NON-NLS-1$ } = public void testSQL92Join() { helpTestVisitor(getTestVDB(), "select p.part_name from parts p join supplier_parts s on p.pa= rt_id =3D s.part_id", //$NON-NLS-1$ - new HashMap(), "SELECT p.PART_NAME FROM PARTS AS p INNER JOIN SUPPLIER_PARTS = AS s ON p.PART_ID =3D s.PART_ID"); //$NON-NLS-1$ } = public void testSelfJoin() { helpTestVisitor(getTestVDB(), "select p.part_name from parts p join parts p2 on p.part_id = =3D p2.part_id", //$NON-NLS-1$ - new HashMap(), "SELECT p.PART_NAME FROM PARTS AS p INNER JOIN PARTS AS p2 ON = p.PART_ID =3D p2.PART_ID"); //$NON-NLS-1$ } = public void testRightOuterJoin() { helpTestVisitor(getTestVDB(), "select p.part_name from parts p right join supplier_parts s o= n p.part_id =3D s.part_id", //$NON-NLS-1$ - new HashMap(), "SELECT p.PART_NAME FROM SUPPLIER_PARTS AS s LEFT OUTER JOIN P= ARTS AS p ON p.PART_ID =3D s.PART_ID"); //$NON-NLS-1$ } = public void testLeftOuterJoin() { helpTestVisitor(getTestVDB(), "select p.part_name from parts p left join supplier_parts s on= p.part_id =3D s.part_id", //$NON-NLS-1$ - new HashMap(), "SELECT p.PART_NAME FROM PARTS AS p LEFT OUTER JOIN SUPPLIER_P= ARTS AS s ON p.PART_ID =3D s.PART_ID"); //$NON-NLS-1$ } = public void testFullOuterJoin() { helpTestVisitor(getTestVDB(), "select p.part_name from parts p full join supplier_parts s on= p.part_id =3D s.part_id", //$NON-NLS-1$ - new HashMap(), "SELECT p.PART_NAME FROM PARTS AS p FULL OUTER JOIN SUPPLIER_P= ARTS AS s ON p.PART_ID =3D s.PART_ID"); //$NON-NLS-1$ } = public void testCompare1() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id =3D 'x'", //$NON-NL= S-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID =3D 'x'= "); //$NON-NLS-1$ } = public void testCompare2() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id <> 'x'", //$NON-NLS= -1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID <> 'x'"= ); //$NON-NLS-1$ } = public void testCompare3() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id < 'x'", //$NON-NLS-= 1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID < 'x'")= ; //$NON-NLS-1$ } = public void testCompare4() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id <=3D 'x'", //$NON-N= LS-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID <=3D 'x= '"); //$NON-NLS-1$ } = public void testCompare5() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id > 'x'", //$NON-NLS-= 1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID > 'x'")= ; //$NON-NLS-1$ } = public void testCompare6() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id >=3D 'x'", //$NON-N= LS-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID >=3D 'x= '"); //$NON-NLS-1$ } = public void testIn1() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id in ('x')", //$NON-N= LS-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID =3D 'x'= "); //$NON-NLS-1$ } = public void testIn2() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id in ('x', 'y')", //$= NON-NLS-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID IN ('x'= , 'y')"); //$NON-NLS-1$ } = public void testIn3() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id not in ('x', 'y')",= //$NON-NLS-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID NOT IN = ('x', 'y')"); //$NON-NLS-1$ } = public void testIsNull1() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id is null", //$NON-NL= S-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID IS NULL= "); //$NON-NLS-1$ } = public void testIsNull2() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id is not null", //$NO= N-NLS-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PART_ID IS NOT = NULL"); //$NON-NLS-1$ } = public void testInsertNull() { helpTestVisitor(getTestVDB(), "insert into parts (part_id, part_name, part_color, part_weigh= t) values ('a', null, 'c', 'd')", //$NON-NLS-1$ - new HashMap(), "INSERT INTO PARTS (PART_ID, PART_NAME, PART_COLOR, PART_WEIGH= T) VALUES ('a', NULL, 'c', 'd')"); //$NON-NLS-1$ } = public void testUpdateNull() { helpTestVisitor(getTestVDB(), "update parts set part_weight =3D null where part_color =3D 'b= '", //$NON-NLS-1$ - new HashMap(), "UPDATE PARTS SET PART_WEIGHT =3D NULL WHERE PARTS.PART_COLOR = =3D 'b'"); //$NON-NLS-1$ } = public void testUpdateWhereNull() { helpTestVisitor(getTestVDB(), "update parts set part_weight =3D 'a' where part_weight =3D nu= ll", //$NON-NLS-1$ - new HashMap(), "UPDATE PARTS SET PART_WEIGHT =3D 'a' WHERE NULL <> NULL"); //= $NON-NLS-1$ } = @@ -427,41 +384,41 @@ = ICommand result =3D new LanguageBridgeFactory(metadata).translate= (command); = - helpTestVisitorWithCommand(new HashMap(), "SELECT PARTS.PART_NAME = FROM PARTS GROUP BY concat(PARTS.PART_ID, 'a')", = - result, //$NON-NLS-1$ - false, false); + helpTestVisitorWithCommand("SELECT PARTS.PART_NAME FROM PARTS GROU= P BY concat(PARTS.PART_ID, 'a')", result, = + false, //$NON-NLS-1$ + false); } = public void testPreparedStatementCreationWithUpdate() { helpTestVisitor(getTestVDB(), "update parts set part_weight =3D 'a' where part_w= eight < 5", //$NON-NLS-1$ - new HashMap(), "UPDATE PARTS SET PART_WEIGHT =3D ? WHERE PARTS.PA= RT_WEIGHT < ?", - false, true); //$NON-NLS-1$ + false, + true); //$NON-NLS-1$ } = public void testPreparedStatementCreationWithInsert() { helpTestVisitor(getTestVDB(), "insert into parts (part_weight) values (5)", //$N= ON-NLS-1$ - new HashMap(), "INSERT INTO PARTS (PART_WEIGHT) VALUES (?)", - false, true); //$NON-NLS-1$ + false, + true); //$NON-NLS-1$ } = public void testPreparedStatementCreationWithSelect() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_id not in = ('x', 'y') and part_weight < 6", //$NON-NLS-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE (PARTS.PA= RT_ID NOT IN (?, ?)) AND (PARTS.PART_WEIGHT < ?)", - false, true); //$NON-NLS-1$ + false, + true); //$NON-NLS-1$ } = public void testPreparedStatementCreationWithLike() { helpTestVisitor(getTestVDB(), "select part_name from parts where part_name like = '%foo'", //$NON-NLS-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PAR= T_NAME LIKE ?", - false, true); //$NON-NLS-1$ + false, + true); //$NON-NLS-1$ } = /** @@ -471,9 +428,9 @@ public void testPreparedStatementCreationWithLeftConstant() { helpTestVisitor(getTestVDB(), "select part_name from parts where 'x' =3D 'y'", /= /$NON-NLS-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE 1 =3D ?", - false, true); //$NON-NLS-1$ + false, + true); //$NON-NLS-1$ } = /** @@ -483,17 +440,17 @@ public void testPreparedStatementCreationWithFunction() { helpTestVisitor(getTestVDB(), "select part_name from parts where concat(part_nam= e, 'x') =3D concat('y', part_weight)", //$NON-NLS-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE concat(PA= RTS.PART_NAME, 'x') =3D concat('y', PARTS.PART_WEIGHT)", - false, true); //$NON-NLS-1$ + false, + true); //$NON-NLS-1$ } = public void testPreparedStatementCreationWithCase() { helpTestVisitor(getTestVDB(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PAR= T_WEIGHT =3D CASE WHEN PARTS.PART_NAME=3D'a' THEN 'b' ELSE 'c' END", //$NON= -NLS-1$ - new HashMap(), "SELECT PARTS.PART_NAME FROM PARTS WHERE PARTS.PAR= T_WEIGHT =3D CASE WHEN PARTS.PART_NAME =3D ? THEN 'b' ELSE 'c' END", - false, true); //$NON-NLS-1$ + false, + true); //$NON-NLS-1$ } = public void testVisitIDeleteWithComment() throws Exception { --===============7268071697799076921==-- From teiid-commits at lists.jboss.org Wed Feb 25 13:27:27 2009 Content-Type: multipart/mixed; boundary="===============7120312361733064972==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r500 - in trunk/connectors/connector-jdbc/src: test/java and 1 other directory. Date: Wed, 25 Feb 2009 13:27:26 -0500 Message-ID: --===============7120312361733064972== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-25 13:27:26 -0500 (Wed, 25 Feb 2009) New Revision: 500 Removed: trunk/connectors/connector-jdbc/src/main/java/com/ trunk/connectors/connector-jdbc/src/test/java/com/ Log: TEIID-164 fixes from rewiring integration tests --===============7120312361733064972==-- From teiid-commits at lists.jboss.org Wed Feb 25 14:09:44 2009 Content-Type: multipart/mixed; boundary="===============7049253674202277024==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r501 - in trunk: connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc and 1 other directories. Date: Wed, 25 Feb 2009 14:09:44 -0500 Message-ID: --===============7049253674202277024== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-25 14:09:43 -0500 (Wed, 25 Feb 2009) New Revision: 501 Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/TestPropertie= sUtils.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCConnector.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/T= estJDBCConnector.java Log: TEIID-164 fixes from rewiring integration tests Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/TestPr= opertiesUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/test/java/com/metamatrix/common/util/TestProperti= esUtils.java 2009-02-25 18:27:26 UTC (rev 500) +++ trunk/common-core/src/test/java/com/metamatrix/common/util/TestProperti= esUtils.java 2009-02-25 19:09:43 UTC (rev 501) @@ -24,6 +24,7 @@ = import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; @@ -670,4 +671,61 @@ assertEquals("Property 'x' with value 'y' is not a valid Integer.", = e.getMessage()); } } + = + static class Bean { + private int prop; + private String prop1; + private double prop2; + private List prop3; + = + public int getProp() { + return prop; + } + public void setProp(int prop) { + this.prop =3D prop; + } + public String getProp1() { + return prop1; + } + public void setProp1(String prop1) { + this.prop1 =3D prop1; + } + public double getProp2() { + return prop2; + } + public void setProp2(double prop2) { + this.prop2 =3D prop2; + } + public List getProp3() { + return prop3; + } + public void setProp3(List prop3) { + this.prop3 =3D prop3; + } + } + = + public void testSetBeanProperties() { + Bean bean =3D new Bean(); + Properties p =3D new Properties(); + p.setProperty("prop", "0"); + p.setProperty("prop1", "1"); + p.setProperty("prop2", "2"); + p.setProperty("prop3", "3"); + = + PropertiesUtils.setBeanProperties(bean, p, null); + = + assertEquals(0, bean.getProp()); + assertEquals("1", bean.getProp1()); + assertEquals(2d, bean.getProp2()); + assertEquals(Arrays.asList("3"), bean.getProp3()); + = + p.setProperty("prop", "?"); + = + try { + PropertiesUtils.setBeanProperties(bean, p, null); + fail("expected exception"); + } catch (InvalidPropertyException e) { + = + } + } } Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCConnector.java 2009-02-25 18:27:26 UTC (rev 500) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCConnector.java 2009-02-25 19:09:43 UTC (rev 501) @@ -200,8 +200,13 @@ } catch (SQLException e) { throw new ConnectorException(e); } - return new JDBCSourceConnection(conn, this.environment, sqlTranslator); + return createJDBCSourceConnection(conn, this.environment, this.sqlTransl= ator); } + + public Connection createJDBCSourceConnection(java.sql.Connection conn, Co= nnectorEnvironment env, Translator trans) + throws ConnectorException { + return new JDBCSourceConnection(conn, env, trans); + } = @Override public XAConnection getXAConnection( @@ -221,12 +226,18 @@ } java.sql.Connection c =3D conn.getConnection(); setDefaultTransactionIsolationLevel(c); - return new JDBCSourceXAConnection(c, conn, this.environment, sqlTransla= tor); + return createJDBCSourceXAConnection(conn, c, this.environment, this.sql= Translator); } catch (SQLException e) { throw new ConnectorException(e); } } = + public XAConnection createJDBCSourceXAConnection( + javax.sql.XAConnection conn, java.sql.Connection c, ConnectorEnvironmen= t env, Translator trans) + throws ConnectorException, SQLException { + return new JDBCSourceXAConnection(c, conn, env, trans); + } + @Override public ConnectorCapabilities getCapabilities() { return capabilities; Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/TestJDBCConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= TestJDBCConnector.java 2009-02-25 18:27:26 UTC (rev 500) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= TestJDBCConnector.java 2009-02-25 19:09:43 UTC (rev 501) @@ -24,10 +24,12 @@ = import java.util.Properties; = -import org.junit.Assert; +import static org.junit.Assert.*; import org.junit.Test; +import org.teiid.connector.jdbc.xa.XAJDBCPropertyNames; = import com.metamatrix.connector.api.ConnectorCapabilities; +import com.metamatrix.connector.api.ConnectorException; = public class TestJDBCConnector { = @@ -37,7 +39,7 @@ connProps.setProperty(JDBCPropertyNames.EXT_CAPABILITY_CLASS, Simp= leCapabilities.class.getName()); = ConnectorCapabilities caps =3D JDBCConnector.createCapabilities(co= nnProps, this.getClass().getClassLoader()); int maxIn =3D caps.getMaxInCriteriaSize(); - Assert.assertEquals(expected, maxIn); + assertEquals(expected, maxIn); } = @Test @@ -54,4 +56,18 @@ public void test3() throws Exception { helpTestMaxIn(1, 1); } = + = + @Test + public void testParseUrl() throws ConnectorException { + String urlWithEmptyProp =3D "jdbc:mmx:db2://aHost:aPort;DatabaseName= =3DDB2_DataBase;CollectionID=3DaCollectionID;PackageName=3DaPackageName;Bog= usProp=3DaBogusProp;UnEmptyProp=3D;"; //$NON-NLS-1$ + Properties props =3D new Properties(); + JDBCConnector.parseURL(urlWithEmptyProp, props); + = + assertEquals("aPort", props.getProperty(XAJDBCPropertyNames.PORT_NUMB= ER)); + assertEquals("aHost", props.getProperty(XAJDBCPropertyNames.SERVER_NA= ME)); + assertEquals("XADS_aHost_null", props.getProperty(XAJDBCPropertyNames= .DATASOURCE_NAME)); + assertEquals("aBogusProp", props.getProperty("bogusprop")); + assertNull(props.getProperty("unemptyprop")); + } + = } --===============7049253674202277024==-- From teiid-commits at lists.jboss.org Wed Feb 25 15:18:42 2009 Content-Type: multipart/mixed; boundary="===============0374747833932064404==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r502 - in trunk: connector-api/src/main/java/com/metamatrix/connector and 134 other directories. Date: Wed, 25 Feb 2009 15:18:41 -0500 Message-ID: --===============0374747833932064404== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-25 15:18:40 -0500 (Wed, 25 Feb 2009) New Revision: 502 Added: trunk/connector-api/src/main/java/org/ trunk/connector-api/src/main/java/org/teiid/ trunk/connector-api/src/main/java/org/teiid/connector/ trunk/connector-api/src/main/java/org/teiid/connector/DataPlugin.java trunk/connector-api/src/main/java/org/teiid/connector/api/ trunk/connector-api/src/main/java/org/teiid/connector/basic/ trunk/connector-api/src/main/java/org/teiid/connector/internal/ trunk/connector-api/src/main/java/org/teiid/connector/language/ trunk/connector-api/src/main/java/org/teiid/connector/metadata/ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/ trunk/connector-api/src/main/java/org/teiid/connector/visitor/ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/= HierarchyVisitor.java trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/ trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLSt= ringVisitor.java trunk/connector-api/src/main/java/org/teiid/connector/xa/ trunk/connector-api/src/main/java/org/teiid/connector/xa/api/ trunk/connector-api/src/main/resources/org/ trunk/connector-api/src/main/resources/org/teiid/ trunk/connector-api/src/main/resources/org/teiid/connector/ trunk/connector-api/src/test/java/org/ trunk/connector-api/src/test/java/org/teiid/ trunk/connector-api/src/test/java/org/teiid/connector/ trunk/connector-api/src/test/java/org/teiid/connector/basic/ Removed: trunk/connector-api/src/main/java/com/metamatrix/connector/DataPlugin.ja= va trunk/connector-api/src/main/java/com/metamatrix/connector/api/ trunk/connector-api/src/main/java/com/metamatrix/connector/basic/ trunk/connector-api/src/main/java/com/metamatrix/connector/internal/ trunk/connector-api/src/main/java/com/metamatrix/connector/language/ trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/runt= ime/ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/frame= work/ trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util/ trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/= HierarchyVisitor.java trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLSt= ringVisitor.java trunk/connector-api/src/main/resources/com/ trunk/connector-api/src/main/resources/org/metamatrix/ trunk/connector-api/src/main/resources/org/teiid/data/ trunk/connector-api/src/test/java/com/ trunk/connector-api/src/test/java/org/metamatrix/ trunk/connector-api/src/test/java/org/teiid/data/pool/ trunk/connector-api/src/test/java/org/teiid/data/transform/ Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Connection.java trunk/connector-api/src/main/java/org/teiid/connector/api/Connector.java trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnnot= ations.java trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorCapab= ilities.java trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorEnvir= onment.java trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorExcep= tion.java trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorIdent= ity.java trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorLogge= r.java trunk/connector-api/src/main/java/org/teiid/connector/api/CredentialMap.= java trunk/connector-api/src/main/java/org/teiid/connector/api/DataNotAvailab= leException.java trunk/connector-api/src/main/java/org/teiid/connector/api/Execution.java trunk/connector-api/src/main/java/org/teiid/connector/api/ExecutionConte= xt.java trunk/connector-api/src/main/java/org/teiid/connector/api/MappedUserIden= tity.java trunk/connector-api/src/main/java/org/teiid/connector/api/ProcedureExecu= tion.java trunk/connector-api/src/main/java/org/teiid/connector/api/ResultSetExecu= tion.java trunk/connector-api/src/main/java/org/teiid/connector/api/SingleIdentity= .java trunk/connector-api/src/main/java/org/teiid/connector/api/SourceSystemFu= nctions.java trunk/connector-api/src/main/java/org/teiid/connector/api/TypeFacility.j= ava trunk/connector-api/src/main/java/org/teiid/connector/api/UpdateExecutio= n.java trunk/connector-api/src/main/java/org/teiid/connector/api/ValueTranslato= r.java trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnect= ion.java trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnect= or.java trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnect= orCapabilities.java trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicExecuti= on.java trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicValueTr= anslator.java trunk/connector-api/src/main/java/org/teiid/connector/internal/Connector= PropertyNames.java trunk/connector-api/src/main/java/org/teiid/connector/language/IAggregat= e.java trunk/connector-api/src/main/java/org/teiid/connector/language/IBaseInCr= iteria.java trunk/connector-api/src/main/java/org/teiid/connector/language/IBatchedU= pdates.java trunk/connector-api/src/main/java/org/teiid/connector/language/IBulkInse= rt.java trunk/connector-api/src/main/java/org/teiid/connector/language/ICommand.= java trunk/connector-api/src/main/java/org/teiid/connector/language/ICompareC= riteria.java trunk/connector-api/src/main/java/org/teiid/connector/language/ICompound= Criteria.java trunk/connector-api/src/main/java/org/teiid/connector/language/ICriteria= .java trunk/connector-api/src/main/java/org/teiid/connector/language/IDelete.j= ava trunk/connector-api/src/main/java/org/teiid/connector/language/IElement.= java trunk/connector-api/src/main/java/org/teiid/connector/language/IExistsCr= iteria.java trunk/connector-api/src/main/java/org/teiid/connector/language/IExpressi= on.java trunk/connector-api/src/main/java/org/teiid/connector/language/IFrom.java trunk/connector-api/src/main/java/org/teiid/connector/language/IFromItem= .java trunk/connector-api/src/main/java/org/teiid/connector/language/IFunction= .java trunk/connector-api/src/main/java/org/teiid/connector/language/IGroup.ja= va trunk/connector-api/src/main/java/org/teiid/connector/language/IGroupBy.= java trunk/connector-api/src/main/java/org/teiid/connector/language/IInCriter= ia.java trunk/connector-api/src/main/java/org/teiid/connector/language/IInlineVi= ew.java trunk/connector-api/src/main/java/org/teiid/connector/language/IInsert.j= ava trunk/connector-api/src/main/java/org/teiid/connector/language/IIsNullCr= iteria.java trunk/connector-api/src/main/java/org/teiid/connector/language/IJoin.java trunk/connector-api/src/main/java/org/teiid/connector/language/ILanguage= Factory.java trunk/connector-api/src/main/java/org/teiid/connector/language/ILanguage= Object.java trunk/connector-api/src/main/java/org/teiid/connector/language/ILikeCrit= eria.java trunk/connector-api/src/main/java/org/teiid/connector/language/ILimit.ja= va trunk/connector-api/src/main/java/org/teiid/connector/language/ILiteral.= java trunk/connector-api/src/main/java/org/teiid/connector/language/ILogicalC= riteria.java trunk/connector-api/src/main/java/org/teiid/connector/language/IMetadata= Reference.java trunk/connector-api/src/main/java/org/teiid/connector/language/INotCrite= ria.java trunk/connector-api/src/main/java/org/teiid/connector/language/IOrderBy.= java trunk/connector-api/src/main/java/org/teiid/connector/language/IOrderByI= tem.java trunk/connector-api/src/main/java/org/teiid/connector/language/IParamete= r.java trunk/connector-api/src/main/java/org/teiid/connector/language/IPredicat= eCriteria.java trunk/connector-api/src/main/java/org/teiid/connector/language/IProcedur= e.java trunk/connector-api/src/main/java/org/teiid/connector/language/IQuery.ja= va trunk/connector-api/src/main/java/org/teiid/connector/language/IQueryCom= mand.java trunk/connector-api/src/main/java/org/teiid/connector/language/IScalarSu= bquery.java trunk/connector-api/src/main/java/org/teiid/connector/language/ISearched= CaseExpression.java trunk/connector-api/src/main/java/org/teiid/connector/language/ISelect.j= ava trunk/connector-api/src/main/java/org/teiid/connector/language/ISelectSy= mbol.java trunk/connector-api/src/main/java/org/teiid/connector/language/ISetClaus= e.java trunk/connector-api/src/main/java/org/teiid/connector/language/ISetClaus= eList.java trunk/connector-api/src/main/java/org/teiid/connector/language/ISetQuery= .java trunk/connector-api/src/main/java/org/teiid/connector/language/ISubquery= CompareCriteria.java trunk/connector-api/src/main/java/org/teiid/connector/language/ISubquery= Container.java trunk/connector-api/src/main/java/org/teiid/connector/language/ISubquery= InCriteria.java trunk/connector-api/src/main/java/org/teiid/connector/language/IUpdate.j= ava trunk/connector-api/src/main/java/org/teiid/connector/language/LanguageU= til.java trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/E= lement.java trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/G= roup.java trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/M= etadataObject.java trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/P= arameter.java trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/P= rocedure.java trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/R= untimeMetadata.java trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/T= ypeModel.java trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/= AbstractLanguageVisitor.java trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/= DelegatingHierarchyVisitor.java trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework/= LanguageObjectVisitor.java trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/Colle= ctorVisitor.java trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLRe= servedWords.java trunk/connector-api/src/main/java/org/teiid/connector/xa/api/Transaction= Context.java trunk/connector-api/src/main/java/org/teiid/connector/xa/api/XAConnectio= n.java trunk/connector-api/src/main/java/org/teiid/connector/xa/api/XAConnector= .java trunk/connector-api/src/test/java/org/teiid/connector/TestCredentialMap.= java trunk/connector-api/src/test/java/org/teiid/connector/basic/TestBasicVal= ueTranslator.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /IndexConnector.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /MetadataProcedureExecution.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /adapter/ObjectConnection.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /adapter/ObjectConnector.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /adapter/ObjectConnectorCapabilities.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /adapter/ObjectSynchExecution.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /internal/MetadataSearchCriteriaBuilder.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /internal/ObjectProcedure.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /internal/ObjectProcedureProcessor.java trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadata= /internal/ObjectQuery.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /TestIndexConnector.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /adapter/FakeObjectConnector.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /adapter/TestObjectConnector.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/TestConnectorHost.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/TestMetadataSearchCriteriaBuilder.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/TestObjectProcedure.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/TestObjectQuery.java trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadata= /internal/TestObjectQueryProcessor.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuilder.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShellComma= ndTarget.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/IConnectorHost.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.j= ava trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUtil= ity.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/SysLogger.java trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUtil= ity.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCBaseExecution.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCConnector.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCExecutionException.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCExecutionHelper.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCProcedureExecution.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCQueryExecution.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCSourceConnection.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/J= DBCUpdateExecution.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/S= impleCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/a= ccess/AccessSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= b2/DB2Capabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= b2/DB2ConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= b2/DB2SQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= erby/DerbyCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= erby/DerbyConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/d= erby/DerbySQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/i= nformix/InformixSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/m= m/MMCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/m= ysql/MySQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/m= ysql/MySQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/ConcatFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/DayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/ExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/LeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/LocateFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/Log10FunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/MonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/OracleCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/OracleConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/o= racle/OracleSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/DatePartFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/ModifiedDatePartFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/PostgreSQLCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/PostgreSQLConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/p= ostgresql/PostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= qlserver/SqlServerCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= qlserver/SqlServerSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/ModFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/SybaseCapabilities.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/SybaseConvertModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/s= ybase/SybaseSQLTranslator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/AliasModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/BasicFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/BindValueVisitor.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/DropFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/EscapeSyntaxModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/FunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/ReplacementVisitor.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/SQLConversionVisitor.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/SubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/TranslatedCommand.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/t= ranslator/Translator.java trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/x= a/JDBCSourceXAConnection.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/M= etadataFactory.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/T= estJDBCConnector.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/T= estJDBCSourceConnection.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/a= ccess/TestAccessSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/d= b2/TestDB2ConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/d= b2/TestDB2SqlTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/d= erby/TestDerbyConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/e= xtension/impl/TestDropFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/e= xtension/impl/TestEscapeSyntaxModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/m= ysql/TestMySQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestDayWeekQuarterFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestExtractFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestLeftOrRightFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestLocateFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestLog10FunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestMonthOrDayNameFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestOracleConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestOracleTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/o= racle/TestSubstringFunctionModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/p= ostgresql/TestPostgreSQLTranslator.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/s= qlserver/TestSqlServerConversionVisitor.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/s= ybase/TestSybaseConvertModifier.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/s= ybase/TestSybaseSQLConversionVisitor.java trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/u= til/TestFunctionReplacementVisitor.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/IQueryToLdapSearchParser.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPConnection.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPConnector.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPConnectorCapabilities.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPSearchDetails.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPSyncQueryExecution.java trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/l= dap/LDAPUpdateExecution.java trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/l= dap/TestIQueryToLdapSearchParser.java trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connect= or/loopback/LoopbackCapabilities.java trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connect= or/loopback/LoopbackConnection.java trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connect= or/loopback/LoopbackConnector.java trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connect= or/loopback/LoopbackExecution.java trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connect= or/loopback/TestLoopbackExecution.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/Connector.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/ConnectorState.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/SalesforceCapabilities.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/Util.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/connection/SalesforceConnection.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/connection/impl/ConnectionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/DeleteExecutionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/InsertExecutionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/QueryExecutionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/UpdateExecutionImpl.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/UpdateExecutionParent.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/CriteriaVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/DeleteVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/ICriteriaVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/IQueryProvidingVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/InsertVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/SelectVisitor.java trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conne= ctor/salesforce/execution/visitors/UpdateVisitor.java trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/conne= ctor/salesforce/TestConnector.java trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/conne= ctor/salesforce/test/util/ObjectFactory.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/StringToDateTranslator.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextCapabilities.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextConnection.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextConnector.java trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/t= ext/TextSynchExecution.java trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestMultiFileTextSynchExecution.java trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestRowHeaderTextSynchExecution.java trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestTextConnection.java trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/t= ext/TestTextConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/AbstractCachingConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/AsynchronousDocumentProducer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/BaseXMLConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/CachingConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/DocumentProducer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/IQueryPreprocessor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/NamedDocumentExecutor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/SAXFilterProvider.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/SecureConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/TrustedPayloadHandler.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/XMLConnection.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/XMLConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/XMLExecution.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/BaseBatchProducer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/BaseResultsProducer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/CriteriaDesc.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/DocumentBuilder.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/FileBackedValueReference.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/FileLifeManager.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/IDGeneratingXmlFilter.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/LargeOrSmallString.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/LargeTextExtractingXmlFilter.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/LargeTextValueReference.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/LoggingConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/LoggingInputStreamFilter.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/NoExtendedFilters.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/NoQueryPreprocessing.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/OutputXPathDesc.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/ParameterDescriptor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/PluggableInputStreamFilterImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/QueryAnalyzer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/RequestResponseDocumentProducer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/Response.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/SecureConnectorStateImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/StatefulConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/TrustedPayloadBridge.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/ValueConvertor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLCapabilities.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLConnectionImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLConnectorStateImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLExecutionImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/base/XMLExtractor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/cache/DocumentCache.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/cache/ExecutionRecord.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/cache/IDocumentCache.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/cache/RequestPartRecord.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/cache/RequestRecord.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/file/FileConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/file/FileExecutor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/http/DefaultTrustDeserializer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/http/HTTPConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/http/HTTPExecutor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/http/HTTPRequestor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/http/HTTPTrustDeserializer.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/JMSConnection.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/JMSExecution.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/JMSRequestExecutor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/JMSSOAPConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/jms/JMSXMLConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/FilteringHTTPSender.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/SOAPConnectorState.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/SOAPConnectorStateImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/SOAPDocBuilder.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/SOAPExecutor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLConnectionFacory.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLSourceCapabilities.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLSourceConnection.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLSourceConnector.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLSourceExecution.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLSourcePlugin.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/file/FileConnection.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/file/FileExecution.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/soap/SecurityToken.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/soap/ServiceOperation.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/soap/SoapConnection.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/soap/SoapExecution.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/MockQueryPreprocessor.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/MockXMLExecution.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/ProxyObjectFactory.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestCriteriaDesc.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestExecutionInfo.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestFileLifeManager.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestLargeTextExtractingXmlFilter.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestLoggingInputStreamFilter.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestOutputXPathDesc.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestParameterDescriptor.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestQueryAnalyzer.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestStringBackedValueReference.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLCapabilities.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLConnection.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLConnector.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLConnectorState.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLExecution.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLExtractor.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/cache/TestCache.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/cache/TestRequestRecord.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/file/TestFileConnectorState.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/file/TestFileExecutor.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/http/TestHTTPConnectorState.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/jms/TestJMSConnectorState.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/jms/TestJMSSOAPConnectorState.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/file/TestFileConnection.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/file/TestFileExecution.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/soap/TestSoapConnection.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= lsource/soap/TestSoapExecution.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecAntExecution.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecCapabilities.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecConnection.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecConnector.java trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/con= nector/exec/ExecVisitor.java trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/con= nector/exec/FakeExecConnector.java trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/con= nector/exec/TestsExec.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectConnection.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectConnector.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectConnectorCapabilities.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/ObjectProcedureExecution.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/SourceConnectionFactory.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/IObjectCommand.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/IObjectSource.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/ISourceTranslator.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/command/ObjectCommand.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/command/ProcedureCommand.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/source/BaseObjectSource.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/source/BaseSourceConnectionFactory.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/source/BasicSourceTranslator.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/value/BasicValueRetriever.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/extension/value/JavaUtilDateValueTranslator.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/util/ObjectConnectorUtil.java trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/c= onnector/object/util/ObjectExecutionHelper.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.java trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/TickerCollectorVisitor.java trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/YahooCapabilities.java trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/YahooConnection.java trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/YahooConnector.java trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/co= nnector/yahoo/YahooExecution.java trunk/connectors/sandbox/connector-yahoo/src/test/java/com/metamatrix/co= nnector/yahoo/TestYahooTranslation.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Defaul= tIndexConnectorBinding.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embedd= edDataService.java trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embedd= edTrackingService.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/Capabilit= iesConverter.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorEnvironmentImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorManager.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorWorkItem.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Conn= ectorWrapper.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Defa= ultConnectorLogger.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Exec= utionContextImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Proc= edureBatchHandler.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Sync= hConnectorWorkItem.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Type= FacilityImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= AggregateImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= BaseLanguageObject.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= BatchedUpdatesImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= BulkInsertImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= CompareCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= CompoundCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= DeleteImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ElementImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ExistsCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= FromImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= FunctionImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= GroupByImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= GroupImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= InCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= InlineViewImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= InsertImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= IsNullCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= JoinImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LanguageBridgeFactory.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LanguageFactoryImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LikeCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LimitImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= LiteralImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= NotCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= OrderByImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= OrderByItemImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ParameterImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ProcedureImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= QueryCommandImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= QueryImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= ScalarSubqueryImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SearchedCaseExpressionImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SelectImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SelectSymbolImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SetClauseImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SetClauseListImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SetQueryImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SubqueryCompareCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= SubqueryInCriteriaImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= UpdateImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ElementImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= GroupImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= MetadataObjectImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ParameterImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= ProcedureImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= RuntimeMetadataImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata/= TypeModelImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector= /ConnectionPool.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector= /ConnectionPoolException.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector= /ConnectionWrapper.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connector= /PooledConnector.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.j= ava trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestWo= rkItem.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Trans= actionContextImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Trans= actionProvider.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Trans= actionServerImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestMessa= ge.java trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMessa= ge.java trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTracki= ngMessage.java trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTracki= ngService.java trunk/engine/src/main/java/com/metamatrix/dqp/service/TrackingService.ja= va trunk/engine/src/main/java/com/metamatrix/dqp/spi/CommandLoggerSPI.java trunk/engine/src/main/java/com/metamatrix/dqp/spi/basic/FileCommandLogge= r.java trunk/engine/src/main/java/com/metamatrix/dqp/transaction/TransactionSer= ver.java trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemSo= urce.java trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.j= ava trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fake= Connector.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fake= ProcedureExecution.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Test= ConnectorManagerImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Test= ConnectorWorkItem.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestAggregateImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestBatchedUpdatesImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestBulkInsertImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestCompareCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestCompoundCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestElementImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestFromImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestFunctionImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestGroupByImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestInCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestInsertImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestJoinImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestLikeCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestOrderByImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestParameterImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestProcedureImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestScalarSubqueryImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestSelectImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestSelectSymbolImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestSetQueryImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language/= TestSubqueryCompareCriteriaImpl.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /FakeSourceConnectionFactory.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /FakeUserIdentityConnectionFactory.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /TestConnectionPool.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /TestConnectionWrapper.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connector= /TestPerUserPool.java trunk/engine/src/test/java/com/metamatrix/dqp/service/TestCustomizableTr= ackingService.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoinOptimi= zation.java trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer.= java trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataIn= terfaceBuilder.java trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/se= rver/LogonImpl.java trunk/server/src/main/java/com/metamatrix/server/connector/service/Conne= ctorService.java trunk/server/src/main/java/com/metamatrix/server/connector/service/Conne= ctorServiceInterface.java trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDat= aService.java trunk/server/src/main/java/com/metamatrix/server/dqp/service/tracker/Dat= abaseCommandLogger.java trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslat= ionUtility.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exten= sion/TestSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/oracl= e/TestOracleSQLConversionVisitor.java trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util/= TestJDBCExecutionHelper.java trunk/test-integration/src/test/java/com/metamatrix/data/language/TestLa= nguageUtil.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/MockConnector.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestElement.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestGroup.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestMetadataInConnector.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestMetadataObject.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestParams.java trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runtim= e/TestProcedure.java trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/Te= stCollectorVisitor.java trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/Te= stSQLStringVisitor.java trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXAConnectio= n.java trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaRecov= ery.java Log: TEIID-164 changing new connector api to be org.teiid Deleted: trunk/connector-api/src/main/java/com/metamatrix/connector/DataPlu= gin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/DataPlugin.j= ava 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-api/src/main/java/com/metamatrix/connector/DataPlugin.j= ava 2009-02-25 20:18:40 UTC (rev 502) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector; - -import java.util.ResourceBundle; -import com.metamatrix.core.BundleUtil; - -/** - * CommonPlugin - *

Used here in data to have access to the new - * logging framework for LogManager.

- */ -public class DataPlugin { // extends Plugin { - - /** - * The plug-in identifier of this plugin - * (value "com.metamatrix.data"). - */ - public static final String PLUGIN_ID =3D "com.metamatrix.data" ; //$NO= N-NLS-1$ - - public static final BundleUtil Util =3D new BundleUtil(PLUGIN_ID, - PLUGIN_ID + ".i18n",= ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$ - -} Copied: trunk/connector-api/src/main/java/org/teiid/connector/DataPlugin.ja= va (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connecto= r/DataPlugin.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/org/teiid/connector/DataPlugin.java = (rev 0) +++ trunk/connector-api/src/main/java/org/teiid/connector/DataPlugin.java 2= 009-02-25 20:18:40 UTC (rev 502) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector; + +import java.util.ResourceBundle; +import com.metamatrix.core.BundleUtil; + +public class DataPlugin { // extends Plugin { + + public static final String PLUGIN_ID =3D "org.teiid.connector" ; //$NO= N-NLS-1$ + + public static final BundleUtil Util =3D new BundleUtil(PLUGIN_ID, + PLUGIN_ID + ".i18n",= ResourceBundle.getBundle(PLUGIN_ID + ".i18n")); //$NON-NLS-1$ //$NON-NLS-2$ + +} Copied: trunk/connector-api/src/main/java/org/teiid/connector/api (from rev= 498, trunk/connector-api/src/main/java/com/metamatrix/connector/api) Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Connect= ion.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecti= on.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/Connection.ja= va 2009-02-25 20:18:40 UTC (rev 502) @@ -20,10 +20,10 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = /** *

Represents a connection to this connector. A connection will be obt= ained Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Connect= or.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= r.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/Connector.jav= a 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = = /** Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Connect= orAnnotations.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rAnnotations.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorAnno= tations.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,15 +20,16 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; = -import com.metamatrix.connector.internal.ConnectorPropertyNames; +import org.teiid.connector.internal.ConnectorPropertyNames; = + public class ConnectorAnnotations { = /** Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Connect= orCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rCapabilities.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorCapa= bilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,13 +20,14 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = import java.util.List; = -import com.metamatrix.connector.language.IBatchedUpdates; -import com.metamatrix.connector.language.IBulkInsert; +import org.teiid.connector.language.IBatchedUpdates; +import org.teiid.connector.language.IBulkInsert; = + /** * Allows a connector to specify the capabilities that a connector * supports. = Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Connect= orEnvironment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rEnvironment.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorEnvi= ronment.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,13 +20,14 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = import java.util.Properties; import java.util.concurrent.Executor; = -import com.metamatrix.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILanguageFactory; = + /** * The environment provided to a connector by the Connector Manager. The = * environment provides access to external resources the Connector writer = may Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Connect= orException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rException.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorExce= ption.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = import com.metamatrix.core.MetaMatrixCoreException; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Connect= orIdentity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rIdentity.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorIden= tity.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = = /** Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Connect= orLogger.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Connecto= rLogger.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/ConnectorLogg= er.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = /** * Provide access to write messages to the MetaMatrix logs. Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Credent= ialMap.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Credenti= alMap.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/CredentialMap= .java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = import java.io.Serializable; import java.util.HashMap; @@ -29,7 +29,8 @@ import java.util.Map; import java.util.Set; = -import com.metamatrix.connector.DataPlugin; +import org.teiid.connector.DataPlugin; + import com.metamatrix.core.util.StringUtil; = /** Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/DataNot= AvailableException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/DataNotA= vailableException.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/DataNotAvaila= bleException.java 2009-02-25 20:18:40 UTC (rev 502) @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA. */ -package com.metamatrix.connector.api; +package org.teiid.connector.api; = /** * Used by asynch connectors to indicate data is not available = Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Executi= on.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Executio= n.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/Execution.jav= a 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = /** * An execution represents the state and lifecycle for a particular = Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Executi= onContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Executio= nContext.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/ExecutionCont= ext.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = import java.io.Serializable; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/MappedU= serIdentity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/MappedUs= erIdentity.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/MappedUserIde= ntity.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = = /** Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/Procedu= reExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/Procedur= eExecution.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/ProcedureExec= ution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,9 +20,9 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = -import com.metamatrix.connector.language.IParameter; +import org.teiid.connector.language.IParameter; = /** * The procedure execution represents the case where a connector can = Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ResultS= etExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/ResultSe= tExecution.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/ResultSetExec= ution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/SingleI= dentity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/SingleId= entity.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/SingleIdentit= y.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = = /** Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/SourceS= ystemFunctions.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/SourceSy= stemFunctions.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/SourceSystemF= unctions.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = /** * Constants for all the possible standard system push down functions. Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/TypeFac= ility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/TypeFaci= lity.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/TypeFacility.= java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = import java.util.Calendar; import java.util.TimeZone; Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/UpdateE= xecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/UpdateEx= ecution.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/UpdateExecuti= on.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.api; +package org.teiid.connector.api; = = /** Modified: trunk/connector-api/src/main/java/org/teiid/connector/api/ValueTr= anslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/api/ValueTra= nslator.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/api/ValueTranslat= or.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,7 +22,7 @@ = /* */ -package com.metamatrix.connector.api; +package org.teiid.connector.api; = = /** Copied: trunk/connector-api/src/main/java/org/teiid/connector/basic (from r= ev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/basic) Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/Basic= Connection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnection.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnec= tion.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,21 +20,21 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.basic; +package org.teiid.connector.basic; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorIdentity; -import com.metamatrix.connector.api.Execution; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.Execution; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.api.UpdateExecution; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = /** * Provides a default implementation of a {@link PoolAwareConnection} for = a Connector Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/Basic= Connector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnector.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnec= tor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -1,13 +1,13 @@ -package com.metamatrix.connector.basic; +package org.teiid.connector.basic; = -import com.metamatrix.connector.DataPlugin; -import com.metamatrix.connector.api.Connector; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorIdentity; -import com.metamatrix.connector.api.CredentialMap; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.SingleIdentity; -import com.metamatrix.connector.api.MappedUserIdentity; +import org.teiid.connector.DataPlugin; +import org.teiid.connector.api.Connector; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.CredentialMap; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.MappedUserIdentity; +import org.teiid.connector.api.SingleIdentity; = public abstract class BasicConnector implements Connector { = Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/Basic= ConnectorCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicC= onnectorCapabilities.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicConnec= torCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,12 +20,13 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.basic; +package org.teiid.connector.basic; = import java.util.List; = -import com.metamatrix.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorCapabilities; = + /** * This class is a base implementation of the ConnectorCapabilities interf= ace. * It is implemented to return false for all capabilities. Subclass this = base @@ -50,7 +51,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsSel= ectLiterals() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsSelectLi= terals() * @since 4.2 */ public boolean supportsSelectLiterals() { @@ -340,7 +341,7 @@ /** * Return null to indicate no functions are supported. * @return null = - * @see com.metamatrix.connector.api.ConnectorCapabilities#getSupporte= dFunctions() + * @see org.teiid.connector.api.ConnectorCapabilities#getSupportedFunc= tions() */ public List getSupportedFunctions() { return null; @@ -351,7 +352,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= ons() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsUnions() * @since 4.2 */ public boolean supportsUnions() { @@ -359,7 +360,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#getMaxInCri= teriaSize() + * @see org.teiid.connector.api.ConnectorCapabilities#getMaxInCriteria= Size() * @since 4.2 */ public int getMaxInCriteriaSize() { @@ -367,7 +368,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFun= ctionsInGroupBy() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsFunction= sInGroupBy() * @since 5.0 */ public boolean supportsFunctionsInGroupBy() { @@ -383,28 +384,28 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#getMaxFromG= roups() + * @see org.teiid.connector.api.ConnectorCapabilities#getMaxFromGroups= () */ public int getMaxFromGroups() { return -1; //-1 indicates no max } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsExc= ept() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsExcept() */ public boolean supportsExcept() { return false; } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsInt= ersect() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsIntersec= t() */ public boolean supportsIntersect() { return false; } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsSet= QueryOrderBy() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsSetQuery= OrderBy() */ public boolean supportsSetQueryOrderBy() { return false; Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/Basic= Execution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicE= xecution.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicExecut= ion.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,9 +20,9 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.basic; +package org.teiid.connector.basic; = -import com.metamatrix.connector.api.Execution; +import org.teiid.connector.api.Execution; = public abstract class BasicExecution implements Execution { = Modified: trunk/connector-api/src/main/java/org/teiid/connector/basic/Basic= ValueTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/basic/BasicV= alueTranslator.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/basic/BasicValueT= ranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,13 +22,13 @@ = /* */ -package com.metamatrix.connector.basic; +package org.teiid.connector.basic; = -import com.metamatrix.connector.DataPlugin; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.api.ValueTranslator; +import org.teiid.connector.DataPlugin; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.api.ValueTranslator; = /** * BasicValueTranslator can translate between types using the standard {@l= ink TypeFacility} Copied: trunk/connector-api/src/main/java/org/teiid/connector/internal (fro= m rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/inter= nal) Modified: trunk/connector-api/src/main/java/org/teiid/connector/internal/Co= nnectorPropertyNames.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/internal/Con= nectorPropertyNames.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/internal/Connecto= rPropertyNames.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.internal; +package org.teiid.connector.internal; = public class ConnectorPropertyNames { = Copied: trunk/connector-api/src/main/java/org/teiid/connector/language (fro= m rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/langu= age) Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IA= ggregate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IAg= gregate.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IAggrega= te.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents an expression in the SELECT clause. Anything = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IB= aseInCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IBa= seInCriteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IBaseInC= riteria.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** */ Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IB= atchedUpdates.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IBa= tchedUpdates.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IBatched= Updates.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IB= ulkInsert.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IBu= lkInsert.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IBulkIns= ert.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IC= ommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICo= mmand.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ICommand= .java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a command in the language objects. A command is an instruct= ion of = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IC= ompareCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICo= mpareCriteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ICompare= Criteria.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a comparison between two expressions connected with Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IC= ompoundCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICo= mpoundCriteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ICompoun= dCriteria.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IC= riteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ICr= iteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ICriteri= a.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a criteria in the language objects. Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/ID= elete.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IDe= lete.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IDelete.= java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a DELETE command in the language objects. Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IE= lement.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IEl= ement.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IElement= .java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,9 +20,9 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = -import com.metamatrix.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Element; = /** * Represents an element in the language. An example of an element = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IE= xistsCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IEx= istsCriteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IExistsC= riteria.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents an EXISTS criteria that checks whether any results would be = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IE= xpression.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IEx= pression.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IExpress= ion.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents an expression in the language. Subinterfaces define specifi= c = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IF= rom.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFr= om.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IFrom.ja= va 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IF= romItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFr= omItem.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IFromIte= m.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents an item in the FROM clause - typically this is either a = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IF= unction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IFu= nction.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IFunctio= n.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IG= roup.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IGr= oup.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IGroup.j= ava 2009-02-25 20:18:40 UTC (rev 502) @@ -20,9 +20,9 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = -import com.metamatrix.connector.metadata.runtime.Group; +import org.teiid.connector.metadata.runtime.Group; = /** * Represents a group in the language objects. An example of a group woul= d = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IG= roupBy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IGr= oupBy.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IGroupBy= .java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/II= nCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IIn= Criteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IInCrite= ria.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/II= nlineView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IIn= lineView.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IInlineV= iew.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * An inline view represents a subquery in the FROM clause that defines a = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/II= nsert.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IIn= sert.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IInsert.= java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/II= sNullCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IIs= NullCriteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IIsNullC= riteria.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents an IS NULL criteria. Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IJ= oin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IJo= in.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IJoin.ja= va 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IL= anguageFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILa= nguageFactory.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ILanguag= eFactory.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,17 +20,18 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = -import com.metamatrix.connector.language.ICompoundCriteria.Operator; -import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.Parameter; -import com.metamatrix.connector.metadata.runtime.Procedure; +import org.teiid.connector.language.ICompoundCriteria.Operator; +import org.teiid.connector.language.IParameter.Direction; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Group; +import org.teiid.connector.metadata.runtime.Parameter; +import org.teiid.connector.metadata.runtime.Procedure; = + /** * Factory for the construction of language objects that implement the lan= guage interfaces. * This factory is provided by the connector environment and can be used i= n modifying the language Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IL= anguageObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILa= nguageObject.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ILanguag= eObject.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,9 +20,9 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = /** * Root interface for all language object interfaces. Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IL= ikeCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILi= keCriteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ILikeCri= teria.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a LIKE criteria in the language. Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IL= imit.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILi= mit.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ILimit.j= ava 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = = /** = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IL= iteral.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILi= teral.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ILiteral= .java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a literal value that is used in Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IL= ogicalCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ILo= gicalCriteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ILogical= Criteria.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a logical criteria, which typically is used to bind = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IM= etadataReference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IMe= tadataReference.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IMetadat= aReference.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,9 +20,9 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = -import com.metamatrix.connector.metadata.runtime.MetadataObject; +import org.teiid.connector.metadata.runtime.MetadataObject; = /** * This interface is used to mark language objects as having a = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IN= otCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/INo= tCriteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/INotCrit= eria.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a NOT criteria, which is wrapped around another criteria. Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IO= rderBy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IOr= derBy.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IOrderBy= .java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IO= rderByItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IOr= derByItem.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IOrderBy= Item.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a single item in the ORDER BY clause. Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IP= arameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPa= rameter.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IParamet= er.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,9 +20,9 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = -import com.metamatrix.connector.metadata.runtime.Parameter; +import org.teiid.connector.metadata.runtime.Parameter; = /** * Represents an execution parameter. Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IP= redicateCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPr= edicateCriteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IPredica= teCriteria.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a criteria that can occur at the leaf of a tree of = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IP= rocedure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IPr= ocedure.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IProcedu= re.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,12 +20,13 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = -import com.metamatrix.connector.metadata.runtime.Procedure; +import org.teiid.connector.metadata.runtime.Procedure; = + /** * Represents a procedural execution (such as a stored procedure). = */ Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IQ= uery.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IQu= ery.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IQuery.j= ava 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a SELECT query in the language objects. Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IQ= ueryCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IQu= eryCommand.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IQueryCo= mmand.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = public interface IQueryCommand extends ICommand { = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IS= calarSubquery.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISc= alarSubquery.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IScalarS= ubquery.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a scalar subquery. That is, a query that is evaluated as a = scalar Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IS= earchedCaseExpression.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISe= archedCaseExpression.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISearche= dCaseExpression.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a non-searched CASE expression: Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IS= elect.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISe= lect.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISelect.= java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IS= electSymbol.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISe= lectSymbol.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISelectS= ymbol.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents an item in the SELECT clause. Typically the SELECT clause = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IS= etClause.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISe= tClause.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISetClau= se.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = public interface ISetClause extends ILanguageObject { = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IS= etClauseList.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISe= tClauseList.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISetClau= seList.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IS= etQuery.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISe= tQuery.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISetQuer= y.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = public interface ISetQuery extends IQueryCommand { Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IS= ubqueryCompareCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISu= bqueryCompareCriteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISubquer= yCompareCriteria.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents a quantified comparison criteria. This criteria has an expr= ession on the left, Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IS= ubqueryContainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISu= bqueryContainer.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISubquer= yContainer.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * This is a marker interface for language interfaces that contain a subqu= ery. Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IS= ubqueryInCriteria.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/ISu= bqueryInCriteria.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/ISubquer= yInCriteria.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = /** * Represents an IN criteria that uses a subquery on the right side rather= than a = Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/IU= pdate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/IUp= date.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/IUpdate.= java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = = /** Modified: trunk/connector-api/src/main/java/org/teiid/connector/language/La= nguageUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/language/Lan= guageUtil.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/language/Language= Util.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,12 +20,13 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.language; +package org.teiid.connector.language; = import java.util.*; = -import com.metamatrix.connector.language.ICompoundCriteria.Operator; +import org.teiid.connector.language.ICompoundCriteria.Operator; = + /** * Helpful utility methods to work with language interfaces. = */ Copied: trunk/connector-api/src/main/java/org/teiid/connector/metadata/runt= ime (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connect= or/metadata/runtime) Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/ru= ntime/Element.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Element.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/= Element.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,9 +24,9 @@ * Date: Aug 18, 2003 * Time: 11:58:05 AM */ -package com.metamatrix.connector.metadata.runtime; +package org.teiid.connector.metadata.runtime; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = /** * Represents an element, such as a column, in runtime metadata. = Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/ru= ntime/Group.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Group.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/= Group.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,12 +20,13 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.metadata.runtime; +package org.teiid.connector.metadata.runtime; = import java.util.List; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = + /** * Represents a group, such as a table, in the runtime metadata. */ Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/ru= ntime/MetadataObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/MetadataObject.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/= MetadataObject.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,12 +20,13 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.metadata.runtime; +package org.teiid.connector.metadata.runtime; = import java.util.Properties; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = + /** * Represents a runtime metadata object. */ Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/ru= ntime/Parameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Parameter.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/= Parameter.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,12 +20,13 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.metadata.runtime; +package org.teiid.connector.metadata.runtime; = import java.util.List; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = + /** * Represents a procedure parameter in the runtime metadata. */ Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/ru= ntime/Procedure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/Procedure.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/= Procedure.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.metadata.runtime; +package org.teiid.connector.metadata.runtime; = import java.util.List; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/ru= ntime/RuntimeMetadata.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/RuntimeMetadata.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/= RuntimeMetadata.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,9 +20,9 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.metadata.runtime; +package org.teiid.connector.metadata.runtime; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = /** * Helper methods that can be used to access runtime metadata. Modified: trunk/connector-api/src/main/java/org/teiid/connector/metadata/ru= ntime/TypeModel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/metadata/run= time/TypeModel.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/metadata/runtime/= TypeModel.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,9 +20,9 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.metadata.runtime; +package org.teiid.connector.metadata.runtime; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = = /** = Copied: trunk/connector-api/src/main/java/org/teiid/connector/visitor/frame= work (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connec= tor/visitor/framework) Modified: trunk/connector-api/src/main/java/org/teiid/connector/visitor/fra= mework/AbstractLanguageVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/AbstractLanguageVisitor.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework= /AbstractLanguageVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,48 +20,49 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.visitor.framework; +package org.teiid.connector.visitor.framework; = import java.util.Collection; = -import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.IBatchedUpdates; -import com.metamatrix.connector.language.IBulkInsert; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICompoundCriteria; -import com.metamatrix.connector.language.IDelete; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExistsCriteria; -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IGroupBy; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.IInlineView; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.IIsNullCriteria; -import com.metamatrix.connector.language.IJoin; -import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.INotCriteria; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.IOrderByItem; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IScalarSubquery; -import com.metamatrix.connector.language.ISearchedCaseExpression; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.language.ISetClause; -import com.metamatrix.connector.language.ISetClauseList; -import com.metamatrix.connector.language.ISetQuery; -import com.metamatrix.connector.language.ISubqueryCompareCriteria; -import com.metamatrix.connector.language.ISubqueryInCriteria; -import com.metamatrix.connector.language.IUpdate; +import org.teiid.connector.language.IAggregate; +import org.teiid.connector.language.IBatchedUpdates; +import org.teiid.connector.language.IBulkInsert; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICompoundCriteria; +import org.teiid.connector.language.IDelete; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExistsCriteria; +import org.teiid.connector.language.IFrom; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IGroupBy; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.language.IInlineView; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.IIsNullCriteria; +import org.teiid.connector.language.IJoin; +import org.teiid.connector.language.ILanguageObject; +import org.teiid.connector.language.ILikeCriteria; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.INotCriteria; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.language.IOrderByItem; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IScalarSubquery; +import org.teiid.connector.language.ISearchedCaseExpression; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.language.ISetClause; +import org.teiid.connector.language.ISetClauseList; +import org.teiid.connector.language.ISetQuery; +import org.teiid.connector.language.ISubqueryCompareCriteria; +import org.teiid.connector.language.ISubqueryInCriteria; +import org.teiid.connector.language.IUpdate; = + /** * Visitor that visits an instance of ILanguageObject and performs an oper= ation * on that instance. The visit() methods of this Visitor can be selectively Modified: trunk/connector-api/src/main/java/org/teiid/connector/visitor/fra= mework/DelegatingHierarchyVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/DelegatingHierarchyVisitor.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework= /DelegatingHierarchyVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,45 +20,45 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.visitor.framework; +package org.teiid.connector.visitor.framework; = -import com.metamatrix.connector.DataPlugin; -import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.IBatchedUpdates; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICompoundCriteria; -import com.metamatrix.connector.language.IDelete; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExistsCriteria; -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IGroupBy; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.IInlineView; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.IIsNullCriteria; -import com.metamatrix.connector.language.IJoin; -import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.INotCriteria; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.IOrderByItem; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IScalarSubquery; -import com.metamatrix.connector.language.ISearchedCaseExpression; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.language.ISetClause; -import com.metamatrix.connector.language.ISetClauseList; -import com.metamatrix.connector.language.ISetQuery; -import com.metamatrix.connector.language.ISubqueryCompareCriteria; -import com.metamatrix.connector.language.ISubqueryInCriteria; -import com.metamatrix.connector.language.IUpdate; +import org.teiid.connector.DataPlugin; +import org.teiid.connector.language.IAggregate; +import org.teiid.connector.language.IBatchedUpdates; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICompoundCriteria; +import org.teiid.connector.language.IDelete; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExistsCriteria; +import org.teiid.connector.language.IFrom; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IGroupBy; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.language.IInlineView; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.IIsNullCriteria; +import org.teiid.connector.language.IJoin; +import org.teiid.connector.language.ILanguageObject; +import org.teiid.connector.language.ILikeCriteria; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.INotCriteria; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.language.IOrderByItem; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IScalarSubquery; +import org.teiid.connector.language.ISearchedCaseExpression; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.language.ISetClause; +import org.teiid.connector.language.ISetClauseList; +import org.teiid.connector.language.ISetQuery; +import org.teiid.connector.language.ISubqueryCompareCriteria; +import org.teiid.connector.language.ISubqueryInCriteria; +import org.teiid.connector.language.IUpdate; = /** * Delegates pre- and post-processing for each node in the hierarchy to Deleted: trunk/connector-api/src/main/java/org/teiid/connector/visitor/fram= ework/HierarchyVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/HierarchyVisitor.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework= /HierarchyVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -1,242 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.visitor.framework; - -import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.IBatchedUpdates; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICompoundCriteria; -import com.metamatrix.connector.language.IDelete; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExistsCriteria; -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IGroupBy; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.IInlineView; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.IIsNullCriteria; -import com.metamatrix.connector.language.IJoin; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.INotCriteria; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.IOrderByItem; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IScalarSubquery; -import com.metamatrix.connector.language.ISearchedCaseExpression; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.language.ISetClause; -import com.metamatrix.connector.language.ISetClauseList; -import com.metamatrix.connector.language.ISetQuery; -import com.metamatrix.connector.language.ISubqueryCompareCriteria; -import com.metamatrix.connector.language.ISubqueryInCriteria; -import com.metamatrix.connector.language.IUpdate; - -/** - * Visits each node in a hierarchy of ILanguageObjects. The default - * implementation of each visit() method is simply to visit the children o= f a - * given ILanguageObject, if any exist, with this HierarchyVisitor (without - * performing any actions on the node). A subclass can selectively override - * visit() methods to delegate the actions performed on a node to another - * visitor by calling that Visitor's visit() method. This implementation m= akes - * no guarantees about the order in which the children of an ILanguageObje= ct are - * visited. - * @see DelegatingHierarchyVisitor - */ -public abstract class HierarchyVisitor extends AbstractLanguageVisitor { - - public HierarchyVisitor() { - } - = - public void visit(IAggregate obj) { - visitNode(obj.getExpression()); - } - = - public void visit(IBatchedUpdates obj) { - visitNodes(obj.getUpdateCommands()); - } - = - public void visit(ICompareCriteria obj) { - visitNode(obj.getLeftExpression()); - visitNode(obj.getRightExpression()); - } - = - public void visit(ICompoundCriteria obj) { - visitNodes(obj.getCriteria()); - } - = - public void visit(IDelete obj) { - visitNode(obj.getGroup()); - visitNode(obj.getCriteria()); - } - = - public void visit(IElement obj) { - } - = - public void visit(IProcedure obj) { - visitNodes(obj.getParameters()); - } - = - public void visit(IExistsCriteria obj) { - visitNode(obj.getQuery()); - } - = - public void visit(IFrom obj) { - visitNodes(obj.getItems()); - } - = - public void visit(IFunction obj) { - visitNodes(obj.getParameters()); - } - - public void visit(IGroup obj) { - } - = -// public void visit(IGroup obj) { -// } - = - public void visit(IGroupBy obj) { - visitNodes(obj.getElements()); - } - = - public void visit(IInCriteria obj) { - visitNode(obj.getLeftExpression()); - visitNodes(obj.getRightExpressions()); - } - = - public void visit(IInsert obj) { - visitNode(obj.getGroup()); - visitNodes(obj.getElements()); - visitNodes(obj.getValues()); - } - = - public void visit(IIsNullCriteria obj) { - visitNode(obj.getExpression()); - } - = - public void visit(IJoin obj) { - visitNode(obj.getLeftItem()); - visitNode(obj.getRightItem()); - if(obj.getCriteria() !=3D null) { - visitNodes(obj.getCriteria()); - } - } - = - public void visit(ILikeCriteria obj) { - visitNode(obj.getLeftExpression()); - visitNode(obj.getRightExpression()); - } - - public void visit(ILiteral obj) { - } - = - public void visit(INotCriteria obj) { - visitNode(obj.getCriteria()); - } - = - public void visit(IOrderBy obj) { - visitNodes(obj.getItems()); - } - - public void visit(IOrderByItem obj) { - } - - public void visit(IParameter obj) { - } - = - public void visit(IQuery obj) { - visitNode(obj.getSelect()); - visitNode(obj.getFrom()); - visitNode(obj.getWhere()); - visitNode(obj.getGroupBy()); - visitNode(obj.getHaving()); - visitNode(obj.getOrderBy()); - visitNode(obj.getLimit()); - } - - public void visit(IScalarSubquery obj) { - visitNode(obj.getQuery()); - } - = - public void visit(ISearchedCaseExpression obj) { - int whenCount =3D obj.getWhenCount(); - for (int i =3D 0; i < whenCount; i++) { - visitNode(obj.getWhenCriteria(i)); - visitNode(obj.getThenExpression(i)); - } - visitNode(obj.getElseExpression()); - } - = - public void visit(ISelect obj) { - visitNodes(obj.getSelectSymbols()); - } - = - public void visit(ISelectSymbol obj) { - visitNode(obj.getExpression()); - } - - public void visit(ISubqueryCompareCriteria obj) { - visitNode(obj.getLeftExpression()); - visitNode(obj.getQuery()); - } - - public void visit(ISubqueryInCriteria obj) { - visitNode(obj.getLeftExpression()); = - visitNode(obj.getQuery()); - } - = - public void visit(ISetQuery obj) { - visitNode(obj.getLeftQuery()); - visitNode(obj.getRightQuery()); = - visitNode(obj.getOrderBy()); - visitNode(obj.getLimit()); - } - = - public void visit(IUpdate obj) { - visitNode(obj.getGroup()); - visitNode(obj.getChanges()); - visitNode(obj.getCriteria()); - } - = - @Override - public void visit(IInlineView obj) { - visitNode(obj.getQuery()); - } - = - @Override - public void visit(ISetClauseList obj) { - visitNodes(obj.getClauses()); - } - = - @Override - public void visit(ISetClause obj) { - visitNode(obj.getSymbol()); - visitNode(obj.getValue()); - } - -} Copied: trunk/connector-api/src/main/java/org/teiid/connector/visitor/frame= work/HierarchyVisitor.java (from rev 499, trunk/connector-api/src/main/java= /com/metamatrix/connector/visitor/framework/HierarchyVisitor.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework= /HierarchyVisitor.java (rev 0) +++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework= /HierarchyVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -0,0 +1,238 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.visitor.framework; + +import org.teiid.connector.language.IAggregate; +import org.teiid.connector.language.IBatchedUpdates; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICompoundCriteria; +import org.teiid.connector.language.IDelete; +import org.teiid.connector.language.IExistsCriteria; +import org.teiid.connector.language.IFrom; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IGroupBy; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.language.IInlineView; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.IIsNullCriteria; +import org.teiid.connector.language.IJoin; +import org.teiid.connector.language.ILikeCriteria; +import org.teiid.connector.language.INotCriteria; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IScalarSubquery; +import org.teiid.connector.language.ISearchedCaseExpression; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.language.ISetClause; +import org.teiid.connector.language.ISetClauseList; +import org.teiid.connector.language.ISetQuery; +import org.teiid.connector.language.ISubqueryCompareCriteria; +import org.teiid.connector.language.ISubqueryInCriteria; +import org.teiid.connector.language.IUpdate; + +/** + * Visits each node in a hierarchy of ILanguageObjects. The default + * implementation of each visit() method is simply to visit the children o= f a + * given ILanguageObject, if any exist, with this HierarchyVisitor (without + * performing any actions on the node). A subclass can selectively override + * visit() methods to delegate the actions performed on a node to another + * visitor by calling that Visitor's visit() method. This implementation m= akes + * no guarantees about the order in which the children of an ILanguageObje= ct are + * visited. + * @see DelegatingHierarchyVisitor + */ +public abstract class HierarchyVisitor extends AbstractLanguageVisitor { + + private boolean visitSubcommands; + = + public HierarchyVisitor() { + this(true); + } + = + public HierarchyVisitor(boolean visitSubcommands) { + this.visitSubcommands =3D visitSubcommands; + } + = + public void visit(IAggregate obj) { + visitNode(obj.getExpression()); + } + = + public void visit(IBatchedUpdates obj) { + visitNodes(obj.getUpdateCommands()); + } + = + public void visit(ICompareCriteria obj) { + visitNode(obj.getLeftExpression()); + visitNode(obj.getRightExpression()); + } + = + public void visit(ICompoundCriteria obj) { + visitNodes(obj.getCriteria()); + } + = + public void visit(IDelete obj) { + visitNode(obj.getGroup()); + visitNode(obj.getCriteria()); + } + = + public void visit(IProcedure obj) { + visitNodes(obj.getParameters()); + } + = + public void visit(IExistsCriteria obj) { + if (visitSubcommands) { + visitNode(obj.getQuery()); + } + } + = + public void visit(IFrom obj) { + visitNodes(obj.getItems()); + } + = + public void visit(IFunction obj) { + visitNodes(obj.getParameters()); + } + + public void visit(IGroupBy obj) { + visitNodes(obj.getElements()); + } + = + public void visit(IInCriteria obj) { + visitNode(obj.getLeftExpression()); + visitNodes(obj.getRightExpressions()); + } + = + public void visit(IInsert obj) { + visitNode(obj.getGroup()); + visitNodes(obj.getElements()); + visitNodes(obj.getValues()); + } + = + public void visit(IIsNullCriteria obj) { + visitNode(obj.getExpression()); + } + = + public void visit(IJoin obj) { + visitNode(obj.getLeftItem()); + visitNode(obj.getRightItem()); + if(obj.getCriteria() !=3D null) { + visitNodes(obj.getCriteria()); + } + } + = + public void visit(ILikeCriteria obj) { + visitNode(obj.getLeftExpression()); + visitNode(obj.getRightExpression()); + } + + public void visit(INotCriteria obj) { + visitNode(obj.getCriteria()); + } + = + public void visit(IOrderBy obj) { + visitNodes(obj.getItems()); + } + + public void visit(IQuery obj) { + visitNode(obj.getSelect()); + visitNode(obj.getFrom()); + visitNode(obj.getWhere()); + visitNode(obj.getGroupBy()); + visitNode(obj.getHaving()); + visitNode(obj.getOrderBy()); + visitNode(obj.getLimit()); + } + + public void visit(IScalarSubquery obj) { + if (visitSubcommands) { + visitNode(obj.getQuery()); + } + } + = + public void visit(ISearchedCaseExpression obj) { + int whenCount =3D obj.getWhenCount(); + for (int i =3D 0; i < whenCount; i++) { + visitNode(obj.getWhenCriteria(i)); + visitNode(obj.getThenExpression(i)); + } + visitNode(obj.getElseExpression()); + } + = + public void visit(ISelect obj) { + visitNodes(obj.getSelectSymbols()); + } + = + public void visit(ISelectSymbol obj) { + visitNode(obj.getExpression()); + } + + public void visit(ISubqueryCompareCriteria obj) { + visitNode(obj.getLeftExpression()); + if (visitSubcommands) { + visitNode(obj.getQuery()); + } + } + + public void visit(ISubqueryInCriteria obj) { + visitNode(obj.getLeftExpression()); = + if (visitSubcommands) { + visitNode(obj.getQuery()); + } + } + = + public void visit(ISetQuery obj) { + if (visitSubcommands) { + visitNode(obj.getLeftQuery()); + visitNode(obj.getRightQuery()); + } + visitNode(obj.getOrderBy()); + visitNode(obj.getLimit()); + } + = + public void visit(IUpdate obj) { + visitNode(obj.getGroup()); + visitNode(obj.getChanges()); + visitNode(obj.getCriteria()); + } + = + @Override + public void visit(IInlineView obj) { + if (visitSubcommands) { + visitNode(obj.getQuery()); + } + } + = + @Override + public void visit(ISetClauseList obj) { + visitNodes(obj.getClauses()); + } + = + @Override + public void visit(ISetClause obj) { + visitNode(obj.getSymbol()); + visitNode(obj.getValue()); + } + +} Modified: trunk/connector-api/src/main/java/org/teiid/connector/visitor/fra= mework/LanguageObjectVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/fram= ework/LanguageObjectVisitor.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/framework= /LanguageObjectVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,9 +20,9 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.visitor.framework; +package org.teiid.connector.visitor.framework; = -import com.metamatrix.connector.language.*; +import org.teiid.connector.language.*; = /** */ Copied: trunk/connector-api/src/main/java/org/teiid/connector/visitor/util = (from rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/v= isitor/util) Modified: trunk/connector-api/src/main/java/org/teiid/connector/visitor/uti= l/CollectorVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /CollectorVisitor.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/Coll= ectorVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,14 +20,15 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.visitor.util; +package org.teiid.connector.visitor.util; = import java.util.*; = -import com.metamatrix.connector.language.*; -import com.metamatrix.connector.visitor.framework.DelegatingHierarchyVisit= or; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.*; +import org.teiid.connector.visitor.framework.DelegatingHierarchyVisitor; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + /** * This visitor can be used to collect all objects of a certain type in a = language * tree. Each visit method does an instanceof method to check whether the= object Modified: trunk/connector-api/src/main/java/org/teiid/connector/visitor/uti= l/SQLReservedWords.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /SQLReservedWords.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLR= eservedWords.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.visitor.util; +package org.teiid.connector.visitor.util; = public interface SQLReservedWords { = Deleted: trunk/connector-api/src/main/java/org/teiid/connector/visitor/util= /SQLStringVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/visitor/util= /SQLStringVisitor.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLS= tringVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -1,1044 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.connector.visitor.util; - -import java.util.Iterator; -import java.util.List; - -import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.IBulkInsert; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICompoundCriteria; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IDelete; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExistsCriteria; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.language.IFromItem; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IGroupBy; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.IInlineView; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.IIsNullCriteria; -import com.metamatrix.connector.language.IJoin; -import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.INotCriteria; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.IOrderByItem; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IPredicateCriteria; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.language.IScalarSubquery; -import com.metamatrix.connector.language.ISearchedCaseExpression; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.language.ISetClause; -import com.metamatrix.connector.language.ISetClauseList; -import com.metamatrix.connector.language.ISetQuery; -import com.metamatrix.connector.language.ISubqueryCompareCriteria; -import com.metamatrix.connector.language.ISubqueryInCriteria; -import com.metamatrix.connector.language.IUpdate; -import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.visitor.framework.AbstractLanguageVisitor; -import com.metamatrix.core.util.StringUtil; - -/** - * Creates a SQL string for a LanguageObject subtree. Instances of this cl= ass - * are not reusable, and are not thread-safe. - */ -public class SQLStringVisitor extends AbstractLanguageVisitor implements S= QLReservedWords { - = - private static final String ESCAPED_QUOTE =3D "''"; //$NON-NLS-1$ = - - protected static final String UNDEFINED =3D ""; //$NON-NLS-= 1$ - protected static final String UNDEFINED_PARAM =3D "?"; //$NON-NLS-1$ - = - protected StringBuffer buffer =3D new StringBuffer(); - = - /** - * Gets the name of a group or element from the RuntimeMetadata - * @param id the id of the group or element - * @return the name of that element or group as defined in the source - */ - protected String getName(MetadataObject object) { - try { - String nameInSource =3D object.getNameInSource(); - if(nameInSource !=3D null && nameInSource.length() > 0) { - return nameInSource; - } - return object.getName(); - } catch(ConnectorException e) { - return object.getName(); - } - } - = - /** - * Appends the string form of the ILanguageObject to the current buffe= r. - * @param obj the language object instance - */ - public void append(ILanguageObject obj) { - if (obj =3D=3D null) { - buffer.append(UNDEFINED); - } else { - visitNode(obj); - } - } - = - /** - * Simple utility to append a list of language objects to the current = buffer - * by creating a comma-separated list. - * @param items a list of ILanguageObjects - */ - protected void append(List items) { - if (items !=3D null && items.size() !=3D 0) { - append((ILanguageObject)items.get(0)); - for (int i =3D 1; i < items.size(); i++) { - buffer.append(COMMA) - .append(SPACE); - append((ILanguageObject)items.get(i)); - } - } - } - = - /** - * Simple utility to append an array of language objects to the curren= t buffer - * by creating a comma-separated list. - * @param items an array of ILanguageObjects - */ - protected void append(ILanguageObject[] items) { - if (items !=3D null && items.length !=3D 0) { - append(items[0]); - for (int i =3D 1; i < items.length; i++) { - buffer.append(COMMA) - .append(SPACE); - append(items[i]); - } - } - } - = - /** - * Creates a SQL-safe string. Simply replaces all occurrences of ' wit= h '' - * @param str the input string - * @return a SQL-safe string - */ - protected String escapeString(String str) { - return StringUtil.replaceAll(str, QUOTE, ESCAPED_QUOTE); - } - = - public String toString() { - return buffer.toString(); - } - = - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IAggregate) - */ - public void visit(IAggregate obj) { - buffer.append(obj.getName()) - .append(LPAREN); - = - if ( obj.isDistinct()) { - buffer.append(DISTINCT) - .append(SPACE); - } - = - if (obj.getExpression() =3D=3D null) { - buffer.append(ALL_COLS); - } else { - append(obj.getExpression()); - } - buffer.append(RPAREN); - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.ICompareCriteria) - */ - public void visit(ICompareCriteria obj) { - append(obj.getLeftExpression()); - buffer.append(SPACE); - = - switch(obj.getOperator()) { - case EQ: buffer.append(EQ); break; - case GE: buffer.append(GE); break; - case GT: buffer.append(GT); break; - case LE: buffer.append(LE); break; - case LT: buffer.append(LT); break; - case NE: buffer.append(NE); break; - default: buffer.append(UNDEFINED); - } - buffer.append(SPACE); - append(obj.getRightExpression()); - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.ICompoundCriteria) - */ - public void visit(ICompoundCriteria obj) { - String opString =3D null; - switch(obj.getOperator()) { - case AND: opString =3D AND; break; - case OR: opString =3D OR; break; - default: opString =3D UNDEFINED; - } - = - List criteria =3D obj.getCriteria(); - if (criteria =3D=3D null || criteria.size() =3D=3D 0) { - buffer.append(UNDEFINED); - } else if(criteria.size() =3D=3D 1) { - // Special case - should really never happen, but we are toler= ant - append((ILanguageObject)criteria.get(0)); - } else { - buffer.append(LPAREN); - append((ILanguageObject)criteria.get(0)); - buffer.append(RPAREN); - for (int i =3D 1; i < criteria.size(); i++) { - buffer.append(SPACE) - .append(opString) - .append(SPACE) - .append(LPAREN); - append((ILanguageObject)criteria.get(i)); - buffer.append(RPAREN); - } - = - } - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IDelete) - */ - public void visit(IDelete obj) { - buffer.append(DELETE) - .append(SPACE); - buffer.append(getSourceComment(obj)); - buffer.append(FROM) - .append(SPACE); - append(obj.getGroup()); - if (obj.getCriteria() !=3D null) { - buffer.append(SPACE) - .append(WHERE) - .append(SPACE); - append(obj.getCriteria()); - } - } - - /** - * Take the specified derived group and element short names and determ= ine a = - * replacement element name to use instead. Most commonly, this is us= ed to strip - * the group name if the group is a pseudo-group (DUAL) or the element= is a pseudo-group - * (ROWNUM). It may also be used to strip special information out of = the name in source = - * value in some specialized cases. = - * = - * By default, this method returns null, indicating that the normal gr= oup and element = - * name logic should be used (group + "." + element). Subclasses shou= ld override and - * implement this method if desired. - * = - * @param group Group name, may be null - * @param element Element name, never null - * @return Replacement element name to be used as is (no modification = will occur) - * @since 5.0 - */ - protected String replaceElementName(String group, String element) { = = - return null; - } - = - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IElement) - */ - public void visit(IElement obj) { - buffer.append(getElementName(obj, true)); - } - - private String getElementName(IElement obj, boolean qualify) { - String groupName =3D null; - IGroup group =3D obj.getGroup(); - if (group !=3D null && qualify) { - if(group.getDefinition() !=3D null) { = - groupName =3D group.getContext(); - } else { = - MetadataObject groupID =3D group.getMetadataObject(); - if(groupID !=3D null) { = - groupName =3D getName(groupID); - } else { - groupName =3D group.getContext(); - } - } - } - = - String elemShortName =3D null; = - MetadataObject elementID =3D obj.getMetadataObject(); - if(elementID !=3D null) { - elemShortName =3D getName(elementID); = - } else { - String elementName =3D obj.getName(); - elemShortName =3D getShortName(elementName); - } - - // Check whether a subclass wants to replace the element name to u= se in special circumstances - String replacementElement =3D replaceElementName(groupName, elemSh= ortName); - if(replacementElement !=3D null) { - // If so, use it as is - return replacementElement; - } = - StringBuffer elementName =3D new StringBuffer(elemShortName.length= ()); - // If not, do normal logic: [group + "."] + element - if(groupName !=3D null) { - elementName.append(groupName); - elementName.append(DOT); - } - elementName.append(elemShortName); - return elementName.toString(); - } - - /** = - * @param elementName - * @return - * @since 4.3 - */ - public static String getShortName(String elementName) { - int lastDot =3D elementName.lastIndexOf("."); //$NON-NLS-1$ - if(lastDot >=3D 0) { - elementName =3D elementName.substring(lastDot+1); = = - } = - return elementName; - } - = - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.IExecute) - */ - public void visit(IProcedure obj) { = - buffer.append(EXEC) - .append(SPACE); - = - if(obj.getMetadataObject() !=3D null) { - buffer.append(getName(obj.getMetadataObject())); = = - } else { - buffer.append(obj.getProcedureName()); - } - = - buffer.append(LPAREN); - final List params =3D obj.getParameters(); - if (params !=3D null && params.size() !=3D 0) { - IParameter param =3D null; - for (int i =3D 0; i < params.size(); i++) { - param =3D (IParameter)params.get(i); - if (param.getDirection() =3D=3D Direction.IN || param.getD= irection() =3D=3D Direction.INOUT) { - if (i !=3D 0) { - buffer.append(COMMA) - .append(SPACE); - } - if (param.getValue() !=3D null) { - buffer.append(param.getValue().toString()); - } else { - buffer.append(UNDEFINED_PARAM); - } - } - } - } - buffer.append(RPAREN); - } - - /* = - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.IExistsCriteria) - */ - public void visit(IExistsCriteria obj) { - buffer.append(EXISTS) - .append(SPACE) - .append(LPAREN); - append(obj.getQuery()); - buffer.append(RPAREN); - } - = - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IFrom) - */ - public void visit(IFrom obj) { - buffer.append(FROM) - .append(SPACE); - append(obj.getItems()); - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IFunction) - */ - public void visit(IFunction obj) { - - String name =3D obj.getName(); - List args =3D obj.getParameters(); - if(name.equalsIgnoreCase(CONVERT) || name.equalsIgnoreCase(CAST)) = { = - = - Object typeValue =3D ((ILiteral)args.get(1)).getValue(); - = - buffer.append(name); - buffer.append(LPAREN); = - = - append(args.get(0)); - - if(name.equalsIgnoreCase(CONVERT)) { = - buffer.append(COMMA); = - buffer.append(SPACE); = - } else { - buffer.append(SPACE); = - buffer.append(AS); = - buffer.append(SPACE); = - } - buffer.append(typeValue); - buffer.append(RPAREN); = - } else if(name.equals("%") || name.equals("+") || name.equals("-")= || name.equals("*") || name.equals("/") || name.equals("||")) { //$NON-NLS= -1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - buffer.append(LPAREN); = - - if(args !=3D null) { - for(int i=3D0; i 0) { - buffer.append(((ILiteral)args.get(0)).getValue()); - - for(int i=3D1; i 0) { - buffer.append(obj.getRowOffset()) - .append(COMMA) - .append(SPACE); - } - buffer.append(obj.getRowLimit()); - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.ILiteral) - */ - public void visit(ILiteral obj) { - if (obj.getValue() =3D=3D null) { - buffer.append(NULL); - } else { - Class type =3D obj.getType(); - String val =3D obj.getValue().toString(); - if(Number.class.isAssignableFrom(type)) { - buffer.append(val); - } else if(type.equals(DataTypeManager.DefaultDataClasses.BOOLE= AN)) { - buffer.append("{b'") //$NON-NLS-1$ - .append(val) - .append("'}"); //$NON-NLS-1$ - } else if(type.equals(DataTypeManager.DefaultDataClasses.TIMES= TAMP)) { - buffer.append("{ts'") //$NON-NLS-1$ - .append(val) - .append("'}"); //$NON-NLS-1$ - } else if(type.equals(DataTypeManager.DefaultDataClasses.TIME)= ) { - buffer.append("{t'") //$NON-NLS-1$ - .append(val) - .append("'}"); //$NON-NLS-1$ - } else if(type.equals(DataTypeManager.DefaultDataClasses.DATE)= ) { - buffer.append("{d'") //$NON-NLS-1$ - .append(val) - .append("'}"); //$NON-NLS-1$ - } else { - buffer.append(QUOTE) - .append(escapeString(val)) - .append(QUOTE); - } - } - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.INotCriteria) - */ - public void visit(INotCriteria obj) { - buffer.append(NOT) - .append(SPACE) - .append(LPAREN); - append(obj.getCriteria()); - buffer.append(RPAREN); - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IOrderBy) - */ - public void visit(IOrderBy obj) { - buffer.append(ORDER) - .append(SPACE) - .append(BY) - .append(SPACE); - append(obj.getItems()); - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IOrderByItem) - */ - public void visit(IOrderByItem obj) { - if(obj.getName() !=3D null) { - String name =3D getShortName(obj.getName()); - buffer.append(name); - } else if (obj.getElement() !=3D null) { - visit(obj.getElement()); = - } else { - buffer.append(UNDEFINED); - } - if (obj.getDirection() =3D=3D IOrderByItem.DESC) { - buffer.append(SPACE) - .append(DESC); - } // Don't print default "ASC" - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IParameter) - */ - public void visit(IParameter obj) { - if (obj.getValue() =3D=3D null) { - buffer.append(UNDEFINED_PARAM); - } else if (obj.getValue() =3D=3D null) { - buffer.append(NULL); - } else { - buffer.append(obj.getValue().toString()); - } - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IQuery) - */ - public void visit(IQuery obj) { - visitSelect(obj.getSelect(), obj); - if (obj.getFrom() !=3D null) { - buffer.append(SPACE); - append(obj.getFrom()); - } - if (obj.getWhere() !=3D null) { - buffer.append(SPACE) - .append(WHERE) - .append(SPACE); - append(obj.getWhere()); - } - if (obj.getGroupBy() !=3D null) { - buffer.append(SPACE); - append(obj.getGroupBy()); - } - if (obj.getHaving() !=3D null) { - buffer.append(SPACE) - .append(HAVING) - .append(SPACE); - append(obj.getHaving()); - } - if (obj.getOrderBy() !=3D null) { - buffer.append(SPACE); - append(obj.getOrderBy()); - } - if (obj.getLimit() !=3D null) { - buffer.append(SPACE); - append(obj.getLimit()); - } - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.ISearchedCaseExpression) - */ - public void visit(ISearchedCaseExpression obj) { - buffer.append(CASE); - final int whenCount =3D obj.getWhenCount(); - for (int i =3D 0; i < whenCount; i++) { - buffer.append(SPACE) - .append(WHEN) - .append(SPACE); - append(obj.getWhenCriteria(i)); - buffer.append(SPACE) - .append(THEN) - .append(SPACE); - append(obj.getThenExpression(i)); - } - if (obj.getElseExpression() !=3D null) { - buffer.append(SPACE) - .append(ELSE) - .append(SPACE); - append(obj.getElseExpression()); - } - buffer.append(SPACE) - .append(END); - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.ISelect) - */ - public void visit(ISelect obj) { - visitSelect(obj, null); - } - - private void visitSelect(ISelect obj, ICommand command) { - buffer.append(SELECT).append(SPACE); - buffer.append(getSourceComment(command)); - if (obj.isDistinct()) { - buffer.append(DISTINCT).append(SPACE); - } - append(obj.getSelectSymbols()); - } - = - - protected String getSourceComment(ICommand command) { - return ""; //$NON-NLS-1$ - } - = - /* - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.IScalarSubquery) - */ - public void visit(IScalarSubquery obj) { - buffer.append(LPAREN); = - append(obj.getQuery()); = - buffer.append(RPAREN); = - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.ISelectSymbol) - */ - public void visit(ISelectSymbol obj) { - append(obj.getExpression()); - if (obj.hasAlias()) { - buffer.append(SPACE) - .append(AS) - .append(SPACE) - .append(obj.getOutputName()); - } - } - - /* = - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.ISubqueryCompareCriteria) - */ - public void visit(ISubqueryCompareCriteria obj) { - append(obj.getLeftExpression()); - buffer.append(SPACE); - = - switch(obj.getOperator()) { - case EQ: buffer.append(EQ); break; - case GE: buffer.append(GE); break; - case GT: buffer.append(GT); break; - case LE: buffer.append(LE); break; - case LT: buffer.append(LT); break; - case NE: buffer.append(NE); break; - default: buffer.append(UNDEFINED); - } - buffer.append(SPACE); - switch(obj.getQuantifier()) { - case ALL: buffer.append(ALL); break; - case SOME: buffer.append(SOME); break; - default: buffer.append(UNDEFINED); - } - buffer.append(SPACE); - buffer.append(LPAREN); = - append(obj.getQuery()); - buffer.append(RPAREN); = - } - - /* = - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.ISubqueryInCriteria) - */ - public void visit(ISubqueryInCriteria obj) { - append(obj.getLeftExpression()); - if (obj.isNegated()) { - buffer.append(SPACE) - .append(NOT); - } - buffer.append(SPACE) - .append(IN) - .append(SPACE) - .append(LPAREN); - append(obj.getQuery()); - buffer.append(RPAREN); - } - - /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IUpdate) - */ - public void visit(IUpdate obj) { - buffer.append(UPDATE) - .append(SPACE); - buffer.append(getSourceComment(obj)); - append(obj.getGroup()); - buffer.append(SPACE) - .append(SET) - .append(SPACE); - append(obj.getChanges()); = - if (obj.getCriteria() !=3D null) { - buffer.append(SPACE) - .append(WHERE) - .append(SPACE); - append(obj.getCriteria()); - } - } - = - public void visit(ISetClauseList obj) { - append(obj.getClauses()); - } - = - public void visit(ISetClause clause) { - buffer.append(getElementName(clause.getSymbol(), false)); - buffer.append(SPACE).append(EQ).append(SPACE); - append(clause.getValue()); - } - = - public void visit(ISetQuery obj) { - appendSetQuery(obj.getLeftQuery()); - = - buffer.append(SPACE); - = - appendSetOperation(obj.getOperation()); - - if(obj.isAll()) { - buffer.append(SPACE); - buffer.append(ALL); = - } - buffer.append(SPACE); - - appendSetQuery(obj.getRightQuery()); - = - IOrderBy orderBy =3D obj.getOrderBy(); - if(orderBy !=3D null) { - buffer.append(SPACE); - append(orderBy); - } - - ILimit limit =3D obj.getLimit(); - if(limit !=3D null) { - buffer.append(SPACE); - append(limit); - } - } - - protected void appendSetOperation(ISetQuery.Operation operation) { - buffer.append(operation); - } - = - protected boolean useParensForSetQueries() { - return false; - } - - protected void appendSetQuery(IQueryCommand obj) { - if(obj instanceof ISetQuery || useParensForSetQueries()) { - buffer.append(LPAREN); - append(obj); - buffer.append(RPAREN); - } else { - append(obj); - } - } - = - /** - * Gets the SQL string representation for a given ILanguageObject. - * @param obj the root of the ILanguageObject hierarchy that needs to = be - * converted. This can be any subtree, and does not need to be a top-l= evel - * command - * @return the SQL representation of that ILanguageObject hierarchy - */ - public static String getSQLString(ILanguageObject obj) { - SQLStringVisitor visitor =3D new SQLStringVisitor(); - visitor.append(obj); - return visitor.toString(); - } - -} Copied: trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/= SQLStringVisitor.java (from rev 499, trunk/connector-api/src/main/java/com/= metamatrix/connector/visitor/util/SQLStringVisitor.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLS= tringVisitor.java (rev 0) +++ trunk/connector-api/src/main/java/org/teiid/connector/visitor/util/SQLS= tringVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -0,0 +1,1044 @@ +/* + * JBoss, Home of Professional Open Source. + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * = + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * = + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * = + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA. + */ + +package org.teiid.connector.visitor.util; + +import java.util.Iterator; +import java.util.List; + +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IAggregate; +import org.teiid.connector.language.IBulkInsert; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICompoundCriteria; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IDelete; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExistsCriteria; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFrom; +import org.teiid.connector.language.IFromItem; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IGroupBy; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.language.IInlineView; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.IIsNullCriteria; +import org.teiid.connector.language.IJoin; +import org.teiid.connector.language.ILanguageObject; +import org.teiid.connector.language.ILikeCriteria; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.INotCriteria; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.language.IOrderByItem; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IPredicateCriteria; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.language.IScalarSubquery; +import org.teiid.connector.language.ISearchedCaseExpression; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.language.ISetClause; +import org.teiid.connector.language.ISetClauseList; +import org.teiid.connector.language.ISetQuery; +import org.teiid.connector.language.ISubqueryCompareCriteria; +import org.teiid.connector.language.ISubqueryInCriteria; +import org.teiid.connector.language.IUpdate; +import org.teiid.connector.language.IParameter.Direction; +import org.teiid.connector.metadata.runtime.MetadataObject; +import org.teiid.connector.visitor.framework.AbstractLanguageVisitor; + +import com.metamatrix.common.types.DataTypeManager; +import com.metamatrix.core.util.StringUtil; + +/** + * Creates a SQL string for a LanguageObject subtree. Instances of this cl= ass + * are not reusable, and are not thread-safe. + */ +public class SQLStringVisitor extends AbstractLanguageVisitor implements S= QLReservedWords { + = + private static final String ESCAPED_QUOTE =3D "''"; //$NON-NLS-1$ = + + protected static final String UNDEFINED =3D ""; //$NON-NLS-= 1$ + protected static final String UNDEFINED_PARAM =3D "?"; //$NON-NLS-1$ + = + protected StringBuffer buffer =3D new StringBuffer(); + = + /** + * Gets the name of a group or element from the RuntimeMetadata + * @param id the id of the group or element + * @return the name of that element or group as defined in the source + */ + protected String getName(MetadataObject object) { + try { + String nameInSource =3D object.getNameInSource(); + if(nameInSource !=3D null && nameInSource.length() > 0) { + return nameInSource; + } + return object.getName(); + } catch(ConnectorException e) { + return object.getName(); + } + } + = + /** + * Appends the string form of the ILanguageObject to the current buffe= r. + * @param obj the language object instance + */ + public void append(ILanguageObject obj) { + if (obj =3D=3D null) { + buffer.append(UNDEFINED); + } else { + visitNode(obj); + } + } + = + /** + * Simple utility to append a list of language objects to the current = buffer + * by creating a comma-separated list. + * @param items a list of ILanguageObjects + */ + protected void append(List items) { + if (items !=3D null && items.size() !=3D 0) { + append((ILanguageObject)items.get(0)); + for (int i =3D 1; i < items.size(); i++) { + buffer.append(COMMA) + .append(SPACE); + append((ILanguageObject)items.get(i)); + } + } + } + = + /** + * Simple utility to append an array of language objects to the curren= t buffer + * by creating a comma-separated list. + * @param items an array of ILanguageObjects + */ + protected void append(ILanguageObject[] items) { + if (items !=3D null && items.length !=3D 0) { + append(items[0]); + for (int i =3D 1; i < items.length; i++) { + buffer.append(COMMA) + .append(SPACE); + append(items[i]); + } + } + } + = + /** + * Creates a SQL-safe string. Simply replaces all occurrences of ' wit= h '' + * @param str the input string + * @return a SQL-safe string + */ + protected String escapeString(String str) { + return StringUtil.replaceAll(str, QUOTE, ESCAPED_QUOTE); + } + = + public String toString() { + return buffer.toString(); + } + = + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.IAggregate) + */ + public void visit(IAggregate obj) { + buffer.append(obj.getName()) + .append(LPAREN); + = + if ( obj.isDistinct()) { + buffer.append(DISTINCT) + .append(SPACE); + } + = + if (obj.getExpression() =3D=3D null) { + buffer.append(ALL_COLS); + } else { + append(obj.getExpression()); + } + buffer.append(RPAREN); + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.ICompareCriteria) + */ + public void visit(ICompareCriteria obj) { + append(obj.getLeftExpression()); + buffer.append(SPACE); + = + switch(obj.getOperator()) { + case EQ: buffer.append(EQ); break; + case GE: buffer.append(GE); break; + case GT: buffer.append(GT); break; + case LE: buffer.append(LE); break; + case LT: buffer.append(LT); break; + case NE: buffer.append(NE); break; + default: buffer.append(UNDEFINED); + } + buffer.append(SPACE); + append(obj.getRightExpression()); + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.ICompoundCriteria) + */ + public void visit(ICompoundCriteria obj) { + String opString =3D null; + switch(obj.getOperator()) { + case AND: opString =3D AND; break; + case OR: opString =3D OR; break; + default: opString =3D UNDEFINED; + } + = + List criteria =3D obj.getCriteria(); + if (criteria =3D=3D null || criteria.size() =3D=3D 0) { + buffer.append(UNDEFINED); + } else if(criteria.size() =3D=3D 1) { + // Special case - should really never happen, but we are toler= ant + append((ILanguageObject)criteria.get(0)); + } else { + buffer.append(LPAREN); + append((ILanguageObject)criteria.get(0)); + buffer.append(RPAREN); + for (int i =3D 1; i < criteria.size(); i++) { + buffer.append(SPACE) + .append(opString) + .append(SPACE) + .append(LPAREN); + append((ILanguageObject)criteria.get(i)); + buffer.append(RPAREN); + } + = + } + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.IDelete) + */ + public void visit(IDelete obj) { + buffer.append(DELETE) + .append(SPACE); + buffer.append(getSourceComment(obj)); + buffer.append(FROM) + .append(SPACE); + append(obj.getGroup()); + if (obj.getCriteria() !=3D null) { + buffer.append(SPACE) + .append(WHERE) + .append(SPACE); + append(obj.getCriteria()); + } + } + + /** + * Take the specified derived group and element short names and determ= ine a = + * replacement element name to use instead. Most commonly, this is us= ed to strip + * the group name if the group is a pseudo-group (DUAL) or the element= is a pseudo-group + * (ROWNUM). It may also be used to strip special information out of = the name in source = + * value in some specialized cases. = + * = + * By default, this method returns null, indicating that the normal gr= oup and element = + * name logic should be used (group + "." + element). Subclasses shou= ld override and + * implement this method if desired. + * = + * @param group Group name, may be null + * @param element Element name, never null + * @return Replacement element name to be used as is (no modification = will occur) + * @since 5.0 + */ + protected String replaceElementName(String group, String element) { = = + return null; + } + = + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.IElement) + */ + public void visit(IElement obj) { + buffer.append(getElementName(obj, true)); + } + + private String getElementName(IElement obj, boolean qualify) { + String groupName =3D null; + IGroup group =3D obj.getGroup(); + if (group !=3D null && qualify) { + if(group.getDefinition() !=3D null) { = + groupName =3D group.getContext(); + } else { = + MetadataObject groupID =3D group.getMetadataObject(); + if(groupID !=3D null) { = + groupName =3D getName(groupID); + } else { + groupName =3D group.getContext(); + } + } + } + = + String elemShortName =3D null; = + MetadataObject elementID =3D obj.getMetadataObject(); + if(elementID !=3D null) { + elemShortName =3D getName(elementID); = + } else { + String elementName =3D obj.getName(); + elemShortName =3D getShortName(elementName); + } + + // Check whether a subclass wants to replace the element name to u= se in special circumstances + String replacementElement =3D replaceElementName(groupName, elemSh= ortName); + if(replacementElement !=3D null) { + // If so, use it as is + return replacementElement; + } = + StringBuffer elementName =3D new StringBuffer(elemShortName.length= ()); + // If not, do normal logic: [group + "."] + element + if(groupName !=3D null) { + elementName.append(groupName); + elementName.append(DOT); + } + elementName.append(elemShortName); + return elementName.toString(); + } + + /** = + * @param elementName + * @return + * @since 4.3 + */ + public static String getShortName(String elementName) { + int lastDot =3D elementName.lastIndexOf("."); //$NON-NLS-1$ + if(lastDot >=3D 0) { + elementName =3D elementName.substring(lastDot+1); = = + } = + return elementName; + } + = + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.IExecute) + */ + public void visit(IProcedure obj) { = + buffer.append(EXEC) + .append(SPACE); + = + if(obj.getMetadataObject() !=3D null) { + buffer.append(getName(obj.getMetadataObject())); = = + } else { + buffer.append(obj.getProcedureName()); + } + = + buffer.append(LPAREN); + final List params =3D obj.getParameters(); + if (params !=3D null && params.size() !=3D 0) { + IParameter param =3D null; + for (int i =3D 0; i < params.size(); i++) { + param =3D (IParameter)params.get(i); + if (param.getDirection() =3D=3D Direction.IN || param.getD= irection() =3D=3D Direction.INOUT) { + if (i !=3D 0) { + buffer.append(COMMA) + .append(SPACE); + } + if (param.getValue() !=3D null) { + buffer.append(param.getValue().toString()); + } else { + buffer.append(UNDEFINED_PARAM); + } + } + } + } + buffer.append(RPAREN); + } + + /* = + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.IExistsCriteria) + */ + public void visit(IExistsCriteria obj) { + buffer.append(EXISTS) + .append(SPACE) + .append(LPAREN); + append(obj.getQuery()); + buffer.append(RPAREN); + } + = + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.IFrom) + */ + public void visit(IFrom obj) { + buffer.append(FROM) + .append(SPACE); + append(obj.getItems()); + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.IFunction) + */ + public void visit(IFunction obj) { + + String name =3D obj.getName(); + List args =3D obj.getParameters(); + if(name.equalsIgnoreCase(CONVERT) || name.equalsIgnoreCase(CAST)) = { = + = + Object typeValue =3D ((ILiteral)args.get(1)).getValue(); + = + buffer.append(name); + buffer.append(LPAREN); = + = + append(args.get(0)); + + if(name.equalsIgnoreCase(CONVERT)) { = + buffer.append(COMMA); = + buffer.append(SPACE); = + } else { + buffer.append(SPACE); = + buffer.append(AS); = + buffer.append(SPACE); = + } + buffer.append(typeValue); + buffer.append(RPAREN); = + } else if(name.equals("%") || name.equals("+") || name.equals("-")= || name.equals("*") || name.equals("/") || name.equals("||")) { //$NON-NLS= -1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + buffer.append(LPAREN); = + + if(args !=3D null) { + for(int i=3D0; i 0) { + buffer.append(((ILiteral)args.get(0)).getValue()); + + for(int i=3D1; i 0) { + buffer.append(obj.getRowOffset()) + .append(COMMA) + .append(SPACE); + } + buffer.append(obj.getRowLimit()); + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.ILiteral) + */ + public void visit(ILiteral obj) { + if (obj.getValue() =3D=3D null) { + buffer.append(NULL); + } else { + Class type =3D obj.getType(); + String val =3D obj.getValue().toString(); + if(Number.class.isAssignableFrom(type)) { + buffer.append(val); + } else if(type.equals(DataTypeManager.DefaultDataClasses.BOOLE= AN)) { + buffer.append("{b'") //$NON-NLS-1$ + .append(val) + .append("'}"); //$NON-NLS-1$ + } else if(type.equals(DataTypeManager.DefaultDataClasses.TIMES= TAMP)) { + buffer.append("{ts'") //$NON-NLS-1$ + .append(val) + .append("'}"); //$NON-NLS-1$ + } else if(type.equals(DataTypeManager.DefaultDataClasses.TIME)= ) { + buffer.append("{t'") //$NON-NLS-1$ + .append(val) + .append("'}"); //$NON-NLS-1$ + } else if(type.equals(DataTypeManager.DefaultDataClasses.DATE)= ) { + buffer.append("{d'") //$NON-NLS-1$ + .append(val) + .append("'}"); //$NON-NLS-1$ + } else { + buffer.append(QUOTE) + .append(escapeString(val)) + .append(QUOTE); + } + } + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.INotCriteria) + */ + public void visit(INotCriteria obj) { + buffer.append(NOT) + .append(SPACE) + .append(LPAREN); + append(obj.getCriteria()); + buffer.append(RPAREN); + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.IOrderBy) + */ + public void visit(IOrderBy obj) { + buffer.append(ORDER) + .append(SPACE) + .append(BY) + .append(SPACE); + append(obj.getItems()); + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.IOrderByItem) + */ + public void visit(IOrderByItem obj) { + if(obj.getName() !=3D null) { + String name =3D getShortName(obj.getName()); + buffer.append(name); + } else if (obj.getElement() !=3D null) { + append(obj.getElement()); = + } else { + buffer.append(UNDEFINED); + } + if (obj.getDirection() =3D=3D IOrderByItem.DESC) { + buffer.append(SPACE) + .append(DESC); + } // Don't print default "ASC" + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.IParameter) + */ + public void visit(IParameter obj) { + if (obj.getValue() =3D=3D null) { + buffer.append(UNDEFINED_PARAM); + } else if (obj.getValue() =3D=3D null) { + buffer.append(NULL); + } else { + buffer.append(obj.getValue().toString()); + } + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.IQuery) + */ + public void visit(IQuery obj) { + visitSelect(obj.getSelect(), obj); + if (obj.getFrom() !=3D null) { + buffer.append(SPACE); + append(obj.getFrom()); + } + if (obj.getWhere() !=3D null) { + buffer.append(SPACE) + .append(WHERE) + .append(SPACE); + append(obj.getWhere()); + } + if (obj.getGroupBy() !=3D null) { + buffer.append(SPACE); + append(obj.getGroupBy()); + } + if (obj.getHaving() !=3D null) { + buffer.append(SPACE) + .append(HAVING) + .append(SPACE); + append(obj.getHaving()); + } + if (obj.getOrderBy() !=3D null) { + buffer.append(SPACE); + append(obj.getOrderBy()); + } + if (obj.getLimit() !=3D null) { + buffer.append(SPACE); + append(obj.getLimit()); + } + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.ISearchedCaseExpression) + */ + public void visit(ISearchedCaseExpression obj) { + buffer.append(CASE); + final int whenCount =3D obj.getWhenCount(); + for (int i =3D 0; i < whenCount; i++) { + buffer.append(SPACE) + .append(WHEN) + .append(SPACE); + append(obj.getWhenCriteria(i)); + buffer.append(SPACE) + .append(THEN) + .append(SPACE); + append(obj.getThenExpression(i)); + } + if (obj.getElseExpression() !=3D null) { + buffer.append(SPACE) + .append(ELSE) + .append(SPACE); + append(obj.getElseExpression()); + } + buffer.append(SPACE) + .append(END); + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.ISelect) + */ + public void visit(ISelect obj) { + visitSelect(obj, null); + } + + private void visitSelect(ISelect obj, ICommand command) { + buffer.append(SELECT).append(SPACE); + buffer.append(getSourceComment(command)); + if (obj.isDistinct()) { + buffer.append(DISTINCT).append(SPACE); + } + append(obj.getSelectSymbols()); + } + + protected String getSourceComment(ICommand command) { + return ""; //$NON-NLS-1$ + } + = + /* + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.IScalarSubquery) + */ + public void visit(IScalarSubquery obj) { + buffer.append(LPAREN); = + append(obj.getQuery()); = + buffer.append(RPAREN); = + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.ISelectSymbol) + */ + public void visit(ISelectSymbol obj) { + append(obj.getExpression()); + if (obj.hasAlias()) { + buffer.append(SPACE) + .append(AS) + .append(SPACE) + .append(obj.getOutputName()); + } + } + + /* = + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.ISubqueryCompareCriteria) + */ + public void visit(ISubqueryCompareCriteria obj) { + append(obj.getLeftExpression()); + buffer.append(SPACE); + = + switch(obj.getOperator()) { + case EQ: buffer.append(EQ); break; + case GE: buffer.append(GE); break; + case GT: buffer.append(GT); break; + case LE: buffer.append(LE); break; + case LT: buffer.append(LT); break; + case NE: buffer.append(NE); break; + default: buffer.append(UNDEFINED); + } + buffer.append(SPACE); + switch(obj.getQuantifier()) { + case ALL: buffer.append(ALL); break; + case SOME: buffer.append(SOME); break; + default: buffer.append(UNDEFINED); + } + buffer.append(SPACE); + buffer.append(LPAREN); = + append(obj.getQuery()); + buffer.append(RPAREN); = + } + + /* = + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.data.language.ISubqueryInCriteria) + */ + public void visit(ISubqueryInCriteria obj) { + append(obj.getLeftExpression()); + if (obj.isNegated()) { + buffer.append(SPACE) + .append(NOT); + } + buffer.append(SPACE) + .append(IN) + .append(SPACE) + .append(LPAREN); + append(obj.getQuery()); + buffer.append(RPAREN); + } + + /** + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.IUpdate) + */ + public void visit(IUpdate obj) { + buffer.append(UPDATE) + .append(SPACE); + buffer.append(getSourceComment(obj)); + append(obj.getGroup()); + buffer.append(SPACE) + .append(SET) + .append(SPACE); + append(obj.getChanges()); = + if (obj.getCriteria() !=3D null) { + buffer.append(SPACE) + .append(WHERE) + .append(SPACE); + append(obj.getCriteria()); + } + } + = + public void visit(ISetClauseList obj) { + append(obj.getClauses()); + } + = + public void visit(ISetClause clause) { + buffer.append(getElementName(clause.getSymbol(), false)); + buffer.append(SPACE).append(EQ).append(SPACE); + append(clause.getValue()); + } + = + public void visit(ISetQuery obj) { + appendSetQuery(obj.getLeftQuery()); + = + buffer.append(SPACE); + = + appendSetOperation(obj.getOperation()); + + if(obj.isAll()) { + buffer.append(SPACE); + buffer.append(ALL); = + } + buffer.append(SPACE); + + appendSetQuery(obj.getRightQuery()); + = + IOrderBy orderBy =3D obj.getOrderBy(); + if(orderBy !=3D null) { + buffer.append(SPACE); + append(orderBy); + } + + ILimit limit =3D obj.getLimit(); + if(limit !=3D null) { + buffer.append(SPACE); + append(limit); + } + } + + protected void appendSetOperation(ISetQuery.Operation operation) { + buffer.append(operation); + } + = + protected boolean useParensForSetQueries() { + return false; + } + + protected void appendSetQuery(IQueryCommand obj) { + if(obj instanceof ISetQuery || useParensForSetQueries()) { + buffer.append(LPAREN); + append(obj); + buffer.append(RPAREN); + } else { + append(obj); + } + } + = + /** + * Gets the SQL string representation for a given ILanguageObject. + * @param obj the root of the ILanguageObject hierarchy that needs to = be + * converted. This can be any subtree, and does not need to be a top-l= evel + * command + * @return the SQL representation of that ILanguageObject hierarchy + */ + public static String getSQLString(ILanguageObject obj) { + SQLStringVisitor visitor =3D new SQLStringVisitor(); + visitor.append(obj); + return visitor.toString(); + } + +} Copied: trunk/connector-api/src/main/java/org/teiid/connector/xa/api (from = rev 498, trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api) Modified: trunk/connector-api/src/main/java/org/teiid/connector/xa/api/Tran= sactionContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/Trans= actionContext.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/xa/api/Transactio= nContext.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,7 +20,7 @@ * 02110-1301 USA. */ = -package com.metamatrix.connector.xa.api; +package org.teiid.connector.xa.api; = import javax.transaction.Transaction; = Modified: trunk/connector-api/src/main/java/org/teiid/connector/xa/api/XACo= nnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XACon= nection.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/xa/api/XAConnecti= on.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,13 +22,14 @@ = /* */ -package com.metamatrix.connector.xa.api; +package org.teiid.connector.xa.api; = import javax.transaction.xa.XAResource; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorException; = + public interface XAConnection extends Connection{ /** * Get XAResource for this connection Modified: trunk/connector-api/src/main/java/org/teiid/connector/xa/api/XACo= nnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/main/java/com/metamatrix/connector/xa/api/XACon= nector.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/main/java/org/teiid/connector/xa/api/XAConnecto= r.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = /* */ -package com.metamatrix.connector.xa.api; +package org.teiid.connector.xa.api; = -import com.metamatrix.connector.api.*; +import org.teiid.connector.api.*; = = public interface XAConnector extends Connector{ Copied: trunk/connector-api/src/main/resources/org (from rev 498, trunk/con= nector-api/src/main/resources/com) Property changes on: trunk/connector-api/src/main/resources/org ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connector-api/src/main/resources/org/teiid (from rev 498, tru= nk/connector-api/src/main/resources/com/metamatrix) Property changes on: trunk/connector-api/src/main/resources/org/teiid ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connector-api/src/main/resources/org/teiid/connector (from re= v 498, trunk/connector-api/src/main/resources/com/metamatrix/data) Property changes on: trunk/connector-api/src/main/resources/org/teiid/conne= ctor ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connector-api/src/test/java/org (from rev 498, trunk/connecto= r-api/src/test/java/com) Property changes on: trunk/connector-api/src/test/java/org ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connector-api/src/test/java/org/teiid (from rev 498, trunk/co= nnector-api/src/test/java/com/metamatrix) Property changes on: trunk/connector-api/src/test/java/org/teiid ___________________________________________________________________ Name: svn:mergeinfo + = Copied: trunk/connector-api/src/test/java/org/teiid/connector (from rev 498= , trunk/connector-api/src/test/java/com/metamatrix/data/pool) Property changes on: trunk/connector-api/src/test/java/org/teiid/connector ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connector-api/src/test/java/org/teiid/connector/TestCredent= ialMap.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/test/java/com/metamatrix/data/pool/TestCredenti= alMap.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/test/java/org/teiid/connector/TestCredentialMap= .java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,13 +20,14 @@ * 02110-1301 USA. */ = -package com.metamatrix.data.pool; +package org.teiid.connector; = import java.util.HashMap; import java.util.Map; = -import com.metamatrix.connector.api.CredentialMap; +import org.teiid.connector.api.CredentialMap; = + import junit.framework.TestCase; = /** Copied: trunk/connector-api/src/test/java/org/teiid/connector/basic (from r= ev 498, trunk/connector-api/src/test/java/com/metamatrix/data/transform) Property changes on: trunk/connector-api/src/test/java/org/teiid/connector/= basic ___________________________________________________________________ Name: svn:mergeinfo + = Modified: trunk/connector-api/src/test/java/org/teiid/connector/basic/TestB= asicValueTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-api/src/test/java/com/metamatrix/data/transform/TestBas= icValueTranslator.java 2009-02-25 18:12:40 UTC (rev 498) +++ trunk/connector-api/src/test/java/org/teiid/connector/basic/TestBasicVa= lueTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -20,16 +20,16 @@ * 02110-1301 USA. */ = -package com.metamatrix.data.transform; +package org.teiid.connector.basic; = import junit.framework.TestCase; = import org.mockito.Mockito; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.basic.BasicValueTranslator; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.basic.BasicValueTranslator; = = /** = Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/IndexConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/IndexConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/IndexConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,10 +22,11 @@ = package com.metamatrix.connector.metadata; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling; + import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; import com.metamatrix.connector.metadata.adapter.ObjectConnector; import com.metamatrix.connector.metadata.internal.IObjectSource; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; @@ -40,7 +41,7 @@ public class IndexConnector extends ObjectConnector { = /** = - * @see com.metamatrix.connector.metadata.adapter.ObjectConnector#getO= bjectSource(com.metamatrix.connector.api.ConnectorEnvironment, com.metamatr= ix.connector.api.ExecutionContext) + * @see com.metamatrix.connector.metadata.adapter.ObjectConnector#getO= bjectSource(org.teiid.connector.api.ConnectorEnvironment, org.teiid.connect= or.api.ExecutionContext) */ protected IObjectSource getMetadataObjectSource(final ExecutionContext= context) throws ConnectorException { ConnectorEnvironmentImpl internalEnvironment =3D (ConnectorEnviron= mentImpl) this.getEnvironment(); Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/MetadataProcedureExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/MetadataProcedureExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/MetadataProcedureExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,17 +25,18 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IParameter.Direction; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IParameter.Direction; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.metadata.internal.IObjectSource; import com.metamatrix.connector.metadata.internal.ObjectProcedure; import com.metamatrix.connector.metadata.internal.ObjectProcedureProcessor; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = = /** = @@ -86,7 +87,7 @@ } = /** = - * @see com.metamatrix.connector.api.ProcedureExecution#getOutputValue= (com.metamatrix.connector.language.IParameter) + * @see org.teiid.connector.api.ProcedureExecution#getOutputValue(org.= teiid.connector.language.IParameter) * @since 4.2 */ public Object getOutputValue(final IParameter parameter) throws Connec= torException { @@ -98,7 +99,7 @@ } = /** = - * @see com.metamatrix.connector.api.Execution#cancel() + * @see org.teiid.connector.api.Execution#cancel() * @since 4.2 */ public void cancel() throws ConnectorException { @@ -106,7 +107,7 @@ } = /** = - * @see com.metamatrix.connector.api.Execution#close() + * @see org.teiid.connector.api.Execution#close() * @since 4.2 */ public void close() throws ConnectorException { Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/adapter/ObjectConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,18 +22,19 @@ = package com.metamatrix.connector.metadata.adapter; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.metadata.MetadataProcedureExecution; import com.metamatrix.connector.metadata.internal.IObjectSource; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** * Adapter to make object processing code comply with the standard connect= or API. Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/adapter/ObjectConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,12 +22,13 @@ = package com.metamatrix.connector.metadata.adapter; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.basic.BasicConnector; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.basic.BasicConnector; + import com.metamatrix.connector.metadata.internal.IObjectSource; = /** Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/adapter/ObjectConnectorCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectConnectorCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectConnectorCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,10 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.basic.BasicConnectorCapabilities; = + /** * Describes the capabilities of the object connector, which are few. */ @@ -64,7 +65,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsLikeCriteria() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsL= ikeCriteria() * @since 4.3 */ public boolean supportsLikeCriteria() { @@ -79,7 +80,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsScalarFunctions() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsS= calarFunctions() * @since 4.3 */ public boolean supportsScalarFunctions() { @@ -87,7 +88,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#getS= upportedFunctions() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#getSuppor= tedFunctions() * @since 4.3 */ public List getSupportedFunctions() { @@ -104,7 +105,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsLikeCriteriaEscapeCharacter() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsL= ikeCriteriaEscapeCharacter() * @since 5.0 */ public boolean supportsLikeCriteriaEscapeCharacter() { Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/adapter/ObjectSynchExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectSynchExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/adapter/ObjectSynchExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,17 +25,18 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.IQuery; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.metadata.MetadataConnectorPlugin; import com.metamatrix.connector.metadata.internal.IObjectQuery; import com.metamatrix.connector.metadata.internal.MetadataException; import com.metamatrix.connector.metadata.internal.ObjectQuery; import com.metamatrix.connector.metadata.internal.ObjectQueryProcessor; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** * Adapter to expose the object processing logic via the standard connecto= r API. Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/internal/MetadataSearchCriteriaBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/MetadataSearchCriteriaBuilder.java 2009-02-25 19:09:43 UTC (rev = 501) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/MetadataSearchCriteriaBuilder.java 2009-02-25 20:18:40 UTC (rev = 502) @@ -28,18 +28,19 @@ import java.util.Iterator; import java.util.Map; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICompoundCriteria; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.language.IIsNullCriteria; +import org.teiid.connector.language.ILikeCriteria; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ICompareCriteria.Operator; + import com.metamatrix.api.exception.query.CriteriaEvaluationException; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICompoundCriteria; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.IIsNullCriteria; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ICompareCriteria.Operator; import com.metamatrix.connector.metadata.MetadataConnectorConstants; import com.metamatrix.connector.metadata.MetadataConnectorPlugin; import com.metamatrix.connector.metadata.index.MetadataInCriteria; @@ -284,7 +285,7 @@ * @since 4.3 */ private void buildMetadataCompoundCriteria(ICompoundCriteria compoundC= riteria) throws ConnectorException { - if (compoundCriteria.getOperator() =3D=3D com.metamatrix.connector= .language.ICompoundCriteria.Operator.AND) { + if (compoundCriteria.getOperator() =3D=3D org.teiid.connector.lang= uage.ICompoundCriteria.Operator.AND) { for(final Iterator critIter =3D compoundCriteria.getCriteria()= .iterator(); critIter.hasNext();) { buildMetadataSearchCriteria((ICriteria)critIter.next()); } Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/internal/ObjectProcedure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/ObjectProcedure.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/ObjectProcedure.java 2009-02-25 20:18:40 UTC (rev 502) @@ -29,18 +29,19 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IMetadataReference; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IParameter.Direction; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IMetadataReference; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IParameter.Direction; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.MetadataObject; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.metadata.MetadataConnectorConstants; import com.metamatrix.connector.metadata.MetadataConnectorPlugin; import com.metamatrix.connector.metadata.index.MetadataLiteralCriteria; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.util.ArgCheck; import com.metamatrix.core.util.StringUtil; Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/internal/ObjectProcedureProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/ObjectProcedureProcessor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/ObjectProcedureProcessor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -31,12 +31,13 @@ import java.util.List; import java.util.Map; = +import org.teiid.connector.api.ConnectorException; + import com.metamatrix.common.types.BlobType; import com.metamatrix.common.types.ClobImpl; import com.metamatrix.common.types.ClobType; import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.common.vdb.api.VDBFile; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.MetadataConnectorConstants; import com.metamatrix.connector.metadata.ResultsIterator; import com.metamatrix.core.util.ArgCheck; Modified: trunk/connector-metadata/src/main/java/com/metamatrix/connector/m= etadata/internal/ObjectQuery.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/ObjectQuery.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/main/java/com/metamatrix/connector/metadat= a/internal/ObjectQuery.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,20 +27,21 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.IMetadataReference; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelectSymbol; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.IMetadataReference; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.MetadataObject; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.metadata.MetadataConnectorPlugin; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.util.ArgCheck; import com.metamatrix.core.util.Assertion; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/TestIndexConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/TestIndexConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/TestIndexConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,24 +28,25 @@ import java.util.Map; import java.util.Properties; = +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.common.application.ApplicationEnvironment; import com.metamatrix.common.application.ApplicationService; -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.language.IQuery; import com.metamatrix.connector.metadata.adapter.ObjectConnector; import com.metamatrix.connector.metadata.internal.IObjectSource; import com.metamatrix.connector.metadata.internal.TestConnectorHost; import com.metamatrix.connector.metadata.internal.TestObjectQueryProcessor; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/adapter/FakeObjectConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/adapter/FakeObjectConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/adapter/FakeObjectConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,8 +26,9 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.connector.metadata.internal.IObjectSource; = public class FakeObjectConnector extends ObjectConnector { @@ -43,7 +44,7 @@ = = /** = - * @see com.metamatrix.connector.metadata.adapter.ObjectConnector#= getMetadataObjectSource(com.metamatrix.connector.api.ExecutionContext) + * @see com.metamatrix.connector.metadata.adapter.ObjectConnector#= getMetadataObjectSource(org.teiid.connector.api.ExecutionContext) * @since 4.3 */ protected IObjectSource getMetadataObjectSource(ExecutionContext c= ontext) throws ConnectorException { Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/adapter/TestObjectConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/adapter/TestObjectConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/adapter/TestObjectConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,17 +27,18 @@ import java.util.List; import java.util.Properties; = +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import com.metamatrix.query.metadata.QueryMetadataInterface; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/internal/TestConnectorHost.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestConnectorHost.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestConnectorHost.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,12 +27,13 @@ import java.util.List; import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = import com.metamatrix.cdk.IConnectorHost; import com.metamatrix.cdk.api.ConnectorHost; import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.metadata.IndexConnector; import com.metamatrix.dqp.service.DQPServiceNames; import com.metamatrix.metadata.runtime.FakeMetadataService; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/internal/TestMetadataSearchCriteriaBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestMetadataSearchCriteriaBuilder.java 2009-02-25 19:09:43 UTC (= rev 501) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestMetadataSearchCriteriaBuilder.java 2009-02-25 20:18:40 UTC (= rev 502) @@ -27,13 +27,14 @@ import java.util.List; import java.util.Map; = +import org.teiid.connector.language.ICommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.connector.language.ICommand; import com.metamatrix.connector.metadata.index.MetadataInCriteria; import com.metamatrix.connector.metadata.index.MetadataLiteralCriteria; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory; import com.metamatrix.query.parser.QueryParser; import com.metamatrix.query.resolver.QueryResolver; Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/internal/TestObjectProcedure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestObjectProcedure.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestObjectProcedure.java 2009-02-25 20:18:40 UTC (rev 502) @@ -23,10 +23,12 @@ package com.metamatrix.connector.metadata.internal; = import java.util.Map; + +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import junit.framework.TestCase; import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.connector.metadata.index.MetadataLiteralCriteria; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.query.unittest.QueryMetadataInterfaceBuilder; = Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/internal/TestObjectQuery.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestObjectQuery.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestObjectQuery.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,11 +22,12 @@ = package com.metamatrix.connector.metadata.internal; = +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import junit.framework.TestCase; import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.connector.metadata.index.MetadataLiteralCriteria; import com.metamatrix.connector.metadata.index.MetadataSearchCriteria; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.query.unittest.QueryMetadataInterfaceBuilder; = Modified: trunk/connector-metadata/src/test/java/com/metamatrix/connector/m= etadata/internal/TestObjectQueryProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestObjectQueryProcessor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-metadata/src/test/java/com/metamatrix/connector/metadat= a/internal/TestObjectQueryProcessor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -29,11 +29,12 @@ import java.util.Iterator; import java.util.List; = +import org.teiid.connector.language.ICommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.util.StringUtil; import com.metamatrix.core.util.UnitTestUtil; import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuild= er.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuilder.jav= a 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/CommandBuilder.jav= a 2009-02-25 20:18:40 UTC (rev 502) @@ -26,12 +26,13 @@ import java.util.Iterator; import java.util.List; = +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.ILanguageFactory; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryParserException; import com.metamatrix.api.exception.query.QueryResolverException; import com.metamatrix.api.exception.query.QueryValidatorException; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory; import com.metamatrix.dqp.internal.datamgr.language.LanguageFactoryImpl; Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShe= llCommandTarget.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShellComm= andTarget.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/ConnectorShellComm= andTarget.java 2009-02-25 20:18:40 UTC (rev 502) @@ -41,6 +41,12 @@ import java.util.StringTokenizer; import java.util.TreeSet; = +import org.teiid.connector.api.Connector; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQuery; + import com.metamatrix.cdk.api.ConnectorHost; import com.metamatrix.cdk.file.ConfigReaderWriter; import com.metamatrix.cdk.file.XMLConfigReaderWriter; @@ -53,11 +59,6 @@ import com.metamatrix.common.config.model.BasicExtensionModule; import com.metamatrix.common.config.xml.XMLConfigurationImportExportUtilit= y; import com.metamatrix.common.util.ByteArrayHelper; -import com.metamatrix.connector.api.Connector; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQuery; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.commandshell.ConnectorResultUtility; import com.metamatrix.core.factory.ComponentLoader; Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/IConnectorHo= st.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/IConnectorHost.jav= a 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/IConnectorHost.jav= a 2009-02-25 20:18:40 UTC (rev 502) @@ -26,9 +26,10 @@ import java.util.List; import java.util.Properties; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICommand; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.ICommand; = + /** */ public interface IConnectorHost { Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/Connecto= rHost.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.= java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/ConnectorHost.= java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,21 +28,22 @@ import java.util.List; import java.util.Properties; = +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.Connector; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.Execution; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.api.UpdateExecution; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.cdk.IConnectorHost; import com.metamatrix.common.application.ApplicationEnvironment; import com.metamatrix.common.application.ApplicationService; import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.Execution; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; import com.metamatrix.dqp.internal.datamgr.language.BatchedUpdatesImpl; Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/Environm= entUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUti= lity.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/EnvironmentUti= lity.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,10 +25,11 @@ import java.io.Serializable; import java.util.Properties; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.internal.ConnectorPropertyNames; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.internal.ConnectorPropertyNames; + import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; = Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/SysLogge= r.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/SysLogger.java= 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/SysLogger.java= 2009-02-25 20:18:40 UTC (rev 502) @@ -24,8 +24,9 @@ = import java.util.Date; = -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorLogger; = + /** * ConnectorLogger that prints output to System.out. */ Modified: trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/Translat= ionUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUti= lity.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connector-sdk/src/main/java/com/metamatrix/cdk/api/TranslationUti= lity.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,10 @@ import java.io.IOException; import java.net.URL; = +import org.teiid.connector.language.ICommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.metadata.runtime.VDBMetadataFactory; import com.metamatrix.query.metadata.QueryMetadataInterface; Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCBaseExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCBaseExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCBaseExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -31,16 +31,16 @@ import java.util.Arrays; import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.basic.BasicExecution; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; = import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorIdentity; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.ICommand; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,8 +25,9 @@ import java.util.Arrays; import java.util.List; = -import com.metamatrix.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.basic.BasicConnectorCapabilities; = + /** */ public class JDBCCapabilities extends BasicConnectorCapabilities { @@ -48,7 +49,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#getM= axInCriteriaSize() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#getMaxInC= riteriaSize() * @since 4.2 */ public int getMaxInCriteriaSize() { @@ -347,7 +348,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsInl= ineViews() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsInlineVi= ews() */ public boolean supportsInlineViews() { return false; @@ -358,21 +359,21 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsQua= ntifiedCompareCriteriaSome() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsQuantifi= edCompareCriteriaSome() */ public boolean supportsQuantifiedCompareCriteriaSome() { return true; } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= onOrderBy() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsUnionOrd= erBy() */ public boolean supportsUnionOrderBy() { return true; } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsSetQueryOrderBy() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsS= etQueryOrderBy() */ @Override public boolean supportsSetQueryOrderBy() { @@ -380,7 +381,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= ons() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsUnions() */ public boolean supportsUnions() { return true; Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -34,25 +34,25 @@ import javax.sql.DataSource; import javax.sql.XADataSource; = +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.MappedUserIdentity; +import org.teiid.connector.api.SingleIdentity; +import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling; +import org.teiid.connector.basic.BasicConnector; +import org.teiid.connector.internal.ConnectorPropertyNames; import org.teiid.connector.jdbc.translator.Translator; import org.teiid.connector.jdbc.xa.JDBCSourceXAConnection; import org.teiid.connector.jdbc.xa.XAJDBCPropertyNames; +import org.teiid.connector.xa.api.TransactionContext; +import org.teiid.connector.xa.api.XAConnection; +import org.teiid.connector.xa.api.XAConnector; = import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.SingleIdentity; -import com.metamatrix.connector.api.MappedUserIdentity; -import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.basic.BasicConnector; -import com.metamatrix.connector.internal.ConnectorPropertyNames; -import com.metamatrix.connector.xa.api.TransactionContext; -import com.metamatrix.connector.xa.api.XAConnection; -import com.metamatrix.connector.xa.api.XAConnector; import com.metamatrix.core.MetaMatrixCoreException; import com.metamatrix.core.util.ReflectionHelper; = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCExecutionException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCExecutionException.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCExecutionException.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,9 @@ import java.sql.SQLException; import java.util.Arrays; = +import org.teiid.connector.api.ConnectorException; import org.teiid.connector.jdbc.translator.TranslatedCommand; = -import com.metamatrix.connector.api.ConnectorException; = public class JDBCExecutionException extends ConnectorException { = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCExecutionHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCExecutionHelper.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCExecutionHelper.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,12 +27,13 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.api.ValueTranslator; -import com.metamatrix.connector.basic.BasicValueTranslator; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.api.ValueTranslator; +import org.teiid.connector.basic.BasicValueTranslator; = + /** */ public class JDBCExecutionHelper { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCProcedureExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCProcedureExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCProcedureExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -32,21 +32,21 @@ import java.util.Map; import java.util.Properties; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ProcedureExecution; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IParameter.Direction; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCQueryExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCQueryExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCQueryExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -35,19 +35,19 @@ import java.util.List; import java.util.Properties; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.api.ValueTranslator; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IQueryCommand; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.api.ValueTranslator; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IQueryCommand; = /** * = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCSourceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCSourceConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCSourceConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,24 +28,24 @@ import java.sql.SQLException; import java.sql.Statement; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.api.UpdateExecution; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** * = */ -public class JDBCSourceConnection extends com.metamatrix.connector.basic.B= asicConnection { +public class JDBCSourceConnection extends org.teiid.connector.basic.BasicC= onnection { protected java.sql.Connection physicalConnection; protected ConnectorEnvironment environment; private ConnectorLogger logger; Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/JDBCUpdateExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCUpdateExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= JDBCUpdateExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -29,17 +29,17 @@ import java.util.List; import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.UpdateExecution; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.IBatchedUpdates; +import org.teiid.connector.language.IBulkInsert; +import org.teiid.connector.language.ICommand; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.language.IBatchedUpdates; -import com.metamatrix.connector.language.IBulkInsert; -import com.metamatrix.connector.language.ICommand; = /** */ @@ -84,7 +84,7 @@ } = /** - * @see com.metamatrix.data.api.BatchedUpdatesExecution#execute(com.me= tamatrix.connector.language.ICommand[]) + * @see com.metamatrix.data.api.BatchedUpdatesExecution#execute(org.te= iid.connector.language.ICommand[]) * @since 4.2 */ public int[] execute(IBatchedUpdates batchedCommand) throws ConnectorE= xception { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/SimpleCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= SimpleCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= SimpleCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,8 +24,9 @@ = import java.util.List; = -import com.metamatrix.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorCapabilities; = + /** * This is a "simple" capabilities class that allows criteria but no = * complicated joins, subqueries, etc to be passed to the connector. @@ -152,7 +153,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsSel= ectLiterals() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsSelectLi= terals() * @since 4.2 */ public boolean supportsSelectLiterals() { @@ -338,7 +339,7 @@ /** * Return null to indicate no functions are supported. * @return null = - * @see com.metamatrix.connector.api.ConnectorCapabilities#getSupporte= dFunctions() + * @see org.teiid.connector.api.ConnectorCapabilities#getSupportedFunc= tions() */ public List getSupportedFunctions() { return null; @@ -353,7 +354,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= onOrderBy() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsUnionOrd= erBy() * @since 4.2 */ public boolean supportsUnionOrderBy() { @@ -361,7 +362,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= ons() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsUnions() * @since 4.2 */ public boolean supportsUnions() { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/access/AccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= access/AccessSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= access/AccessSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,13 +27,13 @@ import java.util.ArrayList; import java.util.List; = +import org.teiid.connector.api.ExecutionContext; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.language.IQueryCommand; = -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.IQueryCommand; = public class AccessSQLTranslator extends Translator { = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/db2/DB2Capabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2Capabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2Capabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -118,7 +118,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFun= ctionsInGroupBy() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsFunction= sInGroupBy() * @since 5.0 */ public boolean supportsFunctionsInGroupBy() { @@ -130,7 +130,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsExcept() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsE= xcept() */ @Override public boolean supportsExcept() { @@ -138,7 +138,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsIntersect() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsI= ntersect() */ @Override public boolean supportsIntersect() { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/db2/DB2ConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2ConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2ConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,13 +26,13 @@ import java.util.Arrays; import java.util.List; = +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.translator.BasicFunctionModifier; import org.teiid.connector.jdbc.translator.DropFunctionModifier; import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.language.*; +import org.teiid.connector.language.ICompareCriteria.Operator; = -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.*; -import com.metamatrix.connector.language.ICompareCriteria.Operator; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/db2/DB2SQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2SQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= db2/DB2SQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,22 +25,22 @@ import java.util.Arrays; import java.util.List; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.SourceSystemFunctions; +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.translator.AliasModifier; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IJoin; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ICompareCriteria.Operator; +import org.teiid.connector.language.IJoin.JoinType; +import org.teiid.connector.visitor.framework.HierarchyVisitor; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IJoin; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ICompareCriteria.Operator; -import com.metamatrix.connector.language.IJoin.JoinType; -import com.metamatrix.connector.visitor.framework.HierarchyVisitor; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/derby/DerbyCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbyCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbyCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -127,7 +127,7 @@ = /** * Derby supports only SearchedCaseExpression, not CaseExpression. = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsCas= eExpressions() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsCaseExpr= essions() * @since 5.0 */ public boolean supportsCaseExpressions() { @@ -136,7 +136,7 @@ = /** * Derby supports only left and right outer joins. = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFul= lOuterJoins() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsFullOute= rJoins() * @since 5.0 */ public boolean supportsFullOuterJoins() { @@ -145,7 +145,7 @@ = /** * Inline views (subqueries in the FROM clause) are supported. = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsInl= ineViews() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsInlineVi= ews() * @since 4.3 */ public boolean supportsInlineViews() { @@ -154,7 +154,7 @@ = /** * UNION is supported, but not UNIONs with a final ORDER BY. = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsUni= onOrderBy() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsUnionOrd= erBy() * @since 5.0 */ public boolean supportsUnionOrderBy() { @@ -167,7 +167,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsExcept() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsE= xcept() */ @Override public boolean supportsExcept() { @@ -175,7 +175,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsIntersect() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsI= ntersect() */ @Override public boolean supportsIntersect() { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/derby/DerbyConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbyConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbyConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,13 +26,13 @@ import java.util.Arrays; import java.util.List; = +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.translator.BasicFunctionModifier; import org.teiid.connector.jdbc.translator.DropFunctionModifier; import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.language.*; +import org.teiid.connector.language.ICompareCriteria.Operator; = -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.*; -import com.metamatrix.connector.language.ICompareCriteria.Operator; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/derby/DerbySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbySQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= derby/DerbySQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,13 +22,13 @@ = package org.teiid.connector.jdbc.derby; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.SourceSystemFunctions; import org.teiid.connector.jdbc.translator.AliasModifier; import org.teiid.connector.jdbc.translator.EscapeSyntaxModifier; import org.teiid.connector.jdbc.translator.Translator; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.SourceSystemFunctions; = = /** = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/informix/InformixSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= informix/InformixSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= informix/InformixSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,12 +24,12 @@ */ package org.teiid.connector.jdbc.informix; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.SourceSystemFunctions; import org.teiid.connector.jdbc.translator.DropFunctionModifier; import org.teiid.connector.jdbc.translator.Translator; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.SourceSystemFunctions; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/mm/MMCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mm/MMCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mm/MMCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -36,7 +36,7 @@ public class MMCapabilities extends JDBCCapabilities { = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#getSupporte= dFunctions() + * @see org.teiid.connector.api.ConnectorCapabilities#getSupportedFunc= tions() * @since 4.3 */ public List getSupportedFunctions() { @@ -144,7 +144,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFun= ctionsInGroupBy() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsFunction= sInGroupBy() * @since 5.0 */ public boolean supportsFunctionsInGroupBy() { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/mysql/MySQLConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mysql/MySQLConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mysql/MySQLConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,13 +27,13 @@ = import org.teiid.connector.jdbc.translator.BasicFunctionModifier; import org.teiid.connector.jdbc.translator.DropFunctionModifier; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.ICompareCriteria.Operator; = -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.ICompareCriteria.Operator; = = /** = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/mysql/MySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mysql/MySQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= mysql/MySQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -29,11 +29,11 @@ import java.sql.Time; import java.sql.Timestamp; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.SourceSystemFunctions; import org.teiid.connector.jdbc.translator.Translator; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.SourceSystemFunctions; = = /** = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/ConcatFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/ConcatFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/ConcatFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,16 +26,16 @@ import java.util.Arrays; import java.util.List; = +import org.teiid.connector.api.SourceSystemFunctions; +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.ICompoundCriteria.Operator; = -import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.ICompoundCriteria.Operator; = = /** @@ -56,7 +56,7 @@ } = /** = - * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#modi= fy(com.metamatrix.connector.language.IFunction) + * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#modi= fy(org.teiid.connector.language.IFunction) */ public IExpression modify(IFunction function) { List when =3D new ArrayList(); Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/DayWeekQuarterFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/DayWeekQuarterFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/DayWeekQuarterFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,8 +27,8 @@ = import org.teiid.connector.jdbc.translator.BasicFunctionModifier; import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.language.*; = -import com.metamatrix.connector.language.*; = /** * This a method for multiple use. It can be used for: Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/ExtractFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/ExtractFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/ExtractFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,9 +27,9 @@ = import org.teiid.connector.jdbc.translator.BasicFunctionModifier; import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; = /** * Convert the YEAR/MONTH/DAY etc. function into an equivalent Oracle func= tion. = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/LeftOrRightFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/LeftOrRightFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/LeftOrRightFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,11 +25,11 @@ import java.util.Arrays; import java.util.List; = +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.translator.BasicFunctionModifier; import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.language.*; = -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.*; = /** * Convert left(string, count) --> substr(string, 1, count) Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/LocateFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/LocateFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/LocateFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,11 +27,11 @@ = import org.teiid.connector.jdbc.translator.BasicFunctionModifier; import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILiteral; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; = /** * Modify the locate function to use the Oracle instr function. Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/Log10FunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/Log10FunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/Log10FunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,8 +26,8 @@ = import org.teiid.connector.jdbc.translator.BasicFunctionModifier; import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.language.*; = -import com.metamatrix.connector.language.*; = public class Log10FunctionModifier extends BasicFunctionModifier implement= s FunctionModifier { = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/MonthOrDayNameFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/MonthOrDayNameFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/MonthOrDayNameFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,10 +27,10 @@ = import org.teiid.connector.jdbc.translator.BasicFunctionModifier; import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; = /** * Convert the MONTHNAME etc. function into an equivalent Oracle function.= = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/OracleCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -120,7 +120,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFun= ctionsInGroupBy() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsFunction= sInGroupBy() * @since 5.0 */ public boolean supportsFunctionsInGroupBy() { @@ -135,7 +135,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsExcept() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsE= xcept() */ @Override public boolean supportsExcept() { @@ -143,7 +143,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsIntersect() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsI= ntersect() */ @Override public boolean supportsIntersect() { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/OracleConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,15 +25,15 @@ import java.util.Arrays; import java.util.List; = +import org.teiid.connector.api.ConnectorLogger; import org.teiid.connector.jdbc.translator.BasicFunctionModifier; import org.teiid.connector.jdbc.translator.DropFunctionModifier; import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILiteral; = -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/oracle/OracleSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= oracle/OracleSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -33,23 +33,23 @@ import java.util.ArrayList; import java.util.List; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.SourceSystemFunctions; import org.teiid.connector.jdbc.JDBCPlugin; import org.teiid.connector.jdbc.translator.AliasModifier; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.language.ISetQuery.Operation; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.visitor.util.SQLReservedWords; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.language.ISetQuery.Operation; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.visitor.util.SQLReservedWords; = /** */ @@ -209,7 +209,7 @@ /** * Don't fully qualify elements if table =3D DUAL or element =3D ROWNU= M or special stuff is packed into name in source value. * = - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#skipGro= upInElement(java.lang.String, java.lang.String) + * @see org.teiid.connector.visitor.util.SQLStringVisitor#skipGroupInE= lement(java.lang.String, java.lang.String) * @since 5.0 */ @Override Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/postgresql/DatePartFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/DatePartFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/DatePartFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,10 +25,10 @@ import java.util.Arrays; = import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; = = /** = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/postgresql/ModifiedDatePartFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/ModifiedDatePartFunctionModifier.java 2009-02-25 19:09:43 UTC (r= ev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/ModifiedDatePartFunctionModifier.java 2009-02-25 20:18:40 UTC (r= ev 502) @@ -24,11 +24,12 @@ = import java.util.Arrays; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; = = + /** = * @since 4.3 */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/postgresql/PostgreSQLCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -260,7 +260,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsExcept() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsE= xcept() */ @Override public boolean supportsExcept() { @@ -268,7 +268,7 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsIntersect() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsI= ntersect() */ @Override public boolean supportsIntersect() { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/postgresql/PostgreSQLConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -30,12 +30,12 @@ import org.teiid.connector.jdbc.translator.BasicFunctionModifier; import org.teiid.connector.jdbc.translator.DropFunctionModifier; import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.ICompareCriteria.Operator; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.ICompareCriteria.Operator; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/postgresql/PostgreSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= postgresql/PostgreSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,23 +28,23 @@ import java.util.Arrays; import java.util.List; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.SourceSystemFunctions; +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.oracle.LeftOrRightFunctionModifier; import org.teiid.connector.jdbc.oracle.MonthOrDayNameFunctionModifier; import org.teiid.connector.jdbc.translator.AliasModifier; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.IAggregate; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.language.ISetQuery; +import org.teiid.connector.visitor.framework.HierarchyVisitor; +import org.teiid.connector.visitor.util.SQLReservedWords; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.ISetQuery; -import com.metamatrix.connector.visitor.framework.HierarchyVisitor; -import com.metamatrix.connector.visitor.util.SQLReservedWords; = = /** = @@ -123,7 +123,7 @@ /** * Postgres doesn't provide min/max(boolean), so this conversion write= s a min(BooleanValue) as = * bool_and(BooleanValue) - * @see com.metamatrix.connector.visitor.framework.LanguageObjectVisit= or#visit(com.metamatrix.connector.language.IAggregate) + * @see org.teiid.connector.visitor.framework.LanguageObjectVisitor#vi= sit(org.teiid.connector.language.IAggregate) * @since 4.3 */ @Override Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/sqlserver/SqlServerCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sqlserver/SqlServerCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sqlserver/SqlServerCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -123,7 +123,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFun= ctionsInGroupBy() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsFunction= sInGroupBy() * @since 5.0 */ public boolean supportsFunctionsInGroupBy() { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/sqlserver/SqlServerSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sqlserver/SqlServerSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sqlserver/SqlServerSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,12 +24,12 @@ */ package org.teiid.connector.jdbc.sqlserver; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.SourceSystemFunctions; import org.teiid.connector.jdbc.sybase.SybaseSQLTranslator; import org.teiid.connector.jdbc.translator.AliasModifier; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.SourceSystemFunctions; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/sybase/ModFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/ModFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/ModFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,12 +26,12 @@ import java.util.Arrays; import java.util.List; = +import org.teiid.connector.api.TypeFacility.RUNTIME_TYPES; import org.teiid.connector.jdbc.translator.AliasModifier; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; = -import com.metamatrix.connector.api.TypeFacility.RUNTIME_TYPES; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; = public class ModFunctionModifier extends AliasModifier { = Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/sybase/SybaseCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -103,7 +103,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorCapabilities#supportsFun= ctionsInGroupBy() + * @see org.teiid.connector.api.ConnectorCapabilities#supportsFunction= sInGroupBy() * @since 5.0 */ public boolean supportsFunctionsInGroupBy() { @@ -111,14 +111,14 @@ } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#getM= axFromGroups() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#getMaxFro= mGroups() */ public int getMaxFromGroups() { return 50; } = /** = - * @see com.metamatrix.connector.basic.BasicConnectorCapabilities#supp= ortsIntersect() + * @see org.teiid.connector.basic.BasicConnectorCapabilities#supportsI= ntersect() */ @Override public boolean supportsIntersect() { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/sybase/SybaseConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -29,11 +29,11 @@ import org.teiid.connector.jdbc.translator.BasicFunctionModifier; import org.teiid.connector.jdbc.translator.DropFunctionModifier; import org.teiid.connector.jdbc.translator.FunctionModifier; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILiteral; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/sybase/SybaseSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= sybase/SybaseSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,18 +27,18 @@ import java.util.ArrayList; import java.util.List; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.SourceSystemFunctions; import org.teiid.connector.jdbc.translator.AliasModifier; import org.teiid.connector.jdbc.translator.SubstringFunctionModifier; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.language.IQueryCommand; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.SourceSystemFunctions; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.IQueryCommand; = /** */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/AliasModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/AliasModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/AliasModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,7 +24,7 @@ */ package org.teiid.connector.jdbc.translator; = -import com.metamatrix.connector.language.*; +import org.teiid.connector.language.*; = /** */ @@ -41,7 +41,7 @@ } = /** - * @see org.teiid.connector.jdbc.translator.FunctionModifier#modify(co= m.metamatrix.connector.language.IFunction) + * @see org.teiid.connector.jdbc.translator.FunctionModifier#modify(or= g.teiid.connector.language.IFunction) */ public IExpression modify(IFunction function) { function.setName(alias); Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/BasicFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/BasicFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/BasicFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,10 +28,11 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; = + /** */ public abstract class BasicFunctionModifier implements FunctionModifier { @@ -83,7 +84,7 @@ = /** * Subclass should override this method as needed. - * @see org.teiid.connector.jdbc.translator.FunctionModifier#modify(co= m.metamatrix.connector.language.IFunction) + * @see org.teiid.connector.jdbc.translator.FunctionModifier#modify(or= g.teiid.connector.language.IFunction) */ public IExpression modify(IFunction function) { return function; @@ -91,7 +92,7 @@ = /** * Subclass should override this method as needed. - * @see org.teiid.connector.jdbc.translator.FunctionModifier#translate= (com.metamatrix.connector.language.IFunction) + * @see org.teiid.connector.jdbc.translator.FunctionModifier#translate= (org.teiid.connector.language.IFunction) */ public List translate(IFunction function) { return null; Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/BindValueVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/BindValueVisitor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/BindValueVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,20 +22,20 @@ = package org.teiid.connector.jdbc.translator; = -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.IExistsCriteria; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.IInlineView; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.IScalarSubquery; -import com.metamatrix.connector.language.ISearchedCaseExpression; -import com.metamatrix.connector.language.ISetClause; -import com.metamatrix.connector.language.ISubqueryCompareCriteria; -import com.metamatrix.connector.visitor.framework.HierarchyVisitor; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.IExistsCriteria; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.language.IInlineView; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.ILanguageObject; +import org.teiid.connector.language.ILikeCriteria; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.IScalarSubquery; +import org.teiid.connector.language.ISearchedCaseExpression; +import org.teiid.connector.language.ISetClause; +import org.teiid.connector.language.ISubqueryCompareCriteria; +import org.teiid.connector.visitor.framework.HierarchyVisitor; = /** * This visitor will mark literals in well known locations as bindValues. Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/DropFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/DropFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/DropFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,8 +25,8 @@ import java.util.List; = import org.teiid.connector.jdbc.JDBCPlugin; +import org.teiid.connector.language.*; = -import com.metamatrix.connector.language.*; = /** * This FunctionModifier will cause this function to be dropped by replaci= ng the function Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/EscapeSyntaxModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/EscapeSyntaxModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/EscapeSyntaxModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,8 +25,9 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.language.IFunction; +import org.teiid.connector.language.IFunction; = + /** * Wrap a function in standard JDBC escape syntax. In some cases, the = * driver can then convert to the correct database syntax for us. = @@ -39,7 +40,7 @@ } = /** = - * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#tran= slate(com.metamatrix.connector.language.IFunction) + * @see org.teiid.connector.jdbc.translator.BasicFunctionModifier#tran= slate(org.teiid.connector.language.IFunction) * @since 5.0 */ public List translate(IFunction function) { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/FunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/FunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/FunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,9 +26,10 @@ = import java.util.List; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; = + /** * Implementations of this interface are used to modify metamatrix functio= ns * coming in to the connector into alternate datasource-specific language,= if Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/ReplacementVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/ReplacementVisitor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/ReplacementVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,25 +25,26 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroupBy; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.IInlineView; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.IIsNullCriteria; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.language.IScalarSubquery; -import com.metamatrix.connector.language.ISearchedCaseExpression; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.language.ISubqueryCompareCriteria; -import com.metamatrix.connector.language.ISubqueryInCriteria; -import com.metamatrix.connector.visitor.framework.AbstractLanguageVisitor; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.language.IAggregate; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IGroupBy; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.language.IInlineView; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.IIsNullCriteria; +import org.teiid.connector.language.ILikeCriteria; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.language.IScalarSubquery; +import org.teiid.connector.language.ISearchedCaseExpression; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.language.ISubqueryCompareCriteria; +import org.teiid.connector.language.ISubqueryInCriteria; +import org.teiid.connector.visitor.framework.AbstractLanguageVisitor; + import com.metamatrix.core.MetaMatrixRuntimeException; = /** @@ -88,7 +89,7 @@ } = /** - * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(com.me= tamatrix.connector.language.IFunction) + * @see com.metamatrix.data.visitor.LanguageObjectVisitor#visit(org.te= iid.connector.language.IFunction) */ public void visit(IFunction obj) { List args =3D obj.getParameters(); @@ -98,7 +99,7 @@ } = = /** = - * @see com.metamatrix.connector.visitor.framework.HierarchyVisitor#vi= sit(com.metamatrix.connector.language.IGroupBy) + * @see org.teiid.connector.visitor.framework.HierarchyVisitor#visit(o= rg.teiid.connector.language.IGroupBy) * @since 4.3 */ public void visit(IGroupBy obj) { @@ -124,7 +125,7 @@ } = /** - * @see com.metamatrix.data.visitor.SQLStringVisitor#visit(com.metamat= rix.connector.language.IInsert) + * @see com.metamatrix.data.visitor.SQLStringVisitor#visit(org.teiid.c= onnector.language.IInsert) */ public void visit(IInsert obj) { List values =3D obj.getValues(); Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/SQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/SQLConversionVisitor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/SQLConversionVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -35,22 +35,23 @@ import java.util.Map; import java.util.Set; = -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.IBulkInsert; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.language.ISetQuery.Operation; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.visitor.util.SQLStringVisitor; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.language.IBulkInsert; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageObject; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IParameter.Direction; +import org.teiid.connector.language.ISetQuery.Operation; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.visitor.util.SQLStringVisitor; = + /** * This visitor takes an ICommand and does DBMS-specific conversion on it * to produce a SQL String. This class is expected to be subclassed. @@ -185,7 +186,7 @@ } = /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.IProcedure) + * @see org.teiid.connector.visitor.util.SQLStringVisitor#visit(org.te= iid.connector.language.IProcedure) */ public void visit(IProcedure obj) { this.prepared =3D true; @@ -197,7 +198,7 @@ } = /** - * @see com.metamatrix.connector.visitor.util.SQLStringVisitor#visit(c= om.metamatrix.connector.language.ILiteral) + * @see org.teiid.connector.visitor.util.SQLStringVisitor#visit(org.te= iid.connector.language.ILiteral) */ public void visit(ILiteral obj) { if (this.prepared && obj.isBindValue()) { Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/SubstringFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/SubstringFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/SubstringFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,10 +25,11 @@ import java.util.Arrays; import java.util.List; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; = + /** * Common logic for Substring modifiers requiring 3 parameters */ Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/TranslatedCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/TranslatedCommand.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/TranslatedCommand.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,14 +26,15 @@ = import java.util.List; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.visitor.framework.DelegatingHierarchyVisit= or; -import com.metamatrix.connector.visitor.util.CollectorVisitor; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.visitor.framework.DelegatingHierarchyVisitor; +import org.teiid.connector.visitor.util.CollectorVisitor; = + /** * This is a utility class used to translate an ICommand using a SQLConver= sionVisitor. * The SQLConversionVisitor should not be invoked directly; this object wi= ll use it to Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/translator/Translator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/Translator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= translator/Translator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -41,24 +41,24 @@ import java.util.Map; import java.util.TimeZone; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.api.ValueTranslator; +import org.teiid.connector.internal.ConnectorPropertyNames; import org.teiid.connector.jdbc.JDBCPlugin; import org.teiid.connector.jdbc.JDBCPropertyNames; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILanguageObject; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.ISetQuery; +import org.teiid.connector.language.IParameter.Direction; = import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.api.ValueTranslator; -import com.metamatrix.connector.internal.ConnectorPropertyNames; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.ISetQuery; -import com.metamatrix.connector.language.IParameter.Direction; = /** * Base class for creating source SQL queries and retrieving results. Modified: trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector= /jdbc/xa/JDBCSourceXAConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= xa/JDBCSourceXAConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/main/java/org/teiid/connector/jdbc/= xa/JDBCSourceXAConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -31,12 +31,12 @@ import javax.sql.ConnectionEventListener; import javax.transaction.xa.XAResource; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; import org.teiid.connector.jdbc.JDBCSourceConnection; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.xa.api.XAConnection; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.xa.api.XAConnection; = public class JDBCSourceXAConnection extends JDBCSourceConnection implement= s XAConnection { private javax.sql.XAConnection xaConn; @@ -60,7 +60,7 @@ } = /** - * @see com.metamatrix.connector.xa.api.XAConnection#getXAResource() + * @see org.teiid.connector.xa.api.XAConnection#getXAResource() */ public XAResource getXAResource() throws ConnectorException { return resource; Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/MetadataFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= MetadataFactory.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= MetadataFactory.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,11 +22,12 @@ = package org.teiid.connector.jdbc; = +import org.teiid.connector.language.ICommand; + import junit.framework.Assert; = import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.connector.language.ICommand; = public class MetadataFactory { = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/TestJDBCConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= TestJDBCConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= TestJDBCConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,10 +26,10 @@ = import static org.junit.Assert.*; import org.junit.Test; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorException; import org.teiid.connector.jdbc.xa.XAJDBCPropertyNames; = -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorException; = public class TestJDBCConnector { = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/TestJDBCSourceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= TestJDBCSourceConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= TestJDBCSourceConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,6 +25,8 @@ import java.sql.Connection; import java.util.Properties; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.basic.BasicConnectorCapabilities; import org.teiid.connector.jdbc.JDBCPropertyNames; import org.teiid.connector.jdbc.JDBCSourceConnection; import org.teiid.connector.jdbc.translator.Translator; @@ -32,8 +34,6 @@ import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.basic.BasicConnectorCapabilities; import com.metamatrix.core.util.SimpleMock; = = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/access/TestAccessSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= access/TestAccessSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= access/TestAccessSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,16 +24,16 @@ = import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; import org.teiid.connector.jdbc.access.AccessSQLTranslator; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; = import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICommand; = = /** = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/db2/TestDB2ConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= db2/TestDB2ConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= db2/TestDB2ConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,18 +28,18 @@ import java.util.Arrays; import java.util.Properties; = +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.db2.DB2ConvertModifier; import org.teiid.connector.jdbc.db2.DB2SQLTranslator; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.query.unittest.TimestampUtil; = /** Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/db2/TestDB2SqlTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= db2/TestDB2SqlTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= db2/TestDB2SqlTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,14 +28,14 @@ = import org.junit.BeforeClass; import org.junit.Test; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.language.ICommand; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.ICommand; import com.metamatrix.core.util.UnitTestUtil; = /** Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/derby/TestDerbyConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= derby/TestDerbyConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= derby/TestDerbyConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,18 +28,18 @@ import java.util.Arrays; import java.util.Properties; = +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.derby.DerbyConvertModifier; import org.teiid.connector.jdbc.derby.DerbySQLTranslator; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.query.unittest.TimestampUtil; = /** Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/extension/impl/TestDropFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= extension/impl/TestDropFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 5= 01) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= extension/impl/TestDropFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 5= 02) @@ -25,13 +25,13 @@ import java.util.Arrays; = import org.teiid.connector.jdbc.translator.DropFunctionModifier; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILiteral; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILiteral; = /** */ Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/extension/impl/TestEscapeSyntaxModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= extension/impl/TestEscapeSyntaxModifier.java 2009-02-25 19:09:43 UTC (rev 5= 01) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= extension/impl/TestEscapeSyntaxModifier.java 2009-02-25 20:18:40 UTC (rev 5= 02) @@ -27,13 +27,13 @@ import java.util.List; = import org.teiid.connector.jdbc.translator.EscapeSyntaxModifier; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.visitor.util.SQLReservedWords; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.visitor.util.SQLReservedWords; import com.metamatrix.query.unittest.TimestampUtil; = /** Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/mysql/TestMySQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= mysql/TestMySQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= mysql/TestMySQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,15 +25,15 @@ import java.util.Map; import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; import org.teiid.connector.jdbc.MetadataFactory; import org.teiid.connector.jdbc.mysql.MySQLTranslator; import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.language.ICommand; = import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICommand; = /** */ Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/oracle/TestDayWeekQuarterFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestDayWeekQuarterFunctionModifier.java 2009-02-25 19:09:43 UTC (rev= 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestDayWeekQuarterFunctionModifier.java 2009-02-25 20:18:40 UTC (rev= 502) @@ -29,15 +29,15 @@ import org.teiid.connector.jdbc.oracle.DayWeekQuarterFunctionModifier; import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILiteral; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; import com.metamatrix.query.unittest.TimestampUtil; = /** Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/oracle/TestExtractFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestExtractFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestExtractFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,21 +26,21 @@ import java.util.Arrays; import java.util.Properties; = +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.oracle.ExtractFunctionModifier; import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILiteral; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; import com.metamatrix.query.unittest.TimestampUtil; = /** Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/oracle/TestLeftOrRightFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLeftOrRightFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 50= 1) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLeftOrRightFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 50= 2) @@ -28,15 +28,15 @@ import org.teiid.connector.jdbc.oracle.LeftOrRightFunctionModifier; import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILiteral; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; = /** */ Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/oracle/TestLocateFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLocateFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLocateFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,14 +28,14 @@ import org.teiid.connector.jdbc.oracle.LocateFunctionModifier; import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; = /** */ Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/oracle/TestLog10FunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLog10FunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestLog10FunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,14 +26,14 @@ import java.util.List; = import org.teiid.connector.jdbc.oracle.Log10FunctionModifier; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.visitor.util.SQLStringVisitor; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.visitor.util.SQLStringVisitor; = /** */ Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/oracle/TestMonthOrDayNameFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-25 19:09:43 UTC (rev= 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestMonthOrDayNameFunctionModifier.java 2009-02-25 20:18:40 UTC (rev= 502) @@ -29,15 +29,15 @@ import org.teiid.connector.jdbc.oracle.MonthOrDayNameFunctionModifier; import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILiteral; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; import com.metamatrix.query.unittest.TimestampUtil; = /** Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/oracle/TestOracleConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestOracleConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestOracleConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,18 +28,18 @@ import java.util.Arrays; import java.util.Properties; = +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.oracle.OracleConvertModifier; import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.query.unittest.TimestampUtil; = /** Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/oracle/TestOracleTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestOracleTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestOracleTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,17 +24,17 @@ = import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; import org.teiid.connector.jdbc.access.AccessSQLTranslator; import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; = import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICommand; = public class TestOracleTranslator extends TestCase { = Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/oracle/TestSubstringFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestSubstringFunctionModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= oracle/TestSubstringFunctionModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,18 +25,18 @@ import java.util.Arrays; import java.util.Properties; = +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; import org.teiid.connector.jdbc.translator.FunctionModifier; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; = /** */ Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/postgresql/TestPostgreSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= postgresql/TestPostgreSQLTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= postgresql/TestPostgreSQLTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,15 +25,15 @@ import java.util.Map; import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; import org.teiid.connector.jdbc.MetadataFactory; import org.teiid.connector.jdbc.postgresql.PostgreSQLTranslator; import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.language.ICommand; = import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICommand; = /** */ Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/sqlserver/TestSqlServerConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sqlserver/TestSqlServerConversionVisitor.java 2009-02-25 19:09:43 UTC (rev = 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sqlserver/TestSqlServerConversionVisitor.java 2009-02-25 20:18:40 UTC (rev = 502) @@ -27,12 +27,12 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.teiid.connector.api.ConnectorException; import org.teiid.connector.jdbc.MetadataFactory; import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.language.ICommand; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICommand; = /** */ Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/sybase/TestSybaseConvertModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sybase/TestSybaseConvertModifier.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sybase/TestSybaseConvertModifier.java 2009-02-25 20:18:40 UTC (rev 502) @@ -30,16 +30,16 @@ import org.teiid.connector.jdbc.sybase.SybaseConvertModifier; import org.teiid.connector.jdbc.sybase.SybaseSQLTranslator; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILiteral; = import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILiteral; import com.metamatrix.query.unittest.TimestampUtil; = /** Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/sybase/TestSybaseSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sybase/TestSybaseSQLConversionVisitor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= sybase/TestSybaseSQLConversionVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,12 +28,12 @@ = import org.junit.BeforeClass; import org.junit.Test; +import org.teiid.connector.api.ConnectorException; import org.teiid.connector.jdbc.MetadataFactory; import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.language.ICommand; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICommand; = /** */ Modified: trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector= /jdbc/util/TestFunctionReplacementVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= util/TestFunctionReplacementVisitor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-jdbc/src/test/java/org/teiid/connector/jdbc/= util/TestFunctionReplacementVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -30,11 +30,11 @@ import org.teiid.connector.jdbc.translator.FunctionModifier; import org.teiid.connector.jdbc.translator.ReplacementVisitor; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.visitor.framework.DelegatingHierarchyVisitor; = import junit.framework.TestCase; = -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.visitor.framework.DelegatingHierarchyVisit= or; = /** */ Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/IQueryToLdapSearchParser.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/IQueryToLdapSearchParser.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/IQueryToLdapSearchParser.java 2009-02-25 20:18:40 UTC (rev 502) @@ -50,33 +50,34 @@ import javax.naming.directory.SearchControls; import javax.naming.ldap.SortKey; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICompoundCriteria; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExistsCriteria; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFromItem; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.IOrderByItem; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IScalarSubquery; -import com.metamatrix.connector.language.ISearchedCaseExpression; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.language.ICompareCriteria.Operator; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.language.IAggregate; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICompoundCriteria; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExistsCriteria; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFromItem; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.language.ILikeCriteria; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.language.IOrderByItem; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IScalarSubquery; +import org.teiid.connector.language.ISearchedCaseExpression; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.language.ICompareCriteria.Operator; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Group; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = + /** * Utility class which translates a SQL query into an LDAP search. */ @@ -533,7 +534,7 @@ return; } filterList.add("("); //$NON-NLS-1$ - filterList.add(parseCompoundCriteriaOp(com.metamatrix.connector.language= .ICompoundCriteria.Operator.OR)); + filterList.add(parseCompoundCriteriaOp(org.teiid.connector.language.ICom= poundCriteria.Operator.OR)); Iterator rhsItr =3D rhsList.iterator(); while(rhsItr.hasNext()) { addCompareCriteriaToList(filterList, Operator.EQ, getExpressionString(l= hs), = @@ -643,8 +644,8 @@ } = /** - * Helper method for getting runtime {@link com.metamatrix.connector.m= etadata.runtime.Element} from a - * {@link com.metamatrix.connector.language.ISelectSymbol}. + * Helper method for getting runtime {@link org.teiid.connector.metada= ta.runtime.Element} from a + * {@link org.teiid.connector.language.ISelectSymbol}. * @param symbol Input ISelectSymbol * @return Element returned metadata runtime Element */ Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -29,17 +29,18 @@ import javax.naming.NamingException; import javax.naming.ldap.InitialLdapContext; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.api.UpdateExecution; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = + /** = * Represents a connection to an LDAP data source. = */ Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -23,14 +23,15 @@ = import java.util.Properties; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.basic.BasicConnector; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.basic.BasicConnector; = + /** = * LDAPConnector. This is responsible for initializing = * a connection factory, and obtaining connections to LDAP. @@ -59,7 +60,7 @@ = /** = * (non-Javadoc) - * @see com.metamatrix.connector.basic.BasicConnector#initialize(com.meta= matrix.connector.api.ConnectorEnvironment) + * @see org.teiid.connector.basic.BasicConnector#initialize(org.teiid.con= nector.api.ConnectorEnvironment) */ @Override public void start(ConnectorEnvironment env) throws ConnectorException { Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPConnectorCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnectorCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPConnectorCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -21,7 +21,7 @@ */ package com.metamatrix.connector.ldap; = -import com.metamatrix.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.basic.BasicConnectorCapabilities; = /** * This class extends the BasicConnectorCapabilities class, and establishes Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPSearchDetails.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPSearchDetails.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPSearchDetails.java 2009-02-25 20:18:40 UTC (rev 502) @@ -30,8 +30,9 @@ import javax.naming.directory.SearchControls; import javax.naming.ldap.SortKey; = -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorLogger; = + /** * Utility class used to maintain the details of a particular LDAP search, * such as the context, the attributes of interest, the filter, and the = Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPSyncQueryExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPSyncQueryExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPSyncQueryExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -94,15 +94,16 @@ import javax.naming.ldap.SortControl; import javax.naming.ldap.SortKey; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = + /** = * LDAPSyncQueryExecution is responsible for executing an LDAP search = * corresponding to a read-only "select" query from MetaMatrix. Modified: trunk/connectors/connector-ldap/src/main/java/com/metamatrix/conn= ector/ldap/LDAPUpdateExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPUpdateExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-ldap/src/main/java/com/metamatrix/connector/= ldap/LDAPUpdateExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -33,26 +33,27 @@ import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.LdapContext; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IDelete; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.ISetClause; -import com.metamatrix.connector.language.IUpdate; -import com.metamatrix.connector.language.ICompareCriteria.Operator; -import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.UpdateExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IDelete; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.ISetClause; +import org.teiid.connector.language.IUpdate; +import org.teiid.connector.language.ICompareCriteria.Operator; +import org.teiid.connector.metadata.runtime.MetadataObject; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = + /** * Please see the user's guide for a full description of capabilties, etc. * = Modified: trunk/connectors/connector-ldap/src/test/java/com/metamatrix/conn= ector/ldap/TestIQueryToLdapSearchParser.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/= ldap/TestIQueryToLdapSearchParser.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-ldap/src/test/java/com/metamatrix/connector/= ldap/TestIQueryToLdapSearchParser.java 2009-02-25 20:18:40 UTC (rev 502) @@ -30,16 +30,17 @@ import javax.naming.directory.SearchControls; import javax.naming.ldap.SortKey; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import junit.framework.TestCase; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.SysLogger; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.unittest.FakeMetadataFacade; Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/= connector/loopback/LoopbackCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,8 +25,9 @@ import java.util.Arrays; import java.util.List; = -import com.metamatrix.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.basic.BasicConnectorCapabilities; = + /** * Specifies the capabilities of this connector. Since we want this = * connector to be able to emulate most other connectors, these = Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/= connector/loopback/LoopbackConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,13 +22,13 @@ = package com.metamatrix.connector.loopback; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.Execution; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.Execution; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = /** * Serves as a connection for the Loopback connector. Since there is no a= ctual Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/= connector/loopback/LoopbackConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,8 +22,8 @@ = package com.metamatrix.connector.loopback; = -import com.metamatrix.connector.api.*; -import com.metamatrix.connector.basic.BasicConnector; +import org.teiid.connector.api.*; +import org.teiid.connector.basic.BasicConnector; = /** * Starting point for the Loopback connector. Modified: trunk/connectors/connector-loopback/src/main/java/com/metamatrix/= connector/loopback/LoopbackExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-loopback/src/main/java/com/metamatrix/connec= tor/loopback/LoopbackExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -34,18 +34,19 @@ import java.util.List; import java.util.Random; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.api.UpdateExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = + /** * Represents the execution of a command. */ Modified: trunk/connectors/connector-loopback/src/test/java/com/metamatrix/= connector/loopback/TestLoopbackExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connec= tor/loopback/TestLoopbackExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-loopback/src/test/java/com/metamatrix/connec= tor/loopback/TestLoopbackExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,12 +27,13 @@ import java.util.List; import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.ConnectorHost; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.connector.api.ConnectorException; = public class TestLoopbackExecution extends TestCase { = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/Connector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/Connector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/Connector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,18 +26,19 @@ import java.net.MalformedURLException; import java.net.URL; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.CredentialMap; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.CredentialMap; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling; + import com.metamatrix.connector.salesforce.connection.SalesforceConnection; = @ConnectionPooling -public class Connector extends com.metamatrix.connector.basic.BasicConnect= or { +public class Connector extends org.teiid.connector.basic.BasicConnector { = private ConnectorLogger logger; = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/ConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/ConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/ConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,10 @@ import java.net.URL; import java.util.Properties; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; = + public class ConnectorState { = public static final String USERNAME =3D "username"; Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/SalesforceCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/SalesforceCapabilities.java 2009-02-25 19:09:43 UTC (rev 5= 01) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/SalesforceCapabilities.java 2009-02-25 20:18:40 UTC (rev 5= 02) @@ -24,8 +24,9 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.basic.BasicConnectorCapabilities; = + public class SalesforceCapabilities extends BasicConnectorCapabilities { = public int getMaxInCriteriaSize() { Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/Util.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/Util.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/Util.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,8 +24,9 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = + public class Util { = public static boolean convertStringToBoolean(String value) { Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/connection/SalesforceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/connection/SalesforceConnection.java 2009-02-25 19:09:43 U= TC (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/connection/SalesforceConnection.java 2009-02-25 20:18:40 U= TC (rev 502) @@ -24,15 +24,16 @@ import java.net.URL; import java.util.List; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.api.UpdateExecution; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.salesforce.Messages; import com.metamatrix.connector.salesforce.connection.impl.ConnectionImpl; import com.metamatrix.connector.salesforce.execution.DataPayload; Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/connection/impl/ConnectionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/connection/impl/ConnectionImpl.java 2009-02-25 19:09:43 UT= C (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/connection/impl/ConnectionImpl.java 2009-02-25 20:18:40 UT= C (rev 502) @@ -36,9 +36,9 @@ import org.apache.axis.handlers.SimpleSessionHandler; import org.apache.axis.transport.http.CommonsHTTPSender; import org.apache.axis.transport.http.HTTPTransport; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.salesforce.execution.DataPayload; import com.sforce.soap.partner.CallOptions; import com.sforce.soap.partner.DeleteResult; Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/DeleteExecutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/DeleteExecutionImpl.java 2009-02-25 19:09:43 UTC= (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/DeleteExecutionImpl.java 2009-02-25 20:18:40 UTC= (rev 502) @@ -21,8 +21,9 @@ */ package com.metamatrix.connector.salesforce.execution; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IDelete; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IDelete; + import com.metamatrix.connector.salesforce.execution.visitors.DeleteVisito= r; = public class DeleteExecutionImpl { Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/InsertExecutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/InsertExecutionImpl.java 2009-02-25 19:09:43 UTC= (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/InsertExecutionImpl.java 2009-02-25 20:18:40 UTC= (rev 502) @@ -22,8 +22,9 @@ package com.metamatrix.connector.salesforce.execution; = = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IInsert; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IInsert; + import com.metamatrix.connector.salesforce.execution.visitors.InsertVisito= r; = public class InsertExecutionImpl { Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/QueryExecutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/QueryExecutionImpl.java 2009-02-25 19:09:43 UTC = (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/QueryExecutionImpl.java 2009-02-25 20:18:40 UTC = (rev 502) @@ -30,17 +30,17 @@ import java.util.Map; = import org.apache.axis.message.MessageElement; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.salesforce.Messages; import com.metamatrix.connector.salesforce.Util; import com.metamatrix.connector.salesforce.connection.SalesforceConnection; Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/UpdateExecutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/UpdateExecutionImpl.java 2009-02-25 19:09:43 UTC= (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/UpdateExecutionImpl.java 2009-02-25 20:18:40 UTC= (rev 502) @@ -27,13 +27,13 @@ import javax.xml.namespace.QName; = import org.apache.axis.message.MessageElement; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.ISetClause; +import org.teiid.connector.language.IUpdate; +import org.teiid.connector.metadata.runtime.Element; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.ISetClause; -import com.metamatrix.connector.language.IUpdate; -import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.connector.salesforce.Util; import com.metamatrix.connector.salesforce.execution.visitors.UpdateVisito= r; = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/UpdateExecutionParent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/UpdateExecutionParent.java 2009-02-25 19:09:43 U= TC (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/UpdateExecutionParent.java 2009-02-25 20:18:40 U= TC (rev 502) @@ -23,19 +23,20 @@ = import java.util.ArrayList; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IDelete; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.IUpdate; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.UpdateExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IDelete; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.IUpdate; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.salesforce.Util; import com.metamatrix.connector.salesforce.connection.SalesforceConnection; import com.metamatrix.connector.salesforce.execution.visitors.IQueryProvid= ingVisitor; @@ -78,13 +79,13 @@ = @Override public void execute() throws ConnectorException { - if(command instanceof com.metamatrix.connector.language.IDelete) { + if(command instanceof org.teiid.connector.language.IDelete) { DeleteExecutionImpl ex =3D new DeleteExecutionImpl(); result =3D ex.execute(((IDelete)command), this); - } else if (command instanceof com.metamatrix.connector.language.IInsert)= { + } else if (command instanceof org.teiid.connector.language.IInsert) { InsertExecutionImpl ex =3D new InsertExecutionImpl(); result =3D ex.execute(((IInsert)command), this); - } else if (command instanceof com.metamatrix.connector.language.IUpdate)= { + } else if (command instanceof org.teiid.connector.language.IUpdate) { UpdateExecutionImpl ex =3D new UpdateExecutionImpl(); result =3D ex.execute(((IUpdate)command), this); } Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/CriteriaVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/CriteriaVisitor.java 2009-02-25 19:09:4= 3 UTC (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/CriteriaVisitor.java 2009-02-25 20:18:4= 0 UTC (rev 502) @@ -28,22 +28,23 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.ICompareCriteria.Operator; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.language.ILikeCriteria; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.ICompareCriteria.Operator; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Group; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.visitor.framework.HierarchyVisitor; + import com.metamatrix.connector.salesforce.Messages; import com.metamatrix.connector.salesforce.Util; -import com.metamatrix.connector.visitor.framework.HierarchyVisitor; = /** * = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/DeleteVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/DeleteVisitor.java 2009-02-25 19:09:43 = UTC (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/DeleteVisitor.java 2009-02-25 20:18:40 = UTC (rev 502) @@ -23,10 +23,11 @@ = import java.util.Iterator; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IDelete; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IDelete; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = + public class DeleteVisitor extends CriteriaVisitor implements IQueryProvid= ingVisitor { = public DeleteVisitor(RuntimeMetadata metadata) { Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/ICriteriaVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/ICriteriaVisitor.java 2009-02-25 19:09:= 43 UTC (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/ICriteriaVisitor.java 2009-02-25 20:18:= 40 UTC (rev 502) @@ -21,7 +21,7 @@ */ package com.metamatrix.connector.salesforce.execution.visitors; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = public interface ICriteriaVisitor { = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/IQueryProvidingVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/IQueryProvidingVisitor.java 2009-02-25 = 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/IQueryProvidingVisitor.java 2009-02-25 = 20:18:40 UTC (rev 502) @@ -21,7 +21,7 @@ */ package com.metamatrix.connector.salesforce.execution.visitors; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = public interface IQueryProvidingVisitor extends ICriteriaVisitor { = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/InsertVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/InsertVisitor.java 2009-02-25 19:09:43 = UTC (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/InsertVisitor.java 2009-02-25 20:18:40 = UTC (rev 502) @@ -27,14 +27,14 @@ import javax.xml.namespace.QName; = import org.apache.axis.message.MessageElement; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = public class InsertVisitor extends CriteriaVisitor { = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/SelectVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/SelectVisitor.java 2009-02-25 19:09:43 = UTC (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/SelectVisitor.java 2009-02-25 20:18:40 = UTC (rev 502) @@ -26,16 +26,17 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFrom; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.salesforce.Messages; import com.metamatrix.connector.salesforce.Util; = Modified: trunk/connectors/connector-salesforce/src/main/java/com/metamatri= x/connector/salesforce/execution/visitors/UpdateVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/UpdateVisitor.java 2009-02-25 19:09:43 = UTC (rev 501) +++ trunk/connectors/connector-salesforce/src/main/java/com/metamatrix/conn= ector/salesforce/execution/visitors/UpdateVisitor.java 2009-02-25 20:18:40 = UTC (rev 502) @@ -23,10 +23,11 @@ = import java.util.Iterator; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IUpdate; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IUpdate; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = + public class UpdateVisitor extends CriteriaVisitor implements IQueryProvid= ingVisitor { = public UpdateVisitor(RuntimeMetadata metadata) { = Modified: trunk/connectors/connector-salesforce/src/test/java/com/metamatri= x/connector/salesforce/TestConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/conn= ector/salesforce/TestConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/conn= ector/salesforce/TestConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -21,11 +21,12 @@ */ package com.metamatrix.connector.salesforce; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; + import junit.framework.TestCase; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.salesforce.connection.SalesforceConnection; import com.metamatrix.connector.salesforce.test.util.ObjectFactory; = Modified: trunk/connectors/connector-salesforce/src/test/java/com/metamatri= x/connector/salesforce/test/util/ObjectFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/conn= ector/salesforce/test/util/ObjectFactory.java 2009-02-25 19:09:43 UTC (rev = 501) +++ trunk/connectors/connector-salesforce/src/test/java/com/metamatrix/conn= ector/salesforce/test/util/ObjectFactory.java 2009-02-25 20:18:40 UTC (rev = 502) @@ -25,10 +25,11 @@ import java.util.Map; import java.util.Properties; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.CredentialMap; +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.CredentialMap; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.salesforce.ConnectorState; = public class ObjectFactory { Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/conn= ector/text/StringToDateTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/StringToDateTranslator.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/StringToDateTranslator.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,8 +25,9 @@ import java.util.*; import java.text.*; = -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorLogger; = + /** *

This is a helper class for TextTranslators that can be used to tran= slate * any String that is a representation of a date to a java.util.Date objec= t. Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/conn= ector/text/TextCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.text; = -import com.metamatrix.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.basic.BasicConnectorCapabilities; = public class TextCapabilities extends BasicConnectorCapabilities { = Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/conn= ector/text/TextConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,15 +25,16 @@ import java.util.HashMap; import java.util.Map; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = + /** * Implementation of Connection interface for text connection. */ Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/conn= ector/text/TextConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -34,14 +34,15 @@ import java.util.Map; import java.util.Properties; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.basic.BasicConnector; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.basic.BasicConnector; = + /** * Implementation of text connector. */ Modified: trunk/connectors/connector-text/src/main/java/com/metamatrix/conn= ector/text/TextSynchExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextSynchExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-text/src/main/java/com/metamatrix/connector/= text/TextSynchExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -37,22 +37,23 @@ import java.util.Map; import java.util.Properties; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IFrom; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Group; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.core.util.StringUtil; = /** @@ -596,8 +597,8 @@ } = /** - * Helper method for getting runtime {@link com.metamatrix.connector.m= etadata.runtime.Element} from a - * {@link com.metamatrix.connector.language.ISelectSymbol}. + * Helper method for getting runtime {@link org.teiid.connector.metada= ta.runtime.Element} from a + * {@link org.teiid.connector.language.ISelectSymbol}. * @param symbol Input ISelectSymbol * @return Element returned metadata runtime Element */ Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/conn= ector/text/TestMultiFileTextSynchExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestMultiFileTextSynchExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestMultiFileTextSynchExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,10 +27,11 @@ import java.util.List; import java.util.Set; = +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.ConnectorHost; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.UnitTestUtil; import com.metamatrix.query.unittest.TimestampUtil; = Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/conn= ector/text/TestRowHeaderTextSynchExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestRowHeaderTextSynchExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestRowHeaderTextSynchExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,10 @@ = package com.metamatrix.connector.text; = +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = -import com.metamatrix.connector.api.ConnectorException; = = public class TestRowHeaderTextSynchExecution extends TestCase { Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/conn= ector/text/TestTextConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestTextConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestTextConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,11 +25,12 @@ import java.util.Map; import java.util.Properties; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.UnitTestUtil; = /** Modified: trunk/connectors/connector-text/src/test/java/com/metamatrix/conn= ector/text/TestTextConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestTextConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-text/src/test/java/com/metamatrix/connector/= text/TestTextConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,10 +24,11 @@ = import java.util.Properties; = +import org.teiid.connector.api.ConnectorEnvironment; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.core.util.UnitTestUtil; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/AbstractCachingConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/AbstractCachingConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/AbstractCachingConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,8 +27,9 @@ import java.util.HashMap; import java.util.Map; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; + import com.metamatrix.connector.xml.base.LoggingConnector; import com.metamatrix.connector.xml.cache.DocumentCache; import com.metamatrix.connector.xml.cache.IDocumentCache; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/AsynchronousDocumentProducer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/AsynchronousDocumentProducer.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/AsynchronousDocumentProducer.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,7 +24,7 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = public interface AsynchronousDocumentProducer extends DocumentProducer { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/BaseXMLConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/BaseXMLConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/BaseXMLConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,9 @@ package com.metamatrix.connector.xml; = = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; = public interface BaseXMLConnectorState { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/CachingConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/CachingConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/CachingConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,7 +24,8 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; + import com.metamatrix.connector.xml.base.StatefulConnector; import com.metamatrix.connector.xml.cache.IDocumentCache; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/DocumentProducer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/DocumentProducer.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/DocumentProducer.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,7 +25,8 @@ = import java.io.Serializable; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; + import com.metamatrix.connector.xml.base.Response; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/IQueryPreprocessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/IQueryPreprocessor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/IQueryPreprocessor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,11 +24,11 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = public interface IQueryPreprocessor { /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/NamedDocumentExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/NamedDocumentExecutor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/NamedDocumentExecutor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -23,7 +23,7 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = public interface NamedDocumentExecutor { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/SAXFilterProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/SAXFilterProvider.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/SAXFilterProvider.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,9 +24,9 @@ = package com.metamatrix.connector.xml; = +import org.teiid.connector.api.ConnectorLogger; import org.xml.sax.helpers.XMLFilterImpl; = -import com.metamatrix.connector.api.ConnectorLogger; = public interface SAXFilterProvider { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/SecureConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/SecureConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/SecureConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,7 +24,7 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = public interface SecureConnectorState { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/TrustedPayloadHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/TrustedPayloadHandler.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/TrustedPayloadHandler.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,10 @@ package com.metamatrix.connector.xml; = import java.io.Serializable; + +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorLogger; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorLogger; = public interface TrustedPayloadHandler { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/XMLConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/XMLConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/XMLConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,9 +24,9 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; = public interface XMLConnection extends Connection { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/XMLConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/XMLConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/XMLConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -23,11 +23,11 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; = public interface XMLConnectorState extends BaseXMLConnectorState { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/XMLExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/XMLExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/XMLExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,8 +22,9 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.api.Execution; -import com.metamatrix.connector.api.ExecutionContext; +import org.teiid.connector.api.Execution; +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.connector.xml.base.ExecutionInfo; import com.metamatrix.connector.xml.cache.IDocumentCache; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/BaseBatchProducer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/BaseBatchProducer.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/BaseBatchProducer.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,10 +25,11 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; = + public class BaseBatchProducer { = private List allResultsList; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/BaseResultsProducer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/BaseResultsProducer.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/BaseResultsProducer.java 2009-02-25 20:18:40 UTC (rev 502) @@ -49,9 +49,9 @@ import org.jdom.Text; import org.jdom.input.SAXBuilder; import org.jdom.output.XMLOutputter; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.xml.cache.IDocumentCache; import com.metamatrix.connector.xml.http.Messages; /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/CriteriaDesc.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/CriteriaDesc.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/CriteriaDesc.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,19 +27,20 @@ import java.util.List; import java.util.Properties; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IBaseInCriteria; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.LanguageUtil; -import com.metamatrix.connector.language.ICompareCriteria.Operator; -import com.metamatrix.connector.metadata.runtime.Element; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IBaseInCriteria; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.LanguageUtil; +import org.teiid.connector.language.ICompareCriteria.Operator; +import org.teiid.connector.metadata.runtime.Element; = + /** * @author BLotenberg * = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/DocumentBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/DocumentBuilder.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/DocumentBuilder.java 2009-02-25 20:18:40 UTC (rev 502) @@ -35,8 +35,8 @@ import org.jdom.IllegalNameException; import org.jdom.Namespace; import org.jdom.output.XMLOutputter; +import org.teiid.connector.api.ConnectorException; = -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.soap.SOAPDocBuilder; = public class DocumentBuilder { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/FileBackedValueReference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/FileBackedValueReference.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/FileBackedValueReference.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,8 +26,9 @@ import java.io.RandomAccessFile; import java.lang.Long; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = + public class FileBackedValueReference implements LargeTextValueReference { private RandomAccessFile file; private long length; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/FileLifeManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/FileLifeManager.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/FileLifeManager.java 2009-02-25 20:18:40 UTC (rev 502) @@ -29,8 +29,9 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorLogger; = + // Deletes a file when garbage collected. This allows a physical file // to be removed during the garbage collection process. As long as everyone // that references a file does so through its file deleter object Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/IDGeneratingXmlFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/IDGeneratingXmlFilter.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/IDGeneratingXmlFilter.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,12 +28,12 @@ import java.util.List; import java.util.Map; = +import org.teiid.connector.api.ConnectorLogger; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.XMLFilterImpl; = -import com.metamatrix.connector.api.ConnectorLogger; = class IDGeneratingXmlFilter extends XMLFilterImpl { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/LargeOrSmallString.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LargeOrSmallString.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LargeOrSmallString.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.xml.base; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = = public class LargeOrSmallString Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/LargeTextExtractingXmlFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LargeTextExtractingXmlFilter.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LargeTextExtractingXmlFilter.java 2009-02-25 20:18:40 UTC (rev 502) @@ -32,12 +32,12 @@ import java.util.Iterator; import java.util.List; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.XMLFilterImpl; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; = class LargeTextExtractingXmlFilter extends XMLFilterImpl { LargeTextExtractingXmlFilter(int maxInMemoryStringSize, Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/LargeTextValueReference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LargeTextValueReference.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LargeTextValueReference.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.xml.base; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = public interface LargeTextValueReference { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/LoggingConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LoggingConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LoggingConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,10 +22,11 @@ = package com.metamatrix.connector.xml.base; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.basic.BasicConnector; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.basic.BasicConnector; + import com.metamatrix.connector.xml.XMLConnectorState; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/LoggingInputStreamFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LoggingInputStreamFilter.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/LoggingInputStreamFilter.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,8 +26,9 @@ import java.io.IOException; import java.io.InputStream; = -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorLogger; = + public class LoggingInputStreamFilter extends FilterInputStream { = ConnectorLogger logger; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/NoExtendedFilters.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/NoExtendedFilters.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/NoExtendedFilters.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.connector.xml.base; = +import org.teiid.connector.api.ConnectorLogger; import org.xml.sax.helpers.XMLFilterImpl; = -import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.xml.SAXFilterProvider; = public class NoExtendedFilters implements SAXFilterProvider { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/NoQueryPreprocessing.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/NoQueryPreprocessing.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/NoQueryPreprocessing.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,11 +24,12 @@ = package com.metamatrix.connector.xml.base; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.xml.IQueryPreprocessor; = public class NoQueryPreprocessing implements IQueryPreprocessor { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/OutputXPathDesc.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/OutputXPathDesc.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/OutputXPathDesc.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,11 +25,12 @@ = import java.text.MessageFormat; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.metadata.runtime.Element; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.metadata.runtime.Element; = = + /** * @author BLotenberg * Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/ParameterDescriptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/ParameterDescriptor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/ParameterDescriptor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -23,8 +23,8 @@ = package com.metamatrix.connector.xml.base; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.Element; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.metadata.runtime.Element; = = public abstract class ParameterDescriptor { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/PluggableInputStreamFilterImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/PluggableInputStreamFilterImpl.java 2009-02-25 19:09:43 UTC (rev 50= 1) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/PluggableInputStreamFilterImpl.java 2009-02-25 20:18:40 UTC (rev 50= 2) @@ -26,8 +26,9 @@ import java.io.IOException; import java.io.InputStream; = -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorLogger; = + public class PluggableInputStreamFilterImpl extends FilterInputStream { = public PluggableInputStreamFilterImpl(InputStream in, ConnectorLogger log= ger) { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/QueryAnalyzer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/QueryAnalyzer.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/QueryAnalyzer.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,21 +27,22 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFrom; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Group; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.xml.IQueryPreprocessor; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/RequestResponseDocumentProducer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/RequestResponseDocumentProducer.java 2009-02-25 19:09:43 UTC (rev 5= 01) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/RequestResponseDocumentProducer.java 2009-02-25 20:18:40 UTC (rev 5= 02) @@ -32,8 +32,9 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; + import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLConnectorState; import com.metamatrix.connector.xml.XMLExecution; @@ -151,7 +152,7 @@ try { Class pluggableFilter =3D Thread.currentThread().getContextClassLoade= r().loadClass(getState().getPluggableInputStreamFilterClass()); Constructor ctor =3D pluggableFilter.getConstructor( - new Class[] { java.io.InputStream.class, com.metamatrix.connector.a= pi.ConnectorLogger.class}); + new Class[] { java.io.InputStream.class, org.teiid.connector.api.Co= nnectorLogger.class}); filter =3D (InputStream) ctor.newInstance(new Object[] {response, log= ger}); } catch (Exception cnf) { throw new ConnectorException(cnf); Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/Response.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/Response.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/Response.java 2009-02-25 20:18:40 UTC (rev 502) @@ -32,8 +32,8 @@ import java.io.Serializable; = import org.apache.commons.codec.binary.Base64; +import org.teiid.connector.api.ConnectorException; = -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.cache.DocumentCache; import com.metamatrix.connector.xml.cache.IDocumentCache; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/SecureConnectorStateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/SecureConnectorStateImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/SecureConnectorStateImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,10 @@ package com.metamatrix.connector.xml.base; = import java.util.Properties; + +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.SecureConnectorState; import com.metamatrix.connector.xml.TrustedPayloadHandler; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/StatefulConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/StatefulConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/StatefulConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,9 +24,10 @@ = package com.metamatrix.connector.xml.base; = -import com.metamatrix.connector.api.Connector; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.Connector; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorLogger; + import com.metamatrix.connector.xml.XMLConnectorState; = public interface StatefulConnector extends Connector { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/TrustedPayloadBridge.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/TrustedPayloadBridge.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/TrustedPayloadBridge.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,9 +26,10 @@ = import java.io.Serializable; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.CredentialMap; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.CredentialMap; + import com.metamatrix.connector.xml.TrustedPayloadHandler; = public abstract class TrustedPayloadBridge implements TrustedPayloadHandle= r { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/ValueConvertor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/ValueConvertor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/ValueConvertor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,12 +26,13 @@ = import java.text.MessageFormat; import java.util.ArrayList; + +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.metadata.runtime.Element; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.metadata.runtime.Element; = public class ValueConvertor { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/XMLCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,9 +26,10 @@ import java.util.Collections; import java.util.List; = -import com.metamatrix.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.basic.BasicConnectorCapabilities; = = + public class XMLCapabilities extends BasicConnectorCapabilities { = public XMLCapabilities() { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/XMLConnectionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLConnectionImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLConnectionImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,15 +25,16 @@ = import java.io.Serializable; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.SecureConnectorState; import com.metamatrix.connector.xml.TrustedPayloadHandler; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/XMLConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -23,13 +23,14 @@ = package com.metamatrix.connector.xml.base; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling; + import com.metamatrix.connector.xml.AbstractCachingConnector; = @ConnectionPooling(enabled=3Dfalse) Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/XMLConnectorStateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLConnectorStateImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLConnectorStateImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,10 +25,11 @@ = import java.util.Properties; = -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; + import com.metamatrix.connector.xml.IQueryPreprocessor; import com.metamatrix.connector.xml.SAXFilterProvider; import com.metamatrix.connector.xml.XMLConnectorState; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/XMLExecutionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLExecutionImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLExecutionImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,15 +28,16 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLConnection; import com.metamatrix.connector.xml.XMLConnectorState; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/base/XMLExtractor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLExtractor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/base/XMLExtractor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -34,6 +34,8 @@ import org.jdom.Element; import org.jdom.JDOMException; import org.jdom.input.SAXBuilder; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.XMLFilter; @@ -41,8 +43,6 @@ import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.XMLFilterImpl; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.xml.SAXFilterProvider; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/cache/DocumentCache.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/DocumentCache.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/DocumentCache.java 2009-02-25 20:18:40 UTC (rev 502) @@ -40,8 +40,9 @@ import java.util.Set; import java.util.Vector; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; + import com.metamatrix.connector.xml.base.XMLDocument; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/cache/ExecutionRecord.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/ExecutionRecord.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/ExecutionRecord.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,8 +27,9 @@ import java.util.Iterator; import java.util.Map; = -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorLogger; = + public class ExecutionRecord implements Record { = Record parent; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/cache/IDocumentCache.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/IDocumentCache.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/IDocumentCache.java 2009-02-25 20:18:40 UTC (rev 502) @@ -23,7 +23,7 @@ = package com.metamatrix.connector.xml.cache; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = public interface IDocumentCache { = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/cache/RequestPartRecord.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/RequestPartRecord.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/RequestPartRecord.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,8 +25,9 @@ import java.util.HashMap; import java.util.Map; = -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorLogger; = + public class RequestPartRecord implements Record { = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/cache/RequestRecord.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/RequestRecord.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/cache/RequestRecord.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,9 +26,10 @@ = import java.util.HashMap; import java.util.Map; + +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.xml.CachingConnector; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/file/FileConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/file/FileConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/file/FileConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,10 +25,11 @@ = import java.util.Properties; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLExecution; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/file/FileExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/file/FileExecutor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/file/FileExecutor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -33,10 +33,10 @@ import java.util.ArrayList; = import org.jdom.Document; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.NamedDocumentExecutor; import com.metamatrix.connector.xml.SAXFilterProvider; @@ -180,7 +180,7 @@ try { Class pluggableFilter =3D Thread.currentThread().getContextClassLoad= er().loadClass(m_state.getPluggableInputStreamFilterClass()); Constructor ctor =3D pluggableFilter.getConstructor( - new Class[] { java.io.InputStream.class, com.metamatrix.connector.= api.ConnectorLogger.class}); + new Class[] { java.io.InputStream.class, org.teiid.connector.api.C= onnectorLogger.class}); filter =3D (InputStream) ctor.newInstance(new Object[] {response, lo= gger}); } catch (Exception cnf) { throw new ConnectorException(cnf); Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/http/DefaultTrustDeserializer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/DefaultTrustDeserializer.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/DefaultTrustDeserializer.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,8 +28,8 @@ import org.apache.commons.httpclient.HttpMethod; import org.apache.commons.httpclient.UsernamePasswordCredentials; import org.apache.commons.httpclient.auth.AuthScope; +import org.teiid.connector.api.ConnectorException; = -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.XMLConnectorState; import com.metamatrix.connector.xml.base.TrustedPayloadBridge; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/http/HTTPConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -37,11 +37,11 @@ import org.apache.commons.httpclient.UsernamePasswordCredentials; import org.apache.commons.httpclient.auth.AuthScope; import org.apache.commons.httpclient.params.HttpConnectionManagerParams; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLExecution; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/http/HTTPExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPExecutor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPExecutor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -42,9 +42,9 @@ import org.apache.commons.httpclient.methods.StringRequestEntity; import org.apache.commons.httpclient.util.ParameterParser; import org.jdom.Document; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.SAXFilterProvider; import com.metamatrix.connector.xml.XMLConnection; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/http/HTTPRequestor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPRequestor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPRequestor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -37,9 +37,9 @@ import org.apache.commons.httpclient.methods.PostMethod; import org.jdom.Document; import org.jdom.output.XMLOutputter; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; = = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/http/HTTPTrustDeserializer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPTrustDeserializer.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/http/HTTPTrustDeserializer.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,9 +28,9 @@ = import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.xml.TrustedPayloadHandler; import com.metamatrix.connector.xml.XMLConnectorState; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/jms/JMSConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -35,14 +35,15 @@ import javax.naming.InitialContext; import javax.naming.NamingException; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.IQueryPreprocessor; import com.metamatrix.connector.xml.TrustedPayloadHandler; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/jms/JMSExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -33,15 +33,16 @@ import javax.jms.JMSException; import javax.jms.Session; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.xml.SOAPConnectorState; import com.metamatrix.connector.xml.XMLConnection; import com.metamatrix.connector.xml.XMLExecution; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/jms/JMSRequestExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSRequestExecutor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSRequestExecutor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -40,10 +40,10 @@ import javax.jms.TextMessage; = import org.jdom.Document; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.xml.AsynchronousDocumentProducer; import com.metamatrix.connector.xml.SOAPConnectorState; import com.metamatrix.connector.xml.base.CriteriaDesc; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/jms/JMSSOAPConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSSOAPConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSSOAPConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,9 +26,10 @@ = import java.util.Properties; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; + import com.metamatrix.connector.xml.SOAPConnectorState; import com.metamatrix.connector.xml.soap.SOAPConnectorStateImpl; import com.metamatrix.connector.xmlsource.soap.SecurityToken; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/jms/JMSXMLConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSXMLConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/jms/JMSXMLConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -29,10 +29,11 @@ import javax.jms.DeliveryMode; import javax.jms.Session; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLExecution; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/soap/FilteringHTTPSender.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/FilteringHTTPSender.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/FilteringHTTPSender.java 2009-02-25 20:18:40 UTC (rev 502) @@ -4,8 +4,8 @@ import java.lang.reflect.Constructor; = import org.apache.commons.httpclient.HttpMethodBase; +import org.teiid.connector.api.ConnectorLogger; = -import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.xml.XMLConnectorState; import com.metamatrix.connector.xml.base.LoggingInputStreamFilter; = @@ -29,7 +29,7 @@ = Class pluggableFilter =3D Thread.currentThread().getContextClassLoader()= .loadClass(state.getPluggableInputStreamFilterClass()); Constructor ctor =3D pluggableFilter.getConstructor( - new Class[] { java.io.InputStream.class, com.metamatrix.connector.api.C= onnectorLogger.class}); + new Class[] { java.io.InputStream.class, org.teiid.connector.api.Connec= torLogger.class}); result =3D (InputStream) ctor.newInstance(new Object[] {result, logger}); return result; } Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/soap/SOAPConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,9 +26,10 @@ = import java.util.Properties; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; + import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLExecution; import com.metamatrix.connector.xml.http.HTTPConnectorState; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/soap/SOAPConnectorStateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPConnectorStateImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPConnectorStateImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -30,9 +30,10 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; + import com.metamatrix.connector.xml.SOAPConnectorState; import com.metamatrix.connector.xml.base.Messages; import com.metamatrix.connector.xml.http.HTTPConnectorState; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/soap/SOAPDocBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPDocBuilder.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPDocBuilder.java 2009-02-25 20:18:40 UTC (rev 502) @@ -34,8 +34,8 @@ import org.jdom.Document; import org.jdom.Element; import org.jdom.Namespace; +import org.teiid.connector.api.ConnectorException; = -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.SOAPConnectorState; import com.metamatrix.connector.xml.base.CriteriaDesc; import com.metamatrix.connector.xml.base.DocumentBuilder; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/soap/SOAPExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPExecutor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPExecutor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -54,11 +54,11 @@ import org.jdom.Element; import org.jdom.input.DOMBuilder; import org.jdom.output.DOMOutputter; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; import org.w3c.dom.NodeList; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.SOAPConnectorState; import com.metamatrix.connector.xml.TrustedPayloadHandler; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/XMLConnectionFacory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLConnectionFacory.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLConnectionFacory.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,12 +24,13 @@ = import java.lang.reflect.Constructor; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; = = + /** = * This Connection facory which will handle the different connection seman= tics * the supported type will be Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/XMLSourceCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.xmlsource; = -import com.metamatrix.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.basic.BasicConnectorCapabilities; = /** */ Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/XMLSourceConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.connector.xmlsource; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.basic.BasicConnection; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.basic.BasicConnection; = /** * A Base XML Connection to an XML Source @@ -43,7 +43,7 @@ } = /** = - * @see com.metamatrix.connector.api.Connection#release() + * @see org.teiid.connector.api.Connection#release() */ public void close() { = XMLSourcePlugin.logInfo(this.env.getLogger(), "Connection_closed")= ; //$NON-NLS-1$ Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/XMLSourceConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,14 +22,14 @@ = package com.metamatrix.connector.xmlsource; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.basic.BasicConnector; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.Connector; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling; +import org.teiid.connector.basic.BasicConnector; = /** * XML Source connector, will give provide a XML document as source to @@ -58,7 +58,7 @@ = /** * Stop the Connector = - * @see com.metamatrix.connector.api.Connector#stop() + * @see org.teiid.connector.api.Connector#stop() */ public void stop() { if (!start) { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/XMLSourceExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,15 +28,16 @@ = import javax.xml.transform.Source; = -import com.metamatrix.connector.DataPlugin; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.IParameter; +import org.teiid.connector.DataPlugin; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.IParameter; = = + /** = * This is main class which will execute request in the XML Source */ @@ -78,21 +79,21 @@ } = = /** = - * @see com.metamatrix.connector.api.ProcedureExecution#getOutputValue= (com.metamatrix.connector.language.IParameter) + * @see org.teiid.connector.api.ProcedureExecution#getOutputValue(org.= teiid.connector.language.IParameter) */ public Object getOutputValue(IParameter parameter) throws ConnectorExc= eption { throw new ConnectorException(XMLSourcePlugin.Util.getString("No_ou= tputs_allowed")); //$NON-NLS-1$ } = /** = - * @see com.metamatrix.connector.api.Execution#close() + * @see org.teiid.connector.api.Execution#close() */ public void close() throws ConnectorException { // no-op } = /** = - * @see com.metamatrix.connector.api.Execution#cancel() + * @see org.teiid.connector.api.Execution#cancel() */ public void cancel() throws ConnectorException { // no-op Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/XMLSourcePlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourcePlugin.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourcePlugin.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,7 +24,8 @@ = import java.util.ResourceBundle; = -import com.metamatrix.connector.api.ConnectorLogger; +import org.teiid.connector.api.ConnectorLogger; + import com.metamatrix.core.BundleUtil; = /** Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/file/FileConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/file/FileConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/file/FileConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,12 +25,13 @@ import java.io.File; import java.util.Properties; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.xmlsource.XMLSourceConnection; import com.metamatrix.connector.xmlsource.XMLSourcePlugin; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/file/FileExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/file/FileExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/file/FileExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -31,12 +31,13 @@ import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.metadata.runtime.MetadataObject; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.xmlsource.XMLSourceExecution; import com.metamatrix.connector.xmlsource.XMLSourcePlugin; = @@ -70,7 +71,7 @@ } = /** = - * @see com.metamatrix.connector.api.ProcedureExecution#execute(com.me= tamatrix.connector.language.IProcedure, int) + * @see org.teiid.connector.api.ProcedureExecution#execute(org.teiid.c= onnector.language.IProcedure, int) */ @Override public void execute() throws ConnectorException { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/soap/SecurityToken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/SecurityToken.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/SecurityToken.java 2009-02-25 20:18:40 UTC (rev 502) @@ -36,8 +36,8 @@ import org.apache.ws.security.handler.WSHandlerConstants; import org.apache.ws.security.message.token.UsernameToken; import org.apache.ws.security.util.Base64; +import org.teiid.connector.api.ConnectorEnvironment; = -import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.xml.TrustedPayloadHandler; import com.metamatrix.connector.xmlsource.XMLSourcePlugin; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/soap/ServiceOperation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/ServiceOperation.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/ServiceOperation.java 2009-02-25 20:18:40 UTC (rev 502) @@ -43,9 +43,9 @@ import org.apache.axis.wsdl.symbolTable.Parameter; import org.apache.axis.wsdl.symbolTable.Parameters; import org.apache.axis.wsdl.symbolTable.TypeEntry; +import org.teiid.connector.api.ConnectorEnvironment; import org.w3c.dom.Element; = -import com.metamatrix.connector.api.ConnectorEnvironment; import com.metamatrix.connector.xmlsource.XMLSourcePlugin; = = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/soap/SoapConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/SoapConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/SoapConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -48,13 +48,13 @@ import org.apache.axis.wsdl.symbolTable.ServiceEntry; import org.apache.axis.wsdl.symbolTable.SymTabEntry; import org.apache.axis.wsdl.symbolTable.SymbolTable; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xmlsource.XMLSourceConnection; import com.metamatrix.connector.xmlsource.XMLSourcePlugin; = Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/soap/SoapExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/SoapExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/soap/SoapExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -29,14 +29,15 @@ = import javax.xml.transform.Source; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IParameter.Direction; +import org.teiid.connector.metadata.runtime.MetadataObject; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.xmlsource.XMLSourceExecution; import com.metamatrix.connector.xmlsource.XMLSourcePlugin; import com.metamatrix.connector.xmlsource.soap.ServiceOperation.ExcutionFa= iledException; @@ -68,7 +69,7 @@ } = /** = - * @see com.metamatrix.connector.api.ProcedureExecution#execute(com.me= tamatrix.connector.language.IProcedure, int) + * @see org.teiid.connector.api.ProcedureExecution#execute(org.teiid.c= onnector.language.IProcedure, int) */ public void execute() throws ConnectorException { ArrayList argsList =3D new ArrayList(); Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/MockQueryPreprocessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/MockQueryPreprocessor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/MockQueryPreprocessor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,11 +24,11 @@ = package com.metamatrix.connector.xml; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = public class MockQueryPreprocessor implements IQueryPreprocessor { = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/MockXMLExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/MockXMLExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/MockXMLExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,11 +25,11 @@ package com.metamatrix.connector.xml; = import org.mockito.Mockito; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xml.base.ExecutionInfo; import com.metamatrix.connector.xml.base.XMLConnectionImpl; import com.metamatrix.connector.xml.base.XMLExecutionImpl; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/ProxyObjectFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/ProxyObjectFactory.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/ProxyObjectFactory.java 2009-02-25 20:18:40 UTC (rev 502) @@ -30,14 +30,14 @@ = import org.jdom.Document; import org.jdom.input.SAXBuilder; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xml.SecureConnectorState; import com.metamatrix.connector.xml.file.FileConnectorState; import com.metamatrix.connector.xml.http.HTTPConnectorState; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestCriteriaDesc.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestCriteriaDesc.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestCriteriaDesc.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,23 +27,24 @@ import java.util.Iterator; import java.util.List; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IBaseInCriteria; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFrom; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.language.LanguageUtil; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Group; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import junit.framework.TestCase; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IBaseInCriteria; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.language.LanguageUtil; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = /** * created by JChoate on Jun 27, 2005 Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestExecutionInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestExecutionInfo.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestExecutionInfo.java 2009-02-25 20:18:40 UTC (rev 502) @@ -29,14 +29,14 @@ import junit.framework.TestCase; = import org.mockito.Mockito; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xml.IQueryPreprocessor; import com.metamatrix.connector.xml.MockQueryPreprocessor; = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestFileLifeManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestFileLifeManager.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestFileLifeManager.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,10 @@ import java.io.File; import java.io.IOException; = +import org.teiid.connector.api.ConnectorEnvironment; + import junit.framework.TestCase; = -import com.metamatrix.connector.api.ConnectorEnvironment; = public class TestFileLifeManager extends TestCase { = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestLargeTextExtractingXmlFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestLargeTextExtractingXmlFilter.java 2009-02-25 19:09:43 UTC (rev = 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestLargeTextExtractingXmlFilter.java 2009-02-25 20:18:40 UTC (rev = 502) @@ -30,10 +30,10 @@ import org.jdom.Document; import org.jdom.JDOMException; import org.jdom.input.SAXBuilder; +import org.teiid.connector.api.ConnectorLogger; import org.xml.sax.XMLFilter; import org.xml.sax.XMLReader; = -import com.metamatrix.connector.api.ConnectorLogger; = public class TestLargeTextExtractingXmlFilter extends TestCase { = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestLoggingInputStreamFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestLoggingInputStreamFilter.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestLoggingInputStreamFilter.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,9 +26,10 @@ import java.io.IOException; import java.io.InputStream; = +import org.teiid.connector.api.ConnectorLogger; + import junit.framework.TestCase; = -import com.metamatrix.connector.api.ConnectorLogger; = public class TestLoggingInputStreamFilter extends TestCase { = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestOutputXPathDesc.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestOutputXPathDesc.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestOutputXPathDesc.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,19 +24,20 @@ = import java.util.List; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.language.LanguageUtil; +import org.teiid.connector.metadata.runtime.Element; + import junit.framework.TestCase; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.language.LanguageUtil; -import com.metamatrix.connector.metadata.runtime.Element; = /** * created by JChoate on Jun 27, 2005 Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestParameterDescriptor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestParameterDescriptor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestParameterDescriptor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,15 +24,16 @@ = import java.util.List; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.metadata.runtime.Element; + import junit.framework.TestCase; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.metadata.runtime.Element; = /** * created by JChoate on Jun 27, 2005 Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestQueryAnalyzer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestQueryAnalyzer.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestQueryAnalyzer.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,16 +25,16 @@ = = import org.mockito.Mockito; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = import junit.framework.TestCase; = import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xml.IQueryPreprocessor; import com.metamatrix.connector.xml.MockQueryPreprocessor; = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestStringBackedValueReference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestStringBackedValueReference.java 2009-02-25 19:09:43 UTC (rev 50= 1) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestStringBackedValueReference.java 2009-02-25 20:18:40 UTC (rev 50= 2) @@ -22,9 +22,10 @@ = package com.metamatrix.connector.xml.base; = +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = -import com.metamatrix.connector.api.ConnectorException; = public class TestStringBackedValueReference extends TestCase { = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,9 +24,10 @@ = import java.util.List; = +import org.teiid.connector.api.ConnectorCapabilities; + import junit.framework.TestCase; = -import com.metamatrix.connector.api.ConnectorCapabilities; = /** * created by JChoate on Jun 27, 2005 Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,10 +24,11 @@ = = = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; + import junit.framework.TestCase; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; = = public class TestXMLConnection extends TestCase { Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,12 +25,13 @@ import java.io.File; import java.util.Properties; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.xml.XMLConnectorState; import com.metamatrix.connector.xml.file.FileConnectorState; = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,15 +24,16 @@ = import java.util.Properties; = +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.Execution; +import org.teiid.connector.api.ExecutionContext; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.Execution; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.connector.xml.CachingConnector; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.XMLConnectorState; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,10 +24,11 @@ = import java.util.List; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IQuery; + import junit.framework.TestCase; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IQuery; = /** * created by JChoate on Jun 16, 2005 Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLExtractor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLExtractor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLExtractor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,10 +28,10 @@ import junit.framework.TestCase; = import org.jdom.Document; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; = import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; = public class TestXMLExtractor extends TestCase { = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/cache/TestCache.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/cache/TestCache.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/cache/TestCache.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,12 +25,13 @@ = import java.io.File; = +import org.teiid.connector.api.ConnectorException; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.UnitTestUtil; = /** Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/cache/TestRequestRecord.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/cache/TestRequestRecord.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/cache/TestRequestRecord.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,9 @@ import junit.framework.TestCase; = import org.mockito.Mockito; +import org.teiid.connector.api.ConnectorLogger; = import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.connector.xml.CachingConnector; = public class TestRequestRecord extends TestCase { Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/file/TestFileConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/file/TestFileConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/file/TestFileConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,11 +24,12 @@ = import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.DocumentProducer; import com.metamatrix.connector.xml.base.ProxyObjectFactory; import com.metamatrix.connector.xml.base.XMLExecutionImpl; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/file/TestFileExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/file/TestFileExecutor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/file/TestFileExecutor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,18 +27,19 @@ import java.util.ArrayList; import java.util.Properties; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xml.MockXMLExecution; import com.metamatrix.connector.xml.base.ExecutionInfo; import com.metamatrix.connector.xml.base.OutputXPathDesc; Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/http/TestHTTPConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/http/TestHTTPConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/http/TestHTTPConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,11 +24,12 @@ = import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.base.ProxyObjectFactory; = /** Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/jms/TestJMSConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/jms/TestJMSConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/jms/TestJMSConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,12 +27,13 @@ import javax.jms.DeliveryMode; import javax.jms.Session; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.base.ProxyObjectFactory; = public class TestJMSConnectorState extends TestCase { Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/jms/TestJMSSOAPConnectorState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/jms/TestJMSSOAPConnectorState.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/jms/TestJMSSOAPConnectorState.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,12 +27,13 @@ import javax.jms.DeliveryMode; import javax.jms.Session; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.connector.xml.base.ProxyObjectFactory; import com.metamatrix.connector.xml.soap.SOAPConnectorStateImpl; = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xmlsource/file/TestFileConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/file/TestFileConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/file/TestFileConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,11 +24,12 @@ = import java.util.Properties; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.UnitTestUtil; = = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xmlsource/file/TestFileExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/file/TestFileExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/file/TestFileExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -31,16 +31,16 @@ import junit.framework.TestCase; = import org.mockito.Mockito; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IParameter.Direction; +import org.teiid.connector.metadata.runtime.Procedure; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.metadata.runtime.Procedure; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.util.UnitTestUtil; = = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xmlsource/soap/TestSoapConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/soap/TestSoapConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/soap/TestSoapConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,11 +25,12 @@ import java.io.File; import java.util.Properties; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.EnvironmentUtility; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.UnitTestUtil; = = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xmlsource/soap/TestSoapExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/soap/TestSoapExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= mlsource/soap/TestSoapExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -34,16 +34,16 @@ import junit.framework.TestSuite; = import org.mockito.Mockito; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IParameter.Direction; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.SysLogger; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.xmlsource.file.TestFileExecution; import com.metamatrix.connector.xmlsource.soap.service.WebServiceServer; import com.metamatrix.core.util.UnitTestUtil; Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamat= rix/connector/exec/ExecAntExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecAntExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecAntExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -43,19 +43,19 @@ import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; import org.apache.tools.ant.taskdefs.PumpStreamHandler; import org.apache.tools.ant.types.Commandline.Argument; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = import com.metamatrix.common.config.CurrentConfiguration; import com.metamatrix.common.config.api.Host; import com.metamatrix.common.util.CommonPropertyNames; import com.metamatrix.common.util.OSPlatformUtil; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.util.Assertion; import com.metamatrix.core.util.StringUtil; import com.metamatrix.core.util.TempDirectory; @@ -134,7 +134,7 @@ throws ConnectorException { = env.getLogger().logTrace("Exec executing command: " + query); //$NON-NLS= -1$ - com.metamatrix.connector.language.ICriteria crit =3D query.getWhere(); + org.teiid.connector.language.ICriteria crit =3D query.getWhere(); if (crit =3D=3D null) throw new ConnectorException(ExecPlugin.Util .getString("ExecExecution.Must_have_criteria")); //$NON-NLS-1$ Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamat= rix/connector/exec/ExecCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,8 +24,9 @@ import java.util.Collections; import java.util.List; = -import com.metamatrix.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.basic.BasicConnectorCapabilities; = + /** */ public class ExecCapabilities extends BasicConnectorCapabilities { Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamat= rix/connector/exec/ExecConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -23,16 +23,17 @@ package com.metamatrix.connector.exec; import java.util.List; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = + public class ExecConnection extends BasicConnection { = ConnectorEnvironment env; Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamat= rix/connector/exec/ExecConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,16 +28,17 @@ import java.util.List; import java.util.Properties; = +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.basic.BasicConnector; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.extensionmodule.ExtensionModuleManager; import com.metamatrix.common.extensionmodule.exception.ExtensionModuleNotF= oundException; -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.basic.BasicConnector; import com.metamatrix.core.util.ObjectConverterUtil; = /** Modified: trunk/connectors/sandbox/connector-exec/src/main/java/com/metamat= rix/connector/exec/ExecVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecVisitor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-exec/src/main/java/com/metamatrix/co= nnector/exec/ExecVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,15 +25,16 @@ import java.util.HashMap; import java.util.Map; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.visitor.framework.HierarchyVisitor; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.visitor.framework.HierarchyVisitor; = + /** */ public class ExecVisitor extends HierarchyVisitor { Modified: trunk/connectors/sandbox/connector-exec/src/test/java/com/metamat= rix/connector/exec/FakeExecConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/co= nnector/exec/FakeExecConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/co= nnector/exec/FakeExecConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,8 +28,9 @@ import java.util.List; import java.util.Properties; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = + /** * Implmentation of text connector. */ Modified: trunk/connectors/sandbox/connector-exec/src/test/java/com/metamat= rix/connector/exec/TestsExec.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/co= nnector/exec/TestsExec.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-exec/src/test/java/com/metamatrix/co= nnector/exec/TestsExec.java 2009-02-25 20:18:40 UTC (rev 502) @@ -30,11 +30,12 @@ import java.util.List; import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ResultSetExecution; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.ConnectorHost; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ResultSetExecution; import com.metamatrix.core.util.UnitTestUtil; = /** Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/ObjectConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -23,15 +23,16 @@ package com.metamatrix.connector.object; = = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.admin.api.exception.AdminException; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.connector.object.extension.IObjectSource; import com.metamatrix.connector.object.extension.ISourceTranslator; import com.metamatrix.connector.object.util.ObjectConnectorUtil; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/ObjectConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,14 +22,15 @@ = package com.metamatrix.connector.object; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorIdentity; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.basic.BasicConnector; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.basic.BasicConnector; + import com.metamatrix.connector.object.util.ObjectConnectorUtil; = /** Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/ObjectConnectorCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnectorCapabilities.java 2009-02-25 19:09:43 UTC (= rev 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectConnectorCapabilities.java 2009-02-25 20:18:40 UTC (= rev 502) @@ -22,7 +22,7 @@ = package com.metamatrix.connector.object; = -import com.metamatrix.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.basic.BasicConnectorCapabilities; = /** */ Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/ObjectProcedureExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectProcedureExecution.java 2009-02-25 19:09:43 UTC (rev= 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/ObjectProcedureExecution.java 2009-02-25 20:18:40 UTC (rev= 502) @@ -24,15 +24,16 @@ = import java.util.List; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.object.extension.IObjectCommand; import com.metamatrix.connector.object.extension.IObjectSource; import com.metamatrix.connector.object.extension.ISourceTranslator; @@ -81,7 +82,7 @@ = = /** = - * @see com.metamatrix.connector.api.ProcedureExecution#execute(com.me= tamatrix.connector.language.IProcedure, int) + * @see org.teiid.connector.api.ProcedureExecution#execute(org.teiid.c= onnector.language.IProcedure, int) * @since 4.2 */ public void execute() throws ConnectorException { @@ -104,7 +105,7 @@ = = /** = - * @see com.metamatrix.connector.api.ProcedureExecution#getOutputValue= (com.metamatrix.connector.language.IParameter) + * @see org.teiid.connector.api.ProcedureExecution#getOutputValue(org.= teiid.connector.language.IParameter) * @since 4.2 */ public Object getOutputValue(IParameter parameter) throws ConnectorExc= eption { Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/SourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/SourceConnectionFactory.java 2009-02-25 19:09:43 UTC (rev = 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/SourceConnectionFactory.java 2009-02-25 20:18:40 UTC (rev = 502) @@ -1,11 +1,11 @@ package com.metamatrix.connector.object; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorIdentity; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.SingleIdentity; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.SingleIdentity; = public interface SourceConnectionFactory { = Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/IObjectCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/IObjectCommand.java 2009-02-25 19:09:43 UTC (rev= 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/IObjectCommand.java 2009-02-25 20:18:40 UTC (rev= 502) @@ -25,9 +25,10 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.language.ICommand; +import org.teiid.connector.language.ICommand; = = + /** = * The IObjectCommand is the command to be executed. This indicates what = is being * executed and This also contains the metadata about Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/IObjectSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/IObjectSource.java 2009-02-25 19:09:43 UTC (rev = 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/IObjectSource.java 2009-02-25 20:18:40 UTC (rev = 502) @@ -24,7 +24,8 @@ = import java.util.List; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; + import com.metamatrix.connector.object.ObjectProcedureExecution; = /** Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/ISourceTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/ISourceTranslator.java 2009-02-25 19:09:43 UTC (= rev 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/ISourceTranslator.java 2009-02-25 20:18:40 UTC (= rev 502) @@ -27,12 +27,13 @@ import java.util.List; import java.util.TimeZone; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = + /** * Specify source-specific behavior for translating results. */ Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/command/ObjectCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/command/ObjectCommand.java 2009-02-25 19:09:43 U= TC (rev 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/command/ObjectCommand.java 2009-02-25 20:18:40 U= TC (rev 502) @@ -22,11 +22,12 @@ = package com.metamatrix.connector.object.extension.command; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IMetadataReference; -import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IMetadataReference; +import org.teiid.connector.metadata.runtime.MetadataObject; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.object.extension.IObjectCommand; import com.metamatrix.connector.object.util.ObjectConnectorUtil; import com.metamatrix.core.util.ArgCheck; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/command/ProcedureCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/command/ProcedureCommand.java 2009-02-25 19:09:4= 3 UTC (rev 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/command/ProcedureCommand.java 2009-02-25 20:18:4= 0 UTC (rev 502) @@ -29,12 +29,13 @@ import java.util.List; import java.util.Map; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IParameter.Direction; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.object.ObjectPlugin; import com.metamatrix.connector.object.util.ObjectConnectorUtil; import com.metamatrix.core.MetaMatrixRuntimeException; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/source/BaseObjectSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BaseObjectSource.java 2009-02-25 19:09:43= UTC (rev 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BaseObjectSource.java 2009-02-25 20:18:40= UTC (rev 502) @@ -30,7 +30,8 @@ import java.util.Collections; import java.util.List; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; + import com.metamatrix.connector.object.ObjectSourceMethodManager; import com.metamatrix.connector.object.extension.IObjectCommand; import com.metamatrix.connector.object.extension.IObjectSource; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/source/BaseSourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BaseSourceConnectionFactory.java 2009-02-= 25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BaseSourceConnectionFactory.java 2009-02-= 25 20:18:40 UTC (rev 502) @@ -24,12 +24,13 @@ */ package com.metamatrix.connector.object.extension.source; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorIdentity; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.SingleIdentity; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.SingleIdentity; + import com.metamatrix.connector.object.ObjectConnection; import com.metamatrix.connector.object.SourceConnectionFactory; import com.metamatrix.connector.object.extension.IObjectSource; @@ -60,7 +61,7 @@ = = /** = - * @see com.metamatrix.data.pool.SourceConnectionFactory#createConnect= ion(com.metamatrix.connector.api.ConnectorIdentity) + * @see com.metamatrix.data.pool.SourceConnectionFactory#createConnect= ion(org.teiid.connector.api.ConnectorIdentity) * @since 4.3 */ public final Connection createConnection(ConnectorIdentity id) throws = ConnectorException { Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/source/BasicSourceTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BasicSourceTranslator.java 2009-02-25 19:= 09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/source/BasicSourceTranslator.java 2009-02-25 20:= 18:40 UTC (rev 502) @@ -28,13 +28,14 @@ import java.util.List; import java.util.TimeZone; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.api.ValueTranslator; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.api.ValueTranslator; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.object.ObjectPropertyNames; import com.metamatrix.connector.object.extension.IObjectCommand; import com.metamatrix.connector.object.extension.ISourceTranslator; @@ -98,7 +99,7 @@ } = = /** = - * @see com.metamatrix.connector.object.extension.ISourceTranslator#cr= eateObjectCommand(com.metamatrix.connector.metadata.runtime.RuntimeMetadata= , com.metamatrix.connector.language.IProcedure) + * @see com.metamatrix.connector.object.extension.ISourceTranslator#cr= eateObjectCommand(org.teiid.connector.metadata.runtime.RuntimeMetadata, org= .teiid.connector.language.IProcedure) * @since 4.3 */ public IObjectCommand createObjectCommand(RuntimeMetadata metadata, Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/value/BasicValueRetriever.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/value/BasicValueRetriever.java 2009-02-25 19:09:= 43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/value/BasicValueRetriever.java 2009-02-25 20:18:= 40 UTC (rev 502) @@ -33,7 +33,8 @@ import java.util.Map; import java.util.Properties; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; + import com.metamatrix.connector.object.ObjectSourceMethodManager; import com.metamatrix.connector.object.extension.IObjectCommand; import com.metamatrix.connector.object.extension.IValueRetriever; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/extension/value/JavaUtilDateValueTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/value/JavaUtilDateValueTranslator.java 2009-02-2= 5 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/extension/value/JavaUtilDateValueTranslator.java 2009-02-2= 5 20:18:40 UTC (rev 502) @@ -27,10 +27,11 @@ import java.sql.Timestamp; import java.util.Date; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ValueTranslator; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ValueTranslator; = + /** */ public class JavaUtilDateValueTranslator implements ValueTranslator { Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/util/ObjectConnectorUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/util/ObjectConnectorUtil.java 2009-02-25 19:09:43 UTC (rev= 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/util/ObjectConnectorUtil.java 2009-02-25 20:18:40 UTC (rev= 502) @@ -24,13 +24,14 @@ = import java.util.Properties; = -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IMetadataReference; -import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IMetadataReference; +import org.teiid.connector.metadata.runtime.MetadataObject; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.connector.object.ObjectPlugin; import com.metamatrix.connector.object.ObjectPropertyNames; import com.metamatrix.connector.object.SourceConnectionFactory; Modified: trunk/connectors/sandbox/connector-object/src/main/java/com/metam= atrix/connector/object/util/ObjectExecutionHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/util/ObjectExecutionHelper.java 2009-02-25 19:09:43 UTC (r= ev 501) +++ trunk/connectors/sandbox/connector-object/src/main/java/com/metamatrix/= connector/object/util/ObjectExecutionHelper.java 2009-02-25 20:18:40 UTC (r= ev 502) @@ -35,16 +35,17 @@ import java.util.List; import java.util.TimeZone; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.api.ValueTranslator; +import org.teiid.connector.basic.BasicValueTranslator; +import org.teiid.connector.visitor.util.SQLReservedWords; + import com.metamatrix.common.util.TimestampWithTimezone; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.api.ValueTranslator; -import com.metamatrix.connector.basic.BasicValueTranslator; import com.metamatrix.connector.object.ObjectPlugin; import com.metamatrix.connector.object.extension.IObjectCommand; import com.metamatrix.connector.object.extension.ISourceTranslator; -import com.metamatrix.connector.visitor.util.SQLReservedWords; import com.metamatrix.core.util.StringUtil; = /** Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java 2009-02-2= 5 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/FilterFunctionModifier.java 2009-02-2= 5 20:18:40 UTC (rev 502) @@ -25,9 +25,10 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; = + public class FilterFunctionModifier extends OracleSpatialFunctionModifier { = public IExpression modify(IFunction function) { Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier.java = 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/NearestNeighborFunctionModifier.java = 2009-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,10 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; = + public class NearestNeighborFunctionModifier extends OracleSpatialFunction= Modifier { = public IExpression modify(IFunction function) { Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java 2009-= 02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java 2009-= 02-25 20:18:40 UTC (rev 502) @@ -24,10 +24,11 @@ = import java.util.List; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; = = + /** = * @since 4.1 */ Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java 2009-02-2= 5 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialConnector.java 2009-02-2= 5 20:18:40 UTC (rev 502) @@ -28,11 +28,11 @@ */ package com.metamatrix.connector.jdbc.oracle.spatial; = +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; import org.teiid.connector.jdbc.JDBCConnector; = -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; = public class OracleSpatialConnector extends JDBCConnector { = Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java 20= 09-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialFunctionModifier.java 20= 09-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,9 @@ import java.util.List; = import org.teiid.connector.jdbc.translator.BasicFunctionModifier; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.ILiteral; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.ILiteral; = public class OracleSpatialFunctionModifier extends BasicFunctionModifier { = Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-= 02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/OracleSpatialSQLTranslator.java 2009-= 02-25 20:18:40 UTC (rev 502) @@ -26,19 +26,19 @@ import java.util.Iterator; import java.util.List; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.TypeFacility; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.visitor.util.CollectorVisitor; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.visitor.util.CollectorVisitor; = public class OracleSpatialSQLTranslator extends Translator { = Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java 2009-02-2= 5 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/RelateFunctionModifier.java 2009-02-2= 5 20:18:40 UTC (rev 502) @@ -25,9 +25,10 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; = + public class RelateFunctionModifier extends OracleSpatialFunctionModifier { = /** Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.java 2= 009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/WithinDistanceFunctionModifier.java 2= 009-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,10 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; = + public class WithinDistanceFunctionModifier extends OracleSpatialFunctionM= odifier { = public IExpression modify(IFunction function) { Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metama= trix/connector/yahoo/TickerCollectorVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/TickerCollectorVisitor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/TickerCollectorVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,10 +24,11 @@ = import java.util.*; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.*; -import com.metamatrix.connector.visitor.framework.HierarchyVisitor; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.*; +import org.teiid.connector.visitor.framework.HierarchyVisitor; = + /** */ public class TickerCollectorVisitor extends HierarchyVisitor { Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metama= trix/connector/yahoo/YahooCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooCapabilities.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooCapabilities.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,8 +25,9 @@ import java.util.Collections; import java.util.List; = -import com.metamatrix.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.basic.BasicConnectorCapabilities; = + /** * Specifies the capabilities of this connector. The Yahoo connector * supports only some basic criteria capability Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metama= trix/connector/yahoo/YahooConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooConnection.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooConnection.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,14 +22,14 @@ = package com.metamatrix.connector.yahoo; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = /** * Serves as a connection for the Yahoo connector. Since there is no actu= al Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metama= trix/connector/yahoo/YahooConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,8 +22,8 @@ = package com.metamatrix.connector.yahoo; = -import com.metamatrix.connector.api.*; -import com.metamatrix.connector.basic.BasicConnector; +import org.teiid.connector.api.*; +import org.teiid.connector.basic.BasicConnector; = public class YahooConnector extends BasicConnector { = Modified: trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metama= trix/connector/yahoo/YahooExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-yahoo/src/main/java/com/metamatrix/c= onnector/yahoo/YahooExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -39,21 +39,22 @@ import java.util.Set; import java.util.StringTokenizer; = -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = + /** * Represents the execution of a command. */ Modified: trunk/connectors/sandbox/connector-yahoo/src/test/java/com/metama= trix/connector/yahoo/TestYahooTranslation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-yahoo/src/test/java/com/metamatrix/c= onnector/yahoo/TestYahooTranslation.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/connectors/sandbox/connector-yahoo/src/test/java/com/metamatrix/c= onnector/yahoo/TestYahooTranslation.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,11 +22,12 @@ = package com.metamatrix.connector.yahoo; = +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IQuery; + import junit.framework.TestCase; = import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IQuery; = public class TestYahooTranslation extends TestCase { = Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services= /DefaultIndexConnectorBinding.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Defau= ltIndexConnectorBinding.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Defau= ltIndexConnectorBinding.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,12 +25,13 @@ import java.util.Date; import java.util.Properties; = +import org.teiid.connector.internal.ConnectorPropertyNames; + import com.metamatrix.common.config.api.ComponentTypeID; import com.metamatrix.common.config.api.ConfigurationID; import com.metamatrix.common.config.api.ConnectorBinding; import com.metamatrix.common.config.model.ConfigurationVisitor; import com.metamatrix.common.namedobject.BaseID; -import com.metamatrix.connector.internal.ConnectorPropertyNames; import com.metamatrix.core.MetaMatrixRuntimeException; = = Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services= /EmbeddedDataService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embed= dedDataService.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embed= dedDataService.java 2009-02-25 20:18:40 UTC (rev 502) @@ -32,6 +32,9 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.internal.ConnectorPropertyNames; + import com.metamatrix.api.exception.ComponentNotFoundException; import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.application.ApplicationEnvironment; @@ -48,8 +51,6 @@ import com.metamatrix.common.util.crypto.CryptoUtil; import com.metamatrix.common.vdb.api.VDBArchive; import com.metamatrix.common.vdb.api.VDBDefn; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.internal.ConnectorPropertyNames; import com.metamatrix.core.vdb.VDBStatus; import com.metamatrix.dqp.embedded.DQPEmbeddedPlugin; import com.metamatrix.dqp.embedded.configuration.ExtensionModuleReader; Modified: trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services= /EmbeddedTrackingService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embed= dedTrackingService.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/Embed= dedTrackingService.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,10 +24,11 @@ = import java.util.Properties; = +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.common.application.ApplicationEnvironment; import com.metamatrix.common.application.exception.ApplicationInitializati= onException; import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.dqp.service.TrackingService; import com.metamatrix.query.sql.lang.Command; = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/Ca= pabilitiesConverter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/Capabili= tiesConverter.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/Capabili= tiesConverter.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,7 +24,8 @@ = import java.util.*; = -import com.metamatrix.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorCapabilities; + import com.metamatrix.query.optimizer.capabilities.BasicSourceCapabilities; import com.metamatrix.query.optimizer.capabilities.SourceCapabilities; import com.metamatrix.query.optimizer.capabilities.SourceCapabilities.Capa= bility; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ConnectorEnvironmentImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorEnvironmentImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorEnvironmentImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,13 +28,14 @@ = import java.util.Properties; = +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.TypeFacility; +import org.teiid.connector.internal.ConnectorPropertyNames; +import org.teiid.connector.language.ILanguageFactory; + import com.metamatrix.common.application.ApplicationEnvironment; import com.metamatrix.common.queue.WorkerPool; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.TypeFacility; -import com.metamatrix.connector.internal.ConnectorPropertyNames; -import com.metamatrix.connector.language.ILanguageFactory; import com.metamatrix.dqp.internal.datamgr.language.LanguageFactoryImpl; = /** @@ -67,14 +68,14 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorEnvironment#getPropertie= s() + * @see org.teiid.connector.api.ConnectorEnvironment#getProperties() */ public Properties getProperties() { return this.properties; } = /** = - * @see com.metamatrix.connector.api.ConnectorEnvironment#getConnector= Name() = + * @see org.teiid.connector.api.ConnectorEnvironment#getConnectorName(= ) = */ public String getConnectorName() { return this.properties.getProperty(ConnectorPropertyNames.CONNECTO= R_BINDING_NAME); @@ -109,7 +110,7 @@ } = /** = - * @see com.metamatrix.connector.api.ConnectorEnvironment#getTypeFacil= ity() + * @see org.teiid.connector.api.ConnectorEnvironment#getTypeFacility() */ public TypeFacility getTypeFacility() { return TYPE_FACILITY; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ConnectorManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorManager.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorManager.java 2009-02-25 20:18:40 UTC (rev 502) @@ -41,6 +41,18 @@ = import javax.transaction.xa.XAResource; = +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.Connector; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ConnectorAnnotations.ConnectionPooling; +import org.teiid.connector.api.ConnectorAnnotations.SynchronousWorkers; +import org.teiid.connector.internal.ConnectorPropertyNames; +import org.teiid.connector.xa.api.XAConnection; +import org.teiid.connector.xa.api.XAConnector; + import com.metamatrix.common.application.ApplicationEnvironment; import com.metamatrix.common.application.ApplicationService; import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; @@ -50,17 +62,6 @@ import com.metamatrix.common.queue.WorkerPoolFactory; import com.metamatrix.common.queue.WorkerPoolStats; import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ConnectorAnnotations.ConnectionPooling; -import com.metamatrix.connector.api.ConnectorAnnotations.SynchronousWorker= s; -import com.metamatrix.connector.internal.ConnectorPropertyNames; -import com.metamatrix.connector.xa.api.XAConnection; -import com.metamatrix.connector.xa.api.XAConnector; import com.metamatrix.core.MetaMatrixCoreException; import com.metamatrix.core.util.Assertion; import com.metamatrix.core.util.ReflectionHelper; @@ -89,7 +90,7 @@ import com.metamatrix.query.sql.lang.Command; = /** - * The ConnectorManager manages a {@link com.metamatrix.conne= ctor.basic.BasicConnector Connector} + * The ConnectorManager manages a {@link org.teiid.connector.= basic.BasicConnector Connector} * and its associated workers' state. */ public class ConnectorManager implements ApplicationService { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ConnectorWorkItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWorkItem.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWorkItem.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,25 +26,26 @@ import java.util.Arrays; import java.util.List; = +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.Connector; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.Execution; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.api.UpdateExecution; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.xa.api.XAConnector; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.MetaMatrixProcessingException; import com.metamatrix.common.comm.api.ResultsReceiver; import com.metamatrix.common.comm.exception.CommunicationException; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.Execution; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.xa.api.XAConnector; import com.metamatrix.core.util.Assertion; import com.metamatrix.dqp.DQPPlugin; import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ConnectorWrapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWrapper.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Con= nectorWrapper.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,16 +22,16 @@ = package com.metamatrix.dqp.internal.datamgr.impl; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorIdentity; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.xa.api.TransactionContext; -import com.metamatrix.connector.xa.api.XAConnection; -import com.metamatrix.connector.xa.api.XAConnector; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.Connector; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.xa.api.TransactionContext; +import org.teiid.connector.xa.api.XAConnection; +import org.teiid.connector.xa.api.XAConnector; = /** * ConnectorWrapper adds default behavior to the wrapped connector. Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/DefaultConnectorLogger.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Def= aultConnectorLogger.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Def= aultConnectorLogger.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,8 +26,9 @@ */ package com.metamatrix.dqp.internal.datamgr.impl; = +import org.teiid.connector.api.ConnectorLogger; + import com.metamatrix.common.log.LogManager; -import com.metamatrix.connector.api.ConnectorLogger; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.dqp.internal.datamgr.ConnectorID; import com.metamatrix.dqp.util.LogConstants; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ExecutionContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Exe= cutionContextImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Exe= cutionContextImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,9 +27,10 @@ import java.util.LinkedList; import java.util.List; = +import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.common.buffer.impl.BufferConfig; -import com.metamatrix.connector.api.ConnectorIdentity; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.core.util.HashCodeUtil; = /** Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/ProcedureBatchHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Pro= cedureBatchHandler.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Pro= cedureBatchHandler.java 2009-02-25 20:18:40 UTC (rev 502) @@ -31,11 +31,12 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IParameter.Direction; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IParameter.Direction; + import com.metamatrix.dqp.DQPPlugin; = class ProcedureBatchHandler { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/SynchConnectorWorkItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Syn= chConnectorWorkItem.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Syn= chConnectorWorkItem.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,13 +28,14 @@ = import javax.transaction.xa.XAResource; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.xa.api.XAConnection; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.MetaMatrixProcessingException; import com.metamatrix.common.comm.api.ResultsReceiver; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.xa.XATransactionException; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.xa.api.XAConnection; import com.metamatrix.dqp.message.AtomicRequestMessage; import com.metamatrix.dqp.message.AtomicResultsMessage; import com.metamatrix.dqp.transaction.TransactionServer; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/im= pl/TypeFacilityImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Typ= eFacilityImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/impl/Typ= eFacilityImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,10 +26,11 @@ import java.util.Date; import java.util.TimeZone; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.TypeFacility; + import com.metamatrix.common.types.*; import com.metamatrix.common.util.TimestampWithTimezone; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.TypeFacility; = /** */ Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/AggregateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /AggregateImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /AggregateImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IAggregate; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class AggregateImpl extends BaseLanguageObject implements IAggregat= e { = @@ -41,28 +41,28 @@ } = /** - * @see com.metamatrix.connector.language.IAggregate#getName() + * @see org.teiid.connector.language.IAggregate#getName() */ public String getName() { return this.aggName; } = /** - * @see com.metamatrix.connector.language.IAggregate#isDistinct() + * @see org.teiid.connector.language.IAggregate#isDistinct() */ public boolean isDistinct() { return this.isDistinct; } = /** - * @see com.metamatrix.connector.language.IAggregate#getExpression() + * @see org.teiid.connector.language.IAggregate#getExpression() */ public IExpression getExpression() { return this.expression; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/BaseLanguageObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /BaseLanguageObject.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /BaseLanguageObject.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,8 +22,8 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.visitor.util.SQLStringVisitor; +import org.teiid.connector.language.ILanguageObject; +import org.teiid.connector.visitor.util.SQLStringVisitor; = /** */ Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/BatchedUpdatesImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /BatchedUpdatesImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /BatchedUpdatesImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,10 +24,11 @@ = import java.util.List; = -import com.metamatrix.connector.language.IBatchedUpdates; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IBatchedUpdates; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = = + /** = * @since 4.2 */ @@ -40,7 +41,7 @@ } = /** = - * @see com.metamatrix.connector.language.IBatchedUpdates#getUpdateCom= mands() + * @see org.teiid.connector.language.IBatchedUpdates#getUpdateCommands= () * @since 4.2 */ public List getUpdateCommands() { @@ -48,7 +49,7 @@ } = /** = - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.connector.visitor.framework.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(org= .teiid.connector.visitor.framework.LanguageObjectVisitor) * @since 4.2 */ public void acceptVisitor(LanguageObjectVisitor visitor) { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/BulkInsertImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /BulkInsertImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /BulkInsertImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,11 +25,12 @@ import java.util.Collections; import java.util.List; = -import com.metamatrix.connector.language.IBulkInsert; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IBulkInsert; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = = + /** * A simple variation of insert where multiple rows can be inserted as sin= gle * operation. @@ -47,7 +48,7 @@ } = /** - * @see com.metamatrix.connector.language.IBulkInsert#getRows() + * @see org.teiid.connector.language.IBulkInsert#getRows() */ public List getRows() { if (rowValues =3D=3D null) { @@ -65,20 +66,20 @@ } = /** - * @see com.metamatrix.connector.language.IInsert#getValues() + * @see org.teiid.connector.language.IInsert#getValues() */ public List getValues() { throw new UnsupportedOperationException("This operation is not sup= ported"); //$NON-NLS-1$ } /** - * @see com.metamatrix.connector.language.IInsert#setValues(java.util.= List) + * @see org.teiid.connector.language.IInsert#setValues(java.util.List) */ public void setValues(List values) { throw new UnsupportedOperationException("This operation is not sup= ported"); //$NON-NLS-1$ = } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/CompareCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /CompareCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /CompareCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class CompareCriteriaImpl extends BaseLanguageObject implements ICo= mpareCriteria { = @@ -38,21 +38,21 @@ this.operator =3D operator; } /** - * @see com.metamatrix.connector.language.ICompareCriteria#getLeftExpr= ession() + * @see org.teiid.connector.language.ICompareCriteria#getLeftExpressio= n() */ public IExpression getLeftExpression() { return leftExpression; } = /** - * @see com.metamatrix.connector.language.ICompareCriteria#getRightExp= ression() + * @see org.teiid.connector.language.ICompareCriteria#getRightExpressi= on() */ public IExpression getRightExpression() { return rightExpression; } = /** - * @see com.metamatrix.connector.language.ICompareCriteria#getOperator= () + * @see org.teiid.connector.language.ICompareCriteria#getOperator() */ public Operator getOperator() { return this.operator; @@ -80,7 +80,7 @@ } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/CompoundCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /CompoundCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /CompoundCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,9 +24,10 @@ = import java.util.List; = -import com.metamatrix.connector.language.ICompoundCriteria; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.ICompoundCriteria; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class CompoundCriteriaImpl extends BaseLanguageObject implements IC= ompoundCriteria { = private List criteria =3D null; @@ -38,21 +39,21 @@ } = /** - * @see com.metamatrix.connector.language.ICompoundCriteria#getOperato= r() + * @see org.teiid.connector.language.ICompoundCriteria#getOperator() */ public Operator getOperator() { return this.operator; } = /** - * @see com.metamatrix.connector.language.ICompoundCriteria#getCriteri= a() + * @see org.teiid.connector.language.ICompoundCriteria#getCriteria() */ public List getCriteria() { return criteria; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/DeleteImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /DeleteImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /DeleteImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,10 +22,10 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IDelete; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IDelete; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class DeleteImpl extends BaseLanguageObject implements IDelete { = @@ -37,21 +37,21 @@ this.criteria =3D criteria; } /** - * @see com.metamatrix.connector.language.IDelete#getGroup() + * @see org.teiid.connector.language.IDelete#getGroup() */ public IGroup getGroup() { return group; } = /** - * @see com.metamatrix.connector.language.IDelete#getCriteria() + * @see org.teiid.connector.language.IDelete#getCriteria() */ public ICriteria getCriteria() { return criteria; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/ElementImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ElementImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ElementImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,10 +22,10 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class ElementImpl extends BaseLanguageObject implements IElement { = @@ -42,14 +42,14 @@ } = /** - * @see com.metamatrix.connector.language.IElement#getName() + * @see org.teiid.connector.language.IElement#getName() */ public String getName() { return this.name; } = /** - * @see com.metamatrix.connector.language.IElement#getGroup() + * @see org.teiid.connector.language.IElement#getGroup() */ public IGroup getGroup() { return group; @@ -65,7 +65,7 @@ } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/ExistsCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ExistsCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ExistsCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,10 +22,10 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IExistsCriteria; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IExistsCriteria; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = /** */ Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/FromImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /FromImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /FromImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,9 +24,10 @@ = import java.util.List; = -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IFrom; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class FromImpl extends BaseLanguageObject implements IFrom { = private List items =3D null; @@ -36,14 +37,14 @@ } = /** - * @see com.metamatrix.connector.language.IFrom#getItems() + * @see org.teiid.connector.language.IFrom#getItems() */ public List getItems() { return items; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/FunctionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /FunctionImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /FunctionImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,10 +25,11 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class FunctionImpl extends BaseLanguageObject implements IFunction { = private String name; @@ -46,21 +47,21 @@ } = /** - * @see com.metamatrix.connector.language.IFunction#getName() + * @see org.teiid.connector.language.IFunction#getName() */ public String getName() { return this.name; } = /** - * @see com.metamatrix.connector.language.IFunction#getParameters() + * @see org.teiid.connector.language.IFunction#getParameters() */ public List getParameters() { return parameters; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/GroupByImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /GroupByImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /GroupByImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,9 +24,10 @@ = import java.util.List; = -import com.metamatrix.connector.language.IGroupBy; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IGroupBy; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class GroupByImpl extends BaseLanguageObject implements IGroupBy { = private List elements =3D null; @@ -36,14 +37,14 @@ } = /** - * @see com.metamatrix.connector.language.IGroupBy#getElements() + * @see org.teiid.connector.language.IGroupBy#getElements() */ public List getElements() { return elements; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/GroupImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /GroupImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /GroupImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,10 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.metadata.runtime.Group; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; + import com.metamatrix.core.util.HashCodeUtil; import com.metamatrix.metadata.runtime.api.MetadataID; = @@ -41,14 +42,14 @@ } = /** - * @see com.metamatrix.connector.language.IGroup#getContext() + * @see org.teiid.connector.language.IGroup#getContext() */ public String getContext() { return context; } = /** - * @see com.metamatrix.connector.language.IGroup#getDefinition() + * @see org.teiid.connector.language.IGroup#getDefinition() */ public String getDefinition() { return this.definition; @@ -64,7 +65,7 @@ } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/InCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /InCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /InCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,10 +24,11 @@ = import java.util.List; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class InCriteriaImpl extends BaseLanguageObject implements IInCrite= ria { = private IExpression leftExpression =3D null; @@ -40,28 +41,28 @@ this.negated =3D negated; } /** - * @see com.metamatrix.connector.language.IInCriteria#getLeftExpressio= n() + * @see org.teiid.connector.language.IInCriteria#getLeftExpression() */ public IExpression getLeftExpression() { return leftExpression; } = /** - * @see com.metamatrix.connector.language.IInCriteria#getRightExpressi= ons() + * @see org.teiid.connector.language.IInCriteria#getRightExpressions() */ public List getRightExpressions() { return rightExpressions; } = /** - * @see com.metamatrix.connector.language.IInCriteria#isNegated() + * @see org.teiid.connector.language.IInCriteria#isNegated() */ public boolean isNegated() { return this.negated; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/InlineViewImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /InlineViewImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /InlineViewImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IInlineView; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IInlineView; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = /** * Inline views are treated like aliased groups Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/InsertImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /InsertImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /InsertImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,10 +24,11 @@ = import java.util.List; = -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class InsertImpl extends BaseLanguageObject implements IInsert { = private IGroup group =3D null; @@ -40,28 +41,28 @@ this.values =3D values; } /** - * @see com.metamatrix.connector.language.IInsert#getGroup() + * @see org.teiid.connector.language.IInsert#getGroup() */ public IGroup getGroup() { return group; } = /** - * @see com.metamatrix.connector.language.IInsert#getElements() + * @see org.teiid.connector.language.IInsert#getElements() */ public List getElements() { return elements; } = /** - * @see com.metamatrix.connector.language.IInsert#getValues() + * @see org.teiid.connector.language.IInsert#getValues() */ public List getValues() { return values; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/IsNullCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /IsNullCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /IsNullCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IIsNullCriteria; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IIsNullCriteria; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class IsNullCriteriaImpl extends BaseLanguageObject implements IIsN= ullCriteria { = @@ -37,21 +37,21 @@ } = /** - * @see com.metamatrix.connector.language.IIsNullCriteria#getExpressio= n() + * @see org.teiid.connector.language.IIsNullCriteria#getExpression() */ public IExpression getExpression() { return expression; } = /** - * @see com.metamatrix.connector.language.IIsNullCriteria#isNegated() + * @see org.teiid.connector.language.IIsNullCriteria#isNegated() */ public boolean isNegated() { return this.negated; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/JoinImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /JoinImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /JoinImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,10 +24,11 @@ = import java.util.List; = -import com.metamatrix.connector.language.IFromItem; -import com.metamatrix.connector.language.IJoin; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IFromItem; +import org.teiid.connector.language.IJoin; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class JoinImpl extends BaseLanguageObject implements IJoin { = private IFromItem leftItem =3D null; @@ -42,35 +43,35 @@ this.criteria =3D criteria; } /** - * @see com.metamatrix.connector.language.IJoin#getLeftItem() + * @see org.teiid.connector.language.IJoin#getLeftItem() */ public IFromItem getLeftItem() { return leftItem; } = /** - * @see com.metamatrix.connector.language.IJoin#getRightItem() + * @see org.teiid.connector.language.IJoin#getRightItem() */ public IFromItem getRightItem() { return rightItem; } = /** - * @see com.metamatrix.connector.language.IJoin#getJoinType() + * @see org.teiid.connector.language.IJoin#getJoinType() */ public JoinType getJoinType() { return this.joinType; } = /** - * @see com.metamatrix.connector.language.IJoin#getCriteria() + * @see org.teiid.connector.language.IJoin#getCriteria() */ public List getCriteria() { return criteria; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/LanguageBridgeFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageBridgeFactory.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageBridgeFactory.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,51 +26,52 @@ import java.util.Iterator; import java.util.List; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.language.IAggregate; +import org.teiid.connector.language.IBatchedUpdates; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICompoundCriteria; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IDelete; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExistsCriteria; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFrom; +import org.teiid.connector.language.IFromItem; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IGroupBy; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.IIsNullCriteria; +import org.teiid.connector.language.IJoin; +import org.teiid.connector.language.ILikeCriteria; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.INotCriteria; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.language.IOrderByItem; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.language.ISearchedCaseExpression; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISetClause; +import org.teiid.connector.language.ISetClauseList; +import org.teiid.connector.language.ISetQuery; +import org.teiid.connector.language.ISubqueryCompareCriteria; +import org.teiid.connector.language.ISubqueryInCriteria; +import org.teiid.connector.language.IUpdate; +import org.teiid.connector.language.ICompareCriteria.Operator; +import org.teiid.connector.language.IParameter.Direction; +import org.teiid.connector.language.ISubqueryCompareCriteria.Quantifier; +import org.teiid.connector.metadata.runtime.Parameter; +import org.teiid.connector.metadata.runtime.Procedure; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.log.LogManager; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.IBatchedUpdates; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICompoundCriteria; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IDelete; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExistsCriteria; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.language.IFromItem; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IGroupBy; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.IIsNullCriteria; -import com.metamatrix.connector.language.IJoin; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.INotCriteria; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.IOrderByItem; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.language.ISearchedCaseExpression; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISetClause; -import com.metamatrix.connector.language.ISetClauseList; -import com.metamatrix.connector.language.ISetQuery; -import com.metamatrix.connector.language.ISubqueryCompareCriteria; -import com.metamatrix.connector.language.ISubqueryInCriteria; -import com.metamatrix.connector.language.IUpdate; -import com.metamatrix.connector.language.ICompareCriteria.Operator; -import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.language.ISubqueryCompareCriteria.Quantifi= er; -import com.metamatrix.connector.metadata.runtime.Parameter; -import com.metamatrix.connector.metadata.runtime.Procedure; import com.metamatrix.dqp.DQPPlugin; import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.dqp.message.ParameterInfo; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/LanguageFactoryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageFactoryImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LanguageFactoryImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,51 +25,52 @@ import java.util.Arrays; import java.util.List; = -import com.metamatrix.connector.language.IAggregate; -import com.metamatrix.connector.language.IBulkInsert; -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ICompoundCriteria; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IDelete; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExistsCriteria; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.language.IFromItem; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IGroupBy; -import com.metamatrix.connector.language.IInCriteria; -import com.metamatrix.connector.language.IInlineView; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.IIsNullCriteria; -import com.metamatrix.connector.language.IJoin; -import com.metamatrix.connector.language.ILanguageFactory; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.language.INotCriteria; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.IOrderByItem; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.language.IScalarSubquery; -import com.metamatrix.connector.language.ISearchedCaseExpression; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.language.ISetClause; -import com.metamatrix.connector.language.ISetClauseList; -import com.metamatrix.connector.language.ISetQuery; -import com.metamatrix.connector.language.ISubqueryCompareCriteria; -import com.metamatrix.connector.language.ISubqueryInCriteria; -import com.metamatrix.connector.language.IUpdate; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.Parameter; -import com.metamatrix.connector.metadata.runtime.Procedure; +import org.teiid.connector.language.IAggregate; +import org.teiid.connector.language.IBulkInsert; +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ICompoundCriteria; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IDelete; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExistsCriteria; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFrom; +import org.teiid.connector.language.IFromItem; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IGroupBy; +import org.teiid.connector.language.IInCriteria; +import org.teiid.connector.language.IInlineView; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.IIsNullCriteria; +import org.teiid.connector.language.IJoin; +import org.teiid.connector.language.ILanguageFactory; +import org.teiid.connector.language.ILikeCriteria; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.language.INotCriteria; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.language.IOrderByItem; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.language.IScalarSubquery; +import org.teiid.connector.language.ISearchedCaseExpression; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.language.ISetClause; +import org.teiid.connector.language.ISetClauseList; +import org.teiid.connector.language.ISetQuery; +import org.teiid.connector.language.ISubqueryCompareCriteria; +import org.teiid.connector.language.ISubqueryInCriteria; +import org.teiid.connector.language.IUpdate; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Group; +import org.teiid.connector.metadata.runtime.Parameter; +import org.teiid.connector.metadata.runtime.Procedure; = + /** */ public class LanguageFactoryImpl implements ILanguageFactory { @@ -175,7 +176,7 @@ } = /** - * @see com.metamatrix.connector.language.ILanguageFactory#createBulkI= nsert(com.metamatrix.connector.language.IGroup, java.util.List, java.util.L= ist) + * @see org.teiid.connector.language.ILanguageFactory#createBulkInsert= (org.teiid.connector.language.IGroup, java.util.List, java.util.List) */ public IBulkInsert createBulkInsert(IGroup group, List columns, List r= ows) { return new BulkInsertImpl(group, columns, rows); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/LikeCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LikeCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LikeCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.ILikeCriteria; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.ILikeCriteria; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class LikeCriteriaImpl extends BaseLanguageObject implements ILikeC= riteria { = @@ -42,35 +42,35 @@ } = /** - * @see com.metamatrix.connector.language.ILikeCriteria#getLeftExpress= ion() + * @see org.teiid.connector.language.ILikeCriteria#getLeftExpression() */ public IExpression getLeftExpression() { return leftExpression; } = /** - * @see com.metamatrix.connector.language.ILikeCriteria#getRightExpres= sion() + * @see org.teiid.connector.language.ILikeCriteria#getRightExpression() */ public IExpression getRightExpression() { return rightExpression; } = /** - * @see com.metamatrix.connector.language.ILikeCriteria#getEscapeChara= cter() + * @see org.teiid.connector.language.ILikeCriteria#getEscapeCharacter() */ public Character getEscapeCharacter() { return this.escapeCharacter; } = /** - * @see com.metamatrix.connector.language.ILikeCriteria#isNegated() + * @see org.teiid.connector.language.ILikeCriteria#isNegated() */ public boolean isNegated() { return this.isNegated; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/LimitImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LimitImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LimitImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,8 +22,8 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = = /** = @@ -39,7 +39,7 @@ this.rowLimit =3D rowLimit; } /** = - * @see com.metamatrix.connector.language.ILimit#getRowLimit() + * @see org.teiid.connector.language.ILimit#getRowLimit() * @since 4.3 */ public int getRowLimit() { @@ -47,7 +47,7 @@ } = /** = - * @see com.metamatrix.connector.language.ILimit#getRowOffset() + * @see org.teiid.connector.language.ILimit#getRowOffset() * @since 4.3 */ public int getRowOffset() { @@ -55,7 +55,7 @@ } = /** = - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.connector.visitor.framework.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(org= .teiid.connector.visitor.framework.LanguageObjectVisitor) * @since 4.3 */ public void acceptVisitor(LanguageObjectVisitor visitor) { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/LiteralImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LiteralImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /LiteralImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,8 +22,8 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.ILiteral; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.ILiteral; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class LiteralImpl extends BaseLanguageObject implements ILiteral { = @@ -37,14 +37,14 @@ } = /** - * @see com.metamatrix.connector.language.ILiteral#getValue() + * @see org.teiid.connector.language.ILiteral#getValue() */ public Object getValue() { return this.value; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); @@ -72,14 +72,14 @@ } = /** = - * @see com.metamatrix.connector.language.ILiteral#isBindValue() + * @see org.teiid.connector.language.ILiteral#isBindValue() */ public boolean isBindValue() { return bindValue; } = /** = - * @see com.metamatrix.connector.language.ILiteral#setBindValue(boolea= n) + * @see org.teiid.connector.language.ILiteral#setBindValue(boolean) */ public void setBindValue(boolean bindValue) { this.bindValue =3D bindValue; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/NotCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /NotCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /NotCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.INotCriteria; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.INotCriteria; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class NotCriteriaImpl extends BaseLanguageObject implements INotCri= teria { = @@ -34,14 +34,14 @@ this.criteria =3D criteria; } /** - * @see com.metamatrix.connector.language.INotCriteria#getCriteria() + * @see org.teiid.connector.language.INotCriteria#getCriteria() */ public ICriteria getCriteria() { return criteria; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/OrderByImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /OrderByImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /OrderByImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,9 +24,10 @@ = import java.util.List; = -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class OrderByImpl extends BaseLanguageObject implements IOrderBy { = private List items =3D null; @@ -36,14 +37,14 @@ } = /** - * @see com.metamatrix.connector.language.IOrderBy#getItems() + * @see org.teiid.connector.language.IOrderBy#getItems() */ public List getItems() { return items; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/OrderByItemImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /OrderByItemImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /OrderByItemImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IOrderByItem; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IOrderByItem; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class OrderByItemImpl extends BaseLanguageObject implements IOrderB= yItem { = @@ -39,21 +39,21 @@ } = /** - * @see com.metamatrix.connector.language.IOrderByItem#getName() + * @see org.teiid.connector.language.IOrderByItem#getName() */ public String getName() { return this.name; } = /** - * @see com.metamatrix.connector.language.IOrderByItem#getDirection() + * @see org.teiid.connector.language.IOrderByItem#getDirection() */ public boolean getDirection() { return direction; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/ParameterImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ParameterImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ParameterImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.metadata.runtime.Parameter; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.metadata.runtime.Parameter; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class ParameterImpl extends BaseLanguageObject implements IParamete= r { = @@ -44,21 +44,21 @@ } = /** - * @see com.metamatrix.connector.language.IParameter#getIndex() + * @see org.teiid.connector.language.IParameter#getIndex() */ public int getIndex() { return this.index; } = /** - * @see com.metamatrix.connector.language.IParameter#getDirection() + * @see org.teiid.connector.language.IParameter#getDirection() */ public Direction getDirection() { return this.direction; } = /** - * @see com.metamatrix.connector.language.IParameter#getType() + * @see org.teiid.connector.language.IParameter#getType() */ public Class getType() { return this.type; @@ -72,7 +72,7 @@ } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); @@ -119,7 +119,7 @@ } = /** = - * @see com.metamatrix.connector.language.IParameter#getValueSpecified= () + * @see org.teiid.connector.language.IParameter#getValueSpecified() * @since 4.3.2 */ public boolean getValueSpecified() { @@ -127,7 +127,7 @@ } = /** = - * @see com.metamatrix.connector.language.IParameter#setValueSpecified= (boolean) + * @see org.teiid.connector.language.IParameter#setValueSpecified(bool= ean) * @since 4.3.2 */ public void setValueSpecified(boolean specified) { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/ProcedureImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ProcedureImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ProcedureImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,11 +24,12 @@ = import java.util.List; = -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.metadata.runtime.Procedure; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.metadata.runtime.Procedure; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class ProcedureImpl extends BaseLanguageObject implements IProcedur= e { = private String name; @@ -56,7 +57,7 @@ } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/QueryCommandImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /QueryCommandImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /QueryCommandImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,24 +25,25 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.language.ILimit; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.ISelectSymbol; +import org.teiid.connector.language.ILimit; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.language.ISelectSymbol; = -public abstract class QueryCommandImpl extends BaseLanguageObject implemen= ts com.metamatrix.connector.language.IQueryCommand { = +public abstract class QueryCommandImpl extends BaseLanguageObject implemen= ts org.teiid.connector.language.IQueryCommand { + private IOrderBy orderBy =3D null; private ILimit limit =3D null; = /** - * @see com.metamatrix.connector.language.IQuery#getOrderBy() + * @see org.teiid.connector.language.IQuery#getOrderBy() */ public IOrderBy getOrderBy() { return orderBy; } = /** - * @see com.metamatrix.connector.language.IQuery#getLimit() + * @see org.teiid.connector.language.IQuery#getLimit() */ public ILimit getLimit() { return limit; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/QueryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /QueryImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /QueryImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,15 +25,16 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IFrom; -import com.metamatrix.connector.language.IGroupBy; -import com.metamatrix.connector.language.IOrderBy; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IFrom; +import org.teiid.connector.language.IGroupBy; +import org.teiid.connector.language.IOrderBy; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class QueryImpl extends QueryCommandImpl implements IQuery { = private ISelect select =3D null; @@ -52,35 +53,35 @@ this.setOrderBy(orderBy); } /** - * @see com.metamatrix.connector.language.IQuery#getSelect() + * @see org.teiid.connector.language.IQuery#getSelect() */ public ISelect getSelect() { return select; } = /** - * @see com.metamatrix.connector.language.IQuery#getFrom() + * @see org.teiid.connector.language.IQuery#getFrom() */ public IFrom getFrom() { return from; } = /** - * @see com.metamatrix.connector.language.IQuery#getWhere() + * @see org.teiid.connector.language.IQuery#getWhere() */ public ICriteria getWhere() { return where; } = /** - * @see com.metamatrix.connector.language.IQuery#getGroupBy() + * @see org.teiid.connector.language.IQuery#getGroupBy() */ public IGroupBy getGroupBy() { return groupBy; } = /** - * @see com.metamatrix.connector.language.IQuery#getHaving() + * @see org.teiid.connector.language.IQuery#getHaving() */ public ICriteria getHaving() { return having; @@ -112,7 +113,7 @@ } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/ScalarSubqueryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ScalarSubqueryImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /ScalarSubqueryImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.language.IScalarSubquery; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.language.IScalarSubquery; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = /** */ Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/SearchedCaseExpressionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SearchedCaseExpressionImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SearchedCaseExpressionImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,11 +24,12 @@ = import java.util.List; = -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.ISearchedCaseExpression; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.ISearchedCaseExpression; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class SearchedCaseExpressionImpl extends BaseLanguageObject impleme= nts ISearchedCaseExpression { = private List whenExpressions; @@ -43,35 +44,35 @@ this.type =3D type; } /** - * @see com.metamatrix.connector.language.ISearchedCaseExpression#getE= lseExpression() + * @see org.teiid.connector.language.ISearchedCaseExpression#getElseEx= pression() */ public IExpression getElseExpression() { return elseExpression; } = /** - * @see com.metamatrix.connector.language.ISearchedCaseExpression#getT= henExpression(int) + * @see org.teiid.connector.language.ISearchedCaseExpression#getThenEx= pression(int) */ public IExpression getThenExpression(int index) { return (IExpression)thenExpressions.get(index); } = /** - * @see com.metamatrix.connector.language.ISearchedCaseExpression#getW= henCount() + * @see org.teiid.connector.language.ISearchedCaseExpression#getWhenCo= unt() */ public int getWhenCount() { return whenExpressions.size(); } = /** - * @see com.metamatrix.connector.language.ISearchedCaseExpression#getW= henCriteria(int) + * @see org.teiid.connector.language.ISearchedCaseExpression#getWhenCr= iteria(int) */ public ICriteria getWhenCriteria(int index) { return (ICriteria)whenExpressions.get(index); } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/SelectImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SelectImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SelectImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,9 +24,10 @@ = import java.util.List; = -import com.metamatrix.connector.language.ISelect; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.ISelect; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class SelectImpl extends BaseLanguageObject implements ISelect { = private List selectSymbols =3D null; @@ -38,21 +39,21 @@ } = /** - * @see com.metamatrix.connector.language.ISelect#getSelectSymbols() + * @see org.teiid.connector.language.ISelect#getSelectSymbols() */ public List getSelectSymbols() { return selectSymbols; } = /** - * @see com.metamatrix.connector.language.ISelect#isDistinct() + * @see org.teiid.connector.language.ISelect#isDistinct() */ public boolean isDistinct() { return this.isDistinct; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/SelectSymbolImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SelectSymbolImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SelectSymbolImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class SelectSymbolImpl extends BaseLanguageObject implements ISelec= tSymbol { = @@ -37,7 +37,7 @@ this.expression =3D expression; } /** - * @see com.metamatrix.connector.language.ISelectSymbol#hasAlias() + * @see org.teiid.connector.language.ISelectSymbol#hasAlias() */ public boolean hasAlias() { return hasAlias; @@ -48,21 +48,21 @@ } = /** - * @see com.metamatrix.connector.language.ISelectSymbol#getOutputName() + * @see org.teiid.connector.language.ISelectSymbol#getOutputName() */ public String getOutputName() { return name; } = /** - * @see com.metamatrix.connector.language.ISelectSymbol#getExpression() + * @see org.teiid.connector.language.ISelectSymbol#getExpression() */ public IExpression getExpression() { return expression; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/SetClauseImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SetClauseImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SetClauseImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,10 +22,10 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.ISetClause; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.ISetClause; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class SetClauseImpl implements ISetClause { = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/SetClauseListImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SetClauseListImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SetClauseListImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,10 +25,11 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.language.ISetClause; -import com.metamatrix.connector.language.ISetClauseList; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.ISetClause; +import org.teiid.connector.language.ISetClauseList; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = + public class SetClauseListImpl implements ISetClauseList { = private List clauses; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/SetQueryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SetQueryImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SetQueryImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,11 +22,11 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = -public class SetQueryImpl extends QueryCommandImpl implements com.metamatr= ix.connector.language.ISetQuery { +public class SetQueryImpl extends QueryCommandImpl implements org.teiid.co= nnector.language.ISetQuery { = private boolean all; private IQueryCommand leftQuery; @@ -44,63 +44,63 @@ } = /** = - * @see com.metamatrix.connector.language.ISetQuery#getLeftQuery() + * @see org.teiid.connector.language.ISetQuery#getLeftQuery() */ public IQueryCommand getLeftQuery() { return leftQuery; } = /** = - * @see com.metamatrix.connector.language.ISetQuery#getOperation() + * @see org.teiid.connector.language.ISetQuery#getOperation() */ public Operation getOperation() { return operation; } = /** = - * @see com.metamatrix.connector.language.ISetQuery#getRightQuery() + * @see org.teiid.connector.language.ISetQuery#getRightQuery() */ public IQueryCommand getRightQuery() { return rightQuery; } = /** = - * @see com.metamatrix.connector.language.ISetQuery#isAll() + * @see org.teiid.connector.language.ISetQuery#isAll() */ public boolean isAll() { return all; } = /** = - * @see com.metamatrix.connector.language.ISetQuery#setAll(boolean) + * @see org.teiid.connector.language.ISetQuery#setAll(boolean) */ public void setAll(boolean all) { this.all =3D all; } = /** = - * @see com.metamatrix.connector.language.ISetQuery#setLeftQuery(com.m= etamatrix.connector.language.IQueryCommand) + * @see org.teiid.connector.language.ISetQuery#setLeftQuery(org.teiid.= connector.language.IQueryCommand) */ public void setLeftQuery(IQueryCommand leftQuery) { this.leftQuery =3D leftQuery; } = /** = - * @see com.metamatrix.connector.language.ISetQuery#setOperation(com.m= etamatrix.connector.language.ISetQuery.Operation) + * @see org.teiid.connector.language.ISetQuery#setOperation(org.teiid.= connector.language.ISetQuery.Operation) */ public void setOperation(Operation operation) { this.operation =3D operation; } = /** = - * @see com.metamatrix.connector.language.ISetQuery#setRightQuery(com.= metamatrix.connector.language.IQueryCommand) + * @see org.teiid.connector.language.ISetQuery#setRightQuery(org.teiid= .connector.language.IQueryCommand) */ public void setRightQuery(IQueryCommand rightQuery) { this.rightQuery =3D rightQuery; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/SubqueryCompareCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SubqueryCompareCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SubqueryCompareCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,9 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.*; -import com.metamatrix.connector.language.ICompareCriteria.Operator; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.*; +import org.teiid.connector.language.ICompareCriteria.Operator; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = /** */ Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/SubqueryInCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SubqueryInCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /SubqueryInCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,8 +22,8 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.*; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.*; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = /** */ Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/UpdateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /UpdateImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /UpdateImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,11 +22,11 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.ISetClauseList; -import com.metamatrix.connector.language.IUpdate; -import com.metamatrix.connector.visitor.framework.LanguageObjectVisitor; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.ISetClauseList; +import org.teiid.connector.language.IUpdate; +import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = public class UpdateImpl extends BaseLanguageObject implements IUpdate { = @@ -41,28 +41,28 @@ } = /** - * @see com.metamatrix.connector.language.IUpdate#getGroup() + * @see org.teiid.connector.language.IUpdate#getGroup() */ public IGroup getGroup() { return group; } = /** - * @see com.metamatrix.connector.language.IUpdate#getChanges() + * @see org.teiid.connector.language.IUpdate#getChanges() */ public ISetClauseList getChanges() { return changes; } = /** - * @see com.metamatrix.connector.language.IUpdate#getCriteria() + * @see org.teiid.connector.language.IUpdate#getCriteria() */ public ICriteria getCriteria() { return criteria; } = /** - * @see com.metamatrix.connector.language.ILanguageObject#acceptVisito= r(com.metamatrix.data.visitor.LanguageObjectVisitor) + * @see org.teiid.connector.language.ILanguageObject#acceptVisitor(com= .metamatrix.data.visitor.LanguageObjectVisitor) */ public void acceptVisitor(LanguageObjectVisitor visitor) { visitor.visit(this); Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/ElementImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ElementImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ElementImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,12 +24,13 @@ */ package com.metamatrix.dqp.internal.datamgr.metadata; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Group; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.Group; import com.metamatrix.query.metadata.SupportConstants; = /** Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/GroupImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /GroupImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /GroupImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,11 +27,12 @@ import java.util.ArrayList; import java.util.List; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Group; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.Group; = /** */ Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/MetadataObjectImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataObjectImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /MetadataObjectImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,10 +26,11 @@ = import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.metadata.runtime.MetadataObject; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.MetadataObject; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.query.metadata.QueryMetadataInterface; = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/ParameterImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ParameterImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ParameterImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,12 +26,13 @@ import java.util.Collections; import java.util.List; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Parameter; +import org.teiid.connector.metadata.runtime.Procedure; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.Parameter; -import com.metamatrix.connector.metadata.runtime.Procedure; import com.metamatrix.dqp.DQPPlugin; import com.metamatrix.dqp.message.ParameterInfo; import com.metamatrix.query.metadata.SupportConstants; @@ -90,7 +91,7 @@ } = /** = - * @see com.metamatrix.connector.metadata.runtime.TypeModel#getNullabi= lity() + * @see org.teiid.connector.metadata.runtime.TypeModel#getNullability() * @since 4.3 */ public int getNullability() throws ConnectorException { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/ProcedureImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ProcedureImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /ProcedureImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,8 +27,9 @@ import java.util.ArrayList; import java.util.List; = -import com.metamatrix.connector.metadata.runtime.Parameter; -import com.metamatrix.connector.metadata.runtime.Procedure; +import org.teiid.connector.metadata.runtime.Parameter; +import org.teiid.connector.metadata.runtime.Procedure; + import com.metamatrix.query.metadata.StoredProcedureInfo; import com.metamatrix.query.sql.lang.SPParameter; = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/RuntimeMetadataImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /RuntimeMetadataImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /RuntimeMetadataImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,10 +24,11 @@ */ package com.metamatrix.dqp.internal.datamgr.metadata; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.metadata.runtime.*; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.*; import com.metamatrix.core.util.ArgCheck; import com.metamatrix.query.metadata.QueryMetadataInterface; import com.metamatrix.query.metadata.StoredProcedureInfo; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/me= tadata/TypeModelImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /TypeModelImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/metadata= /TypeModelImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,11 +22,12 @@ = package com.metamatrix.dqp.internal.datamgr.metadata; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.TypeModel; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.TypeModel; import com.metamatrix.query.metadata.SupportConstants; = = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/co= nnector/ConnectionPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionPool.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionPool.java 2009-02-25 20:18:40 UTC (rev 502) @@ -37,16 +37,17 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; = +import org.teiid.connector.DataPlugin; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.SingleIdentity; +import org.teiid.connector.xa.api.TransactionContext; +import org.teiid.connector.xa.api.XAConnector; + import com.metamatrix.common.log.LogManager; import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.connector.DataPlugin; -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorIdentity; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.SingleIdentity; -import com.metamatrix.connector.xa.api.TransactionContext; -import com.metamatrix.connector.xa.api.XAConnector; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.core.util.ArgCheck; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorWrapper; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/co= nnector/ConnectionPoolException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionPoolException.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionPoolException.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,7 +24,7 @@ */ package com.metamatrix.dqp.internal.pooling.connector; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; = /** * This class is for exceptions occurring within the connection pool. Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/co= nnector/ConnectionWrapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionWrapper.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/ConnectionWrapper.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,16 +24,17 @@ = import javax.transaction.xa.XAResource; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorIdentity; -import com.metamatrix.connector.api.Execution; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.xa.api.XAConnection; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.Execution; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.xa.api.XAConnection; = + public class ConnectionWrapper implements XAConnection { = private Connection connection; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/co= nnector/PooledConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/PooledConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/pooling/connecto= r/PooledConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -31,14 +31,15 @@ import javax.transaction.Synchronization; import javax.transaction.SystemException; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.xa.api.TransactionContext; -import com.metamatrix.connector.xa.api.XAConnection; -import com.metamatrix.connector.xa.api.XAConnector; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.Connector; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.xa.api.TransactionContext; +import org.teiid.connector.xa.api.XAConnection; +import org.teiid.connector.xa.api.XAConnector; + import com.metamatrix.dqp.internal.datamgr.impl.ConnectorWrapper; = /** Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Re= quest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.= java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.= java 2009-02-25 20:18:40 UTC (rev 502) @@ -33,6 +33,8 @@ = import javax.transaction.SystemException; = +import org.teiid.connector.xa.api.TransactionContext; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.MetaMatrixProcessingException; import com.metamatrix.api.exception.query.QueryMetadataException; @@ -47,7 +49,6 @@ import com.metamatrix.common.log.LogManager; import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.common.xa.XATransactionException; -import com.metamatrix.connector.xa.api.TransactionContext; import com.metamatrix.core.id.IDGenerator; import com.metamatrix.core.id.IntegerIDFactory; import com.metamatrix.core.util.Assertion; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Re= questWorkItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestW= orkItem.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestW= orkItem.java 2009-02-25 20:18:40 UTC (rev 502) @@ -35,6 +35,8 @@ import javax.transaction.InvalidTransactionException; import javax.transaction.SystemException; = +import org.teiid.connector.xa.api.TransactionContext; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.MetaMatrixException; import com.metamatrix.api.exception.MetaMatrixProcessingException; @@ -52,7 +54,6 @@ import com.metamatrix.common.log.LogManager; import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.common.xa.XATransactionException; -import com.metamatrix.connector.xa.api.TransactionContext; import com.metamatrix.core.MetaMatrixCoreException; import com.metamatrix.core.log.MessageLevel; import com.metamatrix.core.util.Assertion; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/transactio= n/TransactionContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Tran= sactionContextImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Tran= sactionContextImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -33,8 +33,9 @@ import javax.transaction.Transaction; import javax.transaction.xa.XAResource; = +import org.teiid.connector.xa.api.TransactionContext; + import com.metamatrix.common.xa.MMXid; -import com.metamatrix.connector.xa.api.TransactionContext; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.dqp.DQPPlugin; = @@ -121,7 +122,7 @@ } = /** = - * @see com.metamatrix.connector.xa.api.TransactionContext#getTransact= ionTimeout() + * @see org.teiid.connector.xa.api.TransactionContext#getTransactionTi= meout() */ int getTransactionTimeout() { return this.transactionTimeout; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/transactio= n/TransactionProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Tran= sactionProvider.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Tran= sactionProvider.java 2009-02-25 20:18:40 UTC (rev 502) @@ -31,9 +31,10 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; = +import org.teiid.connector.xa.api.XAConnection; + import com.metamatrix.common.xa.MMXid; import com.metamatrix.common.xa.XATransactionException; -import com.metamatrix.connector.xa.api.XAConnection; = = public interface TransactionProvider { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/transactio= n/TransactionServerImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Tran= sactionServerImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Tran= sactionServerImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -39,9 +39,10 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; = +import org.teiid.connector.xa.api.TransactionContext; + import com.metamatrix.common.xa.MMXid; import com.metamatrix.common.xa.XATransactionException; -import com.metamatrix.connector.xa.api.TransactionContext; import com.metamatrix.core.util.Assertion; import com.metamatrix.dqp.DQPPlugin; import com.metamatrix.dqp.internal.transaction.TransactionProvider.XAConne= ctionSource; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicReque= stMessage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestMess= age.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicRequestMess= age.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,8 +28,9 @@ import java.util.Date; import java.util.concurrent.atomic.AtomicInteger; = +import org.teiid.connector.xa.api.TransactionContext; + import com.metamatrix.common.buffer.impl.BufferConfig; -import com.metamatrix.connector.xa.api.TransactionContext; import com.metamatrix.dqp.internal.datamgr.ConnectorID; import com.metamatrix.dqp.internal.process.DQPWorkContext; import com.metamatrix.query.sql.lang.Command; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResul= tsMessage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMess= age.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMess= age.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,8 +28,9 @@ import java.io.ObjectOutput; import java.util.List; = +import org.teiid.connector.api.ConnectorException; + import com.metamatrix.common.batch.BatchSerializer; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.ExternalizeUtil; = public class AtomicResultsMessage implements Externalizable { Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/Customizabl= eTrackingMessage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTrack= ingMessage.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTrack= ingMessage.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,7 +22,8 @@ = package com.metamatrix.dqp.service; = -import com.metamatrix.connector.api.ExecutionContext; +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.dqp.spi.CommandLoggerSPI; = = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/Customizabl= eTrackingService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTrack= ingService.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/service/CustomizableTrack= ingService.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,6 +28,8 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; = +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.common.application.ApplicationEnvironment; import com.metamatrix.common.application.DQPConfigSource; import com.metamatrix.common.application.exception.ApplicationInitializati= onException; @@ -37,7 +39,6 @@ import com.metamatrix.common.queue.WorkerPoolFactory; import com.metamatrix.common.util.LogCommonConstants; import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.core.util.StringUtil; import com.metamatrix.dqp.DQPPlugin; import com.metamatrix.dqp.spi.CommandLoggerSPI; Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/TrackingSer= vice.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/service/TrackingService.j= ava 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/service/TrackingService.j= ava 2009-02-25 20:18:40 UTC (rev 502) @@ -24,8 +24,9 @@ */ package com.metamatrix.dqp.service; = +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.common.application.ApplicationService; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.query.sql.lang.Command; = /** Modified: trunk/engine/src/main/java/com/metamatrix/dqp/spi/CommandLoggerSP= I.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/spi/CommandLoggerSPI.java= 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/spi/CommandLoggerSPI.java= 2009-02-25 20:18:40 UTC (rev 502) @@ -24,7 +24,8 @@ = import java.util.Properties; = -import com.metamatrix.connector.api.ExecutionContext; +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.dqp.service.TrackingService; = /** = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/spi/basic/FileComma= ndLogger.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/spi/basic/FileCommandLogg= er.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/spi/basic/FileCommandLogg= er.java 2009-02-25 20:18:40 UTC (rev 502) @@ -30,7 +30,8 @@ import java.util.Date; import java.util.Properties; = -import com.metamatrix.connector.api.ExecutionContext; +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.dqp.spi.CommandLoggerSPI; = /** Modified: trunk/engine/src/main/java/com/metamatrix/dqp/transaction/Transac= tionServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/transaction/TransactionSe= rver.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/dqp/transaction/TransactionSe= rver.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,8 +26,9 @@ import javax.transaction.SystemException; import javax.transaction.xa.XAResource; = +import org.teiid.connector.xa.api.TransactionContext; + import com.metamatrix.common.xa.XATransactionException; -import com.metamatrix.connector.xa.api.TransactionContext; import com.metamatrix.dqp.internal.transaction.TransactionProvider.XAConne= ctionSource; = public interface TransactionServer { Modified: trunk/engine/src/main/java/com/metamatrix/query/function/source/S= ystemSource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemS= ource.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/query/function/source/SystemS= ource.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,8 +28,9 @@ import java.util.Collection; import java.util.List; = +import org.teiid.connector.api.SourceSystemFunctions; + import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.api.SourceSystemFunctions; import com.metamatrix.query.QueryPlugin; import com.metamatrix.query.function.FunctionLibrary; import com.metamatrix.query.function.FunctionMetadataSource; Modified: trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRew= riter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.= java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.= java 2009-02-25 20:18:40 UTC (rev 502) @@ -42,6 +42,8 @@ import java.util.Set; import java.util.StringTokenizer; = +import org.teiid.connector.api.SourceSystemFunctions; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.CriteriaEvaluationException; import com.metamatrix.api.exception.query.ExpressionEvaluationException; @@ -55,7 +57,6 @@ import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.common.types.Transform; import com.metamatrix.common.util.TimestampWithTimezone; -import com.metamatrix.connector.api.SourceSystemFunctions; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.util.Assertion; import com.metamatrix.query.eval.Evaluator; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/im= pl/FakeConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fak= eConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fak= eConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,27 +27,28 @@ = import javax.transaction.xa.XAResource; = +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.Execution; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.api.UpdateExecution; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.basic.BasicConnector; +import org.teiid.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.xa.api.TransactionContext; +import org.teiid.connector.xa.api.XAConnection; +import org.teiid.connector.xa.api.XAConnector; + import junit.framework.Assert; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.Execution; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.api.UpdateExecution; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.basic.BasicConnector; -import com.metamatrix.connector.basic.BasicConnectorCapabilities; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.xa.api.TransactionContext; -import com.metamatrix.connector.xa.api.XAConnection; -import com.metamatrix.connector.xa.api.XAConnector; = public class FakeConnector extends BasicConnector implements XAConnector { private static final int RESULT_SIZE =3D 5; @@ -60,7 +61,7 @@ private ClassLoader classloader; = @Override - public Connection getConnection(com.metamatrix.connector.api.Execution= Context context) throws ConnectorException { + public Connection getConnection(org.teiid.connector.api.ExecutionConte= xt context) throws ConnectorException { return new FakeConnection(); } @Override Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/im= pl/FakeProcedureExecution.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fak= eProcedureExecution.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Fak= eProcedureExecution.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,12 +25,13 @@ import java.util.Arrays; import java.util.List; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.DataNotAvailableException; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.basic.BasicExecution; -import com.metamatrix.connector.language.IParameter; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.DataNotAvailableException; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.basic.BasicExecution; +import org.teiid.connector.language.IParameter; = + final class FakeProcedureExecution extends BasicExecution implements Proce= dureExecution { = int resultSetSize; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/im= pl/TestConnectorManagerImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Tes= tConnectorManagerImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Tes= tConnectorManagerImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -34,10 +34,10 @@ import junit.framework.TestCase; = import org.mockito.Mockito; +import org.teiid.connector.internal.ConnectorPropertyNames; = import com.metamatrix.common.application.ApplicationEnvironment; import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; -import com.metamatrix.connector.internal.ConnectorPropertyNames; import com.metamatrix.dqp.internal.datamgr.impl.TestConnectorWorkItem.Queu= eResultsReceiver; import com.metamatrix.dqp.internal.pooling.connector.FakeSourceConnectionF= actory; import com.metamatrix.dqp.internal.process.DQPWorkContext; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/im= pl/TestConnectorWorkItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Tes= tConnectorWorkItem.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/impl/Tes= tConnectorWorkItem.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,12 +27,13 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.language.IProcedure; + import junit.framework.TestCase; = import com.metamatrix.common.comm.api.ResultsReceiver; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.language.IProcedure; import com.metamatrix.dqp.client.ResultsFuture; import com.metamatrix.dqp.internal.datamgr.ConnectorID; import com.metamatrix.dqp.internal.datamgr.language.LanguageBridgeFactory; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestAggregateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestAggregateImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestAggregateImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,8 +22,9 @@ = package com.metamatrix.dqp.internal.datamgr.language; = +import org.teiid.connector.language.IAggregate; + import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.language.IAggregate; import com.metamatrix.query.sql.ReservedWords; import com.metamatrix.query.sql.symbol.AggregateSymbol; import com.metamatrix.query.sql.symbol.Constant; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestBatchedUpdatesImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestBatchedUpdatesImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestBatchedUpdatesImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,11 +25,12 @@ import java.util.ArrayList; import java.util.List; = +import org.teiid.connector.language.IDelete; +import org.teiid.connector.language.IInsert; +import org.teiid.connector.language.IUpdate; + import junit.framework.TestCase; = -import com.metamatrix.connector.language.IDelete; -import com.metamatrix.connector.language.IInsert; -import com.metamatrix.connector.language.IUpdate; import com.metamatrix.query.sql.lang.BatchedUpdateCommand; = = Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestBulkInsertImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestBulkInsertImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestBulkInsertImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,9 +25,10 @@ import java.util.ArrayList; import java.util.Iterator; = +import org.teiid.connector.language.IElement; + import junit.framework.TestCase; = -import com.metamatrix.connector.language.IElement; import com.metamatrix.query.sql.lang.BulkInsert; import com.metamatrix.query.sql.symbol.GroupSymbol; = Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestCompareCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestCompareCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestCompareCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,7 +22,8 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.ICompareCriteria.Operator; +import org.teiid.connector.language.ICompareCriteria.Operator; + import com.metamatrix.query.sql.lang.CompareCriteria; import com.metamatrix.query.sql.symbol.Constant; = Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestCompoundCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestCompoundCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestCompoundCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,8 +24,9 @@ = import java.util.Iterator; = -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.ICompoundCriteria.Operator; +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.ICompoundCriteria.Operator; + import com.metamatrix.query.sql.lang.CompareCriteria; import com.metamatrix.query.sql.lang.CompoundCriteria; = Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestElementImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestElementImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestElementImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,12 +22,13 @@ = package com.metamatrix.dqp.internal.datamgr.language; = +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.metadata.runtime.Element; + import junit.framework.TestCase; = import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.dqp.internal.datamgr.metadata.TestMetadataFactory; import com.metamatrix.query.sql.symbol.ElementSymbol; import com.metamatrix.query.unittest.FakeMetadataObject; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestFromImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestFromImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestFromImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,7 +26,8 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.language.IFromItem; +import org.teiid.connector.language.IFromItem; + import com.metamatrix.query.sql.lang.From; import com.metamatrix.query.sql.lang.UnaryFromClause; = Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestFunctionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestFunctionImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestFunctionImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,7 +24,8 @@ = import java.util.List; = -import com.metamatrix.connector.language.IExpression; +import org.teiid.connector.language.IExpression; + import com.metamatrix.query.sql.symbol.Constant; import com.metamatrix.query.sql.symbol.Expression; import com.metamatrix.query.sql.symbol.Function; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestGroupByImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestGroupByImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestGroupByImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,7 +26,8 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.language.IElement; +import org.teiid.connector.language.IElement; + import com.metamatrix.query.sql.lang.GroupBy; import com.metamatrix.query.sql.symbol.ElementSymbol; import com.metamatrix.query.sql.symbol.Expression; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestInCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestInCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestInCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,8 +26,9 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.ILiteral; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.ILiteral; + import com.metamatrix.query.sql.lang.SetCriteria; = import junit.framework.TestCase; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestInsertImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestInsertImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestInsertImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,8 +25,9 @@ import java.util.ArrayList; import java.util.Iterator; = -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; + import com.metamatrix.query.sql.lang.Insert; import com.metamatrix.query.sql.symbol.GroupSymbol; = Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestJoinImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestJoinImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestJoinImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,7 +25,8 @@ import java.util.ArrayList; import java.util.Iterator; = -import com.metamatrix.connector.language.ICriteria; +import org.teiid.connector.language.ICriteria; + import com.metamatrix.query.sql.lang.CompareCriteria; import com.metamatrix.query.sql.lang.JoinPredicate; import com.metamatrix.query.sql.lang.JoinType; @@ -68,11 +69,11 @@ } = public void testGetJoinType() throws Exception { - assertEquals(com.metamatrix.connector.language.IJoin.JoinType.CROS= S_JOIN, example(JoinType.JOIN_CROSS).getJoinType()); - assertEquals(com.metamatrix.connector.language.IJoin.JoinType.FULL= _OUTER_JOIN, example(JoinType.JOIN_FULL_OUTER).getJoinType()); - assertEquals(com.metamatrix.connector.language.IJoin.JoinType.INNE= R_JOIN, example(JoinType.JOIN_INNER).getJoinType()); - assertEquals(com.metamatrix.connector.language.IJoin.JoinType.LEFT= _OUTER_JOIN, example(JoinType.JOIN_LEFT_OUTER).getJoinType()); - assertEquals(com.metamatrix.connector.language.IJoin.JoinType.RIGH= T_OUTER_JOIN, example(JoinType.JOIN_RIGHT_OUTER).getJoinType()); + assertEquals(org.teiid.connector.language.IJoin.JoinType.CROSS_JOI= N, example(JoinType.JOIN_CROSS).getJoinType()); + assertEquals(org.teiid.connector.language.IJoin.JoinType.FULL_OUTE= R_JOIN, example(JoinType.JOIN_FULL_OUTER).getJoinType()); + assertEquals(org.teiid.connector.language.IJoin.JoinType.INNER_JOI= N, example(JoinType.JOIN_INNER).getJoinType()); + assertEquals(org.teiid.connector.language.IJoin.JoinType.LEFT_OUTE= R_JOIN, example(JoinType.JOIN_LEFT_OUTER).getJoinType()); + assertEquals(org.teiid.connector.language.IJoin.JoinType.RIGHT_OUT= ER_JOIN, example(JoinType.JOIN_RIGHT_OUTER).getJoinType()); } = public void testGetCriteria() throws Exception { Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestLikeCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestLikeCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestLikeCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,7 +22,8 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.ILiteral; +import org.teiid.connector.language.ILiteral; + import com.metamatrix.query.sql.lang.MatchCriteria; import com.metamatrix.query.sql.symbol.Constant; import com.metamatrix.query.sql.symbol.ElementSymbol; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestOrderByImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestOrderByImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestOrderByImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,7 +26,8 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.language.IOrderByItem; +import org.teiid.connector.language.IOrderByItem; + import com.metamatrix.query.sql.lang.OrderBy; = import junit.framework.TestCase; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestParameterImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestParameterImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestParameterImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,8 +24,9 @@ = import java.sql.ResultSet; = -import com.metamatrix.connector.language.IParameter.Direction; +import org.teiid.connector.language.IParameter.Direction; = + import junit.framework.TestCase; = public class TestParameterImpl extends TestCase { Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestProcedureImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestProcedureImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestProcedureImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,7 +25,8 @@ import java.util.Collections; import java.util.Iterator; = -import com.metamatrix.connector.language.IParameter; +import org.teiid.connector.language.IParameter; + import com.metamatrix.query.parser.QueryParser; import com.metamatrix.query.resolver.QueryResolver; import com.metamatrix.query.sql.lang.*; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestScalarSubqueryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestScalarSubqueryImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestScalarSubqueryImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,10 +22,11 @@ = package com.metamatrix.dqp.internal.datamgr.language; = +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelectSymbol; + import junit.framework.TestCase; = -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelectSymbol; import com.metamatrix.query.sql.lang.Query; import com.metamatrix.query.sql.symbol.ScalarSubquery; import com.metamatrix.query.sql.symbol.SingleElementSymbol; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestSelectImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestSelectImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestSelectImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,7 +26,8 @@ import java.util.Iterator; import java.util.List; = -import com.metamatrix.connector.language.ISelectSymbol; +import org.teiid.connector.language.ISelectSymbol; + import com.metamatrix.query.sql.lang.Select; = import junit.framework.TestCase; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestSelectSymbolImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestSelectSymbolImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestSelectSymbolImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,7 +22,8 @@ = package com.metamatrix.dqp.internal.datamgr.language; = -import com.metamatrix.connector.language.IExpression; +import org.teiid.connector.language.IExpression; + import com.metamatrix.query.sql.symbol.*; = import junit.framework.TestCase; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestSetQueryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestSetQueryImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestSetQueryImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,14 +25,15 @@ import java.util.ArrayList; import java.util.List; = +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IOrderByItem; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.language.ISetQuery; + import junit.framework.TestCase; = -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IOrderByItem; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.language.ISetQuery; import com.metamatrix.query.sql.lang.CompoundCriteria; import com.metamatrix.query.sql.lang.Query; import com.metamatrix.query.sql.lang.SetQuery; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/la= nguage/TestSubqueryCompareCriteriaImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestSubqueryCompareCriteriaImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/datamgr/language= /TestSubqueryCompareCriteriaImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,10 +22,11 @@ = package com.metamatrix.dqp.internal.datamgr.language; = +import org.teiid.connector.language.ICompareCriteria; +import org.teiid.connector.language.ISubqueryCompareCriteria.Quantifier; + import junit.framework.TestCase; = -import com.metamatrix.connector.language.ICompareCriteria; -import com.metamatrix.connector.language.ISubqueryCompareCriteria.Quantifi= er; import com.metamatrix.query.sql.lang.CompareCriteria; import com.metamatrix.query.sql.lang.Query; import com.metamatrix.query.sql.lang.SubqueryCompareCriteria; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/FakeSourceConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeSourceConnectionFactory.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeSourceConnectionFactory.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,16 +24,16 @@ */ package com.metamatrix.dqp.internal.pooling.connector; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.Execution; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.basic.BasicConnector; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.Execution; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.basic.BasicConnector; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = /** */ Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/FakeUserIdentityConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeUserIdentityConnectionFactory.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/FakeUserIdentityConnectionFactory.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,10 +24,10 @@ */ package com.metamatrix.dqp.internal.pooling.connector; = -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorIdentity; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.MappedUserIdentity; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorIdentity; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.MappedUserIdentity; = /** */ Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/TestConnectionPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionPool.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionPool.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,10 +26,11 @@ import java.util.List; import java.util.Properties; = +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.MappedUserIdentity; + import junit.framework.TestCase; = -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.MappedUserIdentity; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorWrapper; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; = Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/TestConnectionWrapper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionWrapper.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestConnectionWrapper.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,8 +25,8 @@ import junit.framework.TestCase; = import org.mockito.Mockito; +import org.teiid.connector.basic.BasicConnection; = -import com.metamatrix.connector.basic.BasicConnection; = public class TestConnectionWrapper extends TestCase { = Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/co= nnector/TestPerUserPool.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestPerUserPool.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/pooling/connecto= r/TestPerUserPool.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,19 +28,19 @@ import junit.framework.TestCase; = import org.mockito.Mockito; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.Connector; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorLogger; +import org.teiid.connector.api.CredentialMap; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.MappedUserIdentity; +import org.teiid.connector.basic.BasicConnector; +import org.teiid.connector.internal.ConnectorPropertyNames; = import com.metamatrix.common.application.ApplicationEnvironment; -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.Connector; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ConnectorLogger; -import com.metamatrix.connector.api.CredentialMap; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.MappedUserIdentity; -import com.metamatrix.connector.basic.BasicConnector; -import com.metamatrix.connector.internal.ConnectorPropertyNames; import com.metamatrix.dqp.internal.datamgr.impl.ConnectorEnvironmentImpl; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; = Modified: trunk/engine/src/test/java/com/metamatrix/dqp/service/TestCustomi= zableTrackingService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/service/TestCustomizableT= rackingService.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/dqp/service/TestCustomizableT= rackingService.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,12 +26,13 @@ import java.util.List; import java.util.Properties; = +import org.teiid.connector.api.ExecutionContext; + import junit.framework.TestCase; = import com.metamatrix.common.application.DQPConfigSource; import com.metamatrix.common.application.exception.ApplicationInitializati= onException; import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.dqp.spi.CommandLoggerSPI; import com.metamatrix.dqp.spi.TrackerLogConstants; import com.metamatrix.query.sql.lang.Command; Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoi= nOptimization.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoinOptim= ization.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestJoinOptim= ization.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,13 +25,14 @@ import java.util.ArrayList; import java.util.List; = +import org.teiid.connector.api.SourceSystemFunctions; + import junit.framework.TestCase; = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.api.exception.query.QueryParserException; import com.metamatrix.api.exception.query.QueryResolverException; -import com.metamatrix.connector.api.SourceSystemFunctions; import com.metamatrix.query.optimizer.capabilities.BasicSourceCapabilities; import com.metamatrix.query.optimizer.capabilities.FakeCapabilitiesFinder; import com.metamatrix.query.optimizer.capabilities.SourceCapabilities.Capa= bility; Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOpt= imizer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer= .java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/TestOptimizer= .java 2009-02-25 20:18:40 UTC (rev 502) @@ -30,6 +30,8 @@ import java.util.List; import java.util.Set; = +import org.teiid.connector.api.SourceSystemFunctions; + import junit.framework.TestCase; = import com.metamatrix.api.exception.MetaMatrixComponentException; @@ -39,7 +41,6 @@ import com.metamatrix.api.exception.query.QueryResolverException; import com.metamatrix.api.exception.query.QueryValidatorException; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.api.SourceSystemFunctions; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.query.analysis.AnalysisRecord; import com.metamatrix.query.mapping.relational.QueryNode; Modified: trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMet= adataInterfaceBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataI= nterfaceBuilder.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/engine/src/test/java/com/metamatrix/query/unittest/QueryMetadataI= nterfaceBuilder.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,8 +28,9 @@ import java.util.Iterator; import java.util.List; = +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.dqp.internal.datamgr.metadata.RuntimeMetadataImpl; import com.metamatrix.dqp.message.ParameterInfo; Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/so= cket/server/LogonImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/LogonImpl.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/LogonImpl.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,6 +27,9 @@ import java.util.Map; import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.CredentialMap; + import com.metamatrix.admin.api.exception.security.InvalidSessionException; import com.metamatrix.api.exception.ComponentNotFoundException; import com.metamatrix.api.exception.MetaMatrixComponentException; @@ -35,8 +38,6 @@ import com.metamatrix.api.exception.security.SessionServiceException; import com.metamatrix.common.api.MMURL; import com.metamatrix.common.log.LogManager; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.CredentialMap; import com.metamatrix.dqp.client.ResultsFuture; import com.metamatrix.dqp.internal.process.DQPWorkContext; import com.metamatrix.jdbc.api.ConnectionProperties; Modified: trunk/server/src/main/java/com/metamatrix/server/connector/servic= e/ConnectorService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/connector/service/Conn= ectorService.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/server/src/main/java/com/metamatrix/server/connector/service/Conn= ectorService.java 2009-02-25 20:18:40 UTC (rev 502) @@ -41,6 +41,9 @@ import java.util.Map; import java.util.Properties; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.internal.ConnectorPropertyNames; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.application.ApplicationEnvironment; import com.metamatrix.common.application.ApplicationService; @@ -70,8 +73,6 @@ import com.metamatrix.common.util.VMNaming; import com.metamatrix.common.util.crypto.CryptoException; import com.metamatrix.common.util.crypto.CryptoUtil; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.internal.ConnectorPropertyNames; import com.metamatrix.core.MetaMatrixCoreException; import com.metamatrix.core.event.EventObjectListener; import com.metamatrix.core.util.ReflectionHelper; Modified: trunk/server/src/main/java/com/metamatrix/server/connector/servic= e/ConnectorServiceInterface.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/connector/service/Conn= ectorServiceInterface.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/server/src/main/java/com/metamatrix/server/connector/service/Conn= ectorServiceInterface.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,9 +28,10 @@ = import java.io.Serializable; = +import org.teiid.connector.api.ConnectorException; + import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.comm.api.ResultsReceiver; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.dqp.internal.datamgr.ConnectorID; import com.metamatrix.dqp.internal.process.DQPWorkContext; import com.metamatrix.dqp.message.AtomicRequestID; Modified: trunk/server/src/main/java/com/metamatrix/server/dqp/service/Plat= formDataService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDa= taService.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/server/src/main/java/com/metamatrix/server/dqp/service/PlatformDa= taService.java 2009-02-25 20:18:40 UTC (rev 502) @@ -31,6 +31,8 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; = +import org.teiid.connector.api.ConnectorException; + import com.metamatrix.api.exception.ComponentNotFoundException; import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.common.application.ApplicationEnvironment; @@ -38,7 +40,6 @@ import com.metamatrix.common.application.exception.ApplicationLifecycleExc= eption; import com.metamatrix.common.comm.api.ResultsReceiver; import com.metamatrix.common.config.api.ConnectorBinding; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.core.util.ArgCheck; import com.metamatrix.dqp.internal.datamgr.ConnectorID; import com.metamatrix.dqp.internal.process.DQPWorkContext; Modified: trunk/server/src/main/java/com/metamatrix/server/dqp/service/trac= ker/DatabaseCommandLogger.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/dqp/service/tracker/Da= tabaseCommandLogger.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/server/src/main/java/com/metamatrix/server/dqp/service/tracker/Da= tabaseCommandLogger.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,9 +26,10 @@ = import java.util.Properties; = +import org.teiid.connector.api.ExecutionContext; + import com.metamatrix.common.log.LogManager; import com.metamatrix.common.util.LogCommonConstants; -import com.metamatrix.connector.api.ExecutionContext; import com.metamatrix.dqp.spi.CommandLoggerSPI; import com.metamatrix.dqp.spi.TrackerLogConstants; import com.metamatrix.server.ServerPlugin; Modified: trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestT= ranslationUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTransla= tionUtility.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTransla= tionUtility.java 2009-02-25 20:18:40 UTC (rev 502) @@ -22,13 +22,14 @@ = package com.metamatrix.cdk.api; = +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.MetadataObject; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import junit.framework.TestCase; = -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.util.UnitTestUtil; = public class TestTranslationUtility extends TestCase { Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/extension/TestSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/exte= nsion/TestSQLConversionVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,18 +26,18 @@ = import junit.framework.TestCase; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; import org.teiid.connector.jdbc.JDBCPropertyNames; import org.teiid.connector.jdbc.translator.SQLConversionVisitor; import org.teiid.connector.jdbc.translator.TranslatedCommand; import org.teiid.connector.jdbc.translator.Translator; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.ILanguageObject; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.util.UnitTestUtil; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl; Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/oracle/TestOracleSQLConversionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/orac= le/TestOracleSQLConversionVisitor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/orac= le/TestOracleSQLConversionVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,18 +26,18 @@ = import junit.framework.TestCase; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; import org.teiid.connector.jdbc.JDBCPropertyNames; import org.teiid.connector.jdbc.oracle.OracleSQLTranslator; import org.teiid.connector.jdbc.translator.TranslatedCommand; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = import com.metamatrix.cdk.CommandBuilder; import com.metamatrix.cdk.api.EnvironmentUtility; import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.util.UnitTestUtil; import com.metamatrix.dqp.internal.datamgr.impl.ExecutionContextImpl; import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl; Modified: trunk/test-integration/src/test/java/com/metamatrix/connector/jdb= c/util/TestJDBCExecutionHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util= /TestJDBCExecutionHelper.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/connector/jdbc/util= /TestJDBCExecutionHelper.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,15 +28,15 @@ import java.util.ArrayList; import java.util.List; = +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; import org.teiid.connector.jdbc.JDBCExecutionHelper; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelect; = import junit.framework.TestCase; = import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelect; import com.metamatrix.dqp.internal.datamgr.impl.FakeExecutionContextImpl; import com.metamatrix.dqp.internal.datamgr.impl.TypeFacilityImpl; import com.metamatrix.dqp.internal.datamgr.language.LiteralImpl; Modified: trunk/test-integration/src/test/java/com/metamatrix/data/language= /TestLanguageUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/language/TestL= anguageUtil.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/data/language/TestL= anguageUtil.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,13 +26,14 @@ import java.util.List; import java.util.Set; = +import org.teiid.connector.language.ICriteria; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.LanguageUtil; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.TranslationUtility; import com.metamatrix.cdk.unittest.FakeTranslationFactory; -import com.metamatrix.connector.language.ICriteria; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.LanguageUtil; import com.metamatrix.dqp.internal.datamgr.language.LanguageFactoryImpl; = /** Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/MockConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/MockConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/MockConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -5,25 +5,25 @@ import junit.framework.TestCase; = import org.mockito.Mockito; +import org.teiid.connector.api.Connection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorEnvironment; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.api.ProcedureExecution; +import org.teiid.connector.api.ResultSetExecution; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.basic.BasicConnector; +import org.teiid.connector.basic.BasicConnectorCapabilities; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQueryCommand; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.MetadataObject; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; = -import com.metamatrix.connector.api.Connection; -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorEnvironment; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.api.ProcedureExecution; -import com.metamatrix.connector.api.ResultSetExecution; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.basic.BasicConnector; -import com.metamatrix.connector.basic.BasicConnectorCapabilities; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQueryCommand; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.MetadataObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; = public class MockConnector extends BasicConnector { = Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestElement.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestElement.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestElement.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,13 +24,14 @@ = import java.util.Properties; = +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.metadata.runtime.Element; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.metadata.runtime.Element; import com.metamatrix.core.util.UnitTestUtil; = /** Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestGroup.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestGroup.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestGroup.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,12 +24,13 @@ = import java.util.Properties; = +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.metadata.runtime.Group; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.metadata.runtime.Group; import com.metamatrix.core.util.UnitTestUtil; = /** Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestMetadataInConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestMetadataInConnector.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestMetadataInConnector.java 2009-02-25 20:18:40 UTC (rev 502) @@ -1,6 +1,7 @@ package com.metamatrix.data.metadata.runtime; = -import com.metamatrix.connector.api.ConnectorException; +import org.teiid.connector.api.ConnectorException; + import com.metamatrix.core.util.UnitTestUtil; import com.metamatrix.jdbc.api.AbstractMMQueryTestCase; = Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestMetadataObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestMetadataObject.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestMetadataObject.java 2009-02-25 20:18:40 UTC (rev 502) @@ -27,18 +27,19 @@ import java.util.List; import java.util.Set; = +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IQuery; +import org.teiid.connector.language.ISelectSymbol; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Group; +import org.teiid.connector.metadata.runtime.Parameter; +import org.teiid.connector.metadata.runtime.Procedure; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IQuery; -import com.metamatrix.connector.language.ISelectSymbol; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.Group; -import com.metamatrix.connector.metadata.runtime.Parameter; -import com.metamatrix.connector.metadata.runtime.Procedure; import com.metamatrix.core.util.UnitTestUtil; = /** Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestParams.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestParams.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestParams.java 2009-02-25 20:18:40 UTC (rev 502) @@ -26,14 +26,15 @@ import java.sql.Timestamp; import java.util.List; = +import org.teiid.connector.language.IParameter; +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.language.IParameter.Direction; +import org.teiid.connector.metadata.runtime.Parameter; +import org.teiid.connector.metadata.runtime.TypeModel; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.connector.language.IParameter; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.language.IParameter.Direction; -import com.metamatrix.connector.metadata.runtime.Parameter; -import com.metamatrix.connector.metadata.runtime.TypeModel; import com.metamatrix.core.util.UnitTestUtil; = = Modified: trunk/test-integration/src/test/java/com/metamatrix/data/metadata= /runtime/TestProcedure.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestProcedure.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/data/metadata/runti= me/TestProcedure.java 2009-02-25 20:18:40 UTC (rev 502) @@ -25,14 +25,15 @@ import java.util.List; import java.util.Properties; = +import org.teiid.connector.language.IProcedure; +import org.teiid.connector.metadata.runtime.Element; +import org.teiid.connector.metadata.runtime.Parameter; +import org.teiid.connector.metadata.runtime.Procedure; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; + import junit.framework.TestCase; = import com.metamatrix.cdk.api.TranslationUtility; -import com.metamatrix.connector.language.IProcedure; -import com.metamatrix.connector.metadata.runtime.Element; -import com.metamatrix.connector.metadata.runtime.Parameter; -import com.metamatrix.connector.metadata.runtime.Procedure; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; import com.metamatrix.core.util.UnitTestUtil; = /** Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/= util/TestCollectorVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estCollectorVisitor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estCollectorVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,9 +24,10 @@ = import java.util.*; = -import com.metamatrix.connector.language.*; -import com.metamatrix.connector.language.ICompareCriteria.Operator; -import com.metamatrix.connector.visitor.util.CollectorVisitor; +import org.teiid.connector.language.*; +import org.teiid.connector.language.ICompareCriteria.Operator; +import org.teiid.connector.visitor.util.CollectorVisitor; + import com.metamatrix.dqp.internal.datamgr.language.*; = import junit.framework.TestCase; Modified: trunk/test-integration/src/test/java/com/metamatrix/data/visitor/= util/TestSQLStringVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estSQLStringVisitor.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/test-integration/src/test/java/com/metamatrix/data/visitor/util/T= estSQLStringVisitor.java 2009-02-25 20:18:40 UTC (rev 502) @@ -28,19 +28,20 @@ import java.util.Arrays; import java.util.List; = +import org.teiid.connector.language.ICommand; +import org.teiid.connector.language.IElement; +import org.teiid.connector.language.IExpression; +import org.teiid.connector.language.IFunction; +import org.teiid.connector.language.IGroup; +import org.teiid.connector.language.ILanguageObject; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.visitor.util.SQLReservedWords; +import org.teiid.connector.visitor.util.SQLStringVisitor; + import junit.framework.TestCase; = import com.metamatrix.cdk.unittest.FakeTranslationFactory; import com.metamatrix.common.types.DataTypeManager; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.language.IElement; -import com.metamatrix.connector.language.IExpression; -import com.metamatrix.connector.language.IFunction; -import com.metamatrix.connector.language.IGroup; -import com.metamatrix.connector.language.ILanguageObject; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.visitor.util.SQLReservedWords; -import com.metamatrix.connector.visitor.util.SQLStringVisitor; import com.metamatrix.dqp.internal.datamgr.language.AggregateImpl; import com.metamatrix.dqp.internal.datamgr.language.ElementImpl; import com.metamatrix.dqp.internal.datamgr.language.FunctionImpl; Modified: trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXACo= nnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXAConnecti= on.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/FakeXAConnecti= on.java 2009-02-25 20:18:40 UTC (rev 502) @@ -24,15 +24,16 @@ = import javax.transaction.xa.XAResource; = -import com.metamatrix.connector.api.ConnectorCapabilities; -import com.metamatrix.connector.api.ConnectorException; -import com.metamatrix.connector.api.Execution; -import com.metamatrix.connector.api.ExecutionContext; -import com.metamatrix.connector.basic.BasicConnection; -import com.metamatrix.connector.language.ICommand; -import com.metamatrix.connector.metadata.runtime.RuntimeMetadata; -import com.metamatrix.connector.xa.api.XAConnection; +import org.teiid.connector.api.ConnectorCapabilities; +import org.teiid.connector.api.ConnectorException; +import org.teiid.connector.api.Execution; +import org.teiid.connector.api.ExecutionContext; +import org.teiid.connector.basic.BasicConnection; +import org.teiid.connector.language.ICommand; +import org.teiid.connector.metadata.runtime.RuntimeMetadata; +import org.teiid.connector.xa.api.XAConnection; = + class FakeXAConnection extends BasicConnection implements XAConnection { String name; boolean released =3D false; Modified: trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArju= naRecovery.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaReco= very.java 2009-02-25 19:09:43 UTC (rev 501) +++ trunk/txn-jbossts/src/test/java/com/metamatrix/xa/arjuna/TestArjunaReco= very.java 2009-02-25 20:18:40 UTC (rev 502) @@ -30,12 +30,13 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; = +import org.teiid.connector.api.ConnectorException; + import junit.framework.TestCase; = import com.arjuna.ats.arjuna.common.Configuration; import com.arjuna.ats.arjuna.recovery.RecoveryConfiguration; import com.metamatrix.common.xa.MMXid; -import com.metamatrix.connector.api.ConnectorException; import com.metamatrix.dqp.internal.transaction.TransactionProvider; import com.metamatrix.dqp.service.TransactionService; = --===============0374747833932064404==-- From teiid-commits at lists.jboss.org Wed Feb 25 16:59:43 2009 Content-Type: multipart/mixed; boundary="===============5818052621730563068==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r503 - in trunk/engine/src: main/java/com/metamatrix/query/validator and 1 other directories. Date: Wed, 25 Feb 2009 16:59:42 -0500 Message-ID: --===============5818052621730563068== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-25 16:59:42 -0500 (Wed, 25 Feb 2009) New Revision: 503 Removed: trunk/engine/src/main/java/com/metamatrix/query/validator/ValidateCriter= iaVisitor.java trunk/engine/src/test/java/com/metamatrix/query/validator/TestCriteriaVa= lidator.java Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.j= ava trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVisi= tor.java trunk/engine/src/main/java/com/metamatrix/query/validator/Validator.java trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator.= java Log: TEIID-384 removing ValidateCriteriaVisitor. Allowing the validator to enfo= rce type based restrictions. Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Re= quest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.= java 2009-02-25 20:18:40 UTC (rev 502) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Request.= java 2009-02-25 21:59:42 UTC (rev 503) @@ -101,7 +101,6 @@ import com.metamatrix.query.util.ContextProperties; import com.metamatrix.query.util.TypeRetrievalUtil; import com.metamatrix.query.validator.AbstractValidationVisitor; -import com.metamatrix.query.validator.ValidateCriteriaVisitor; import com.metamatrix.query.validator.ValidationVisitor; import com.metamatrix.query.validator.Validator; import com.metamatrix.query.validator.ValidatorFailure; @@ -357,10 +356,6 @@ AbstractValidationVisitor visitor =3D new ValidationVisitor(); validateWithVisitor(visitor, metadata, command, false); = - // Create criteria validation visitor - visitor =3D new ValidateCriteriaVisitor(); - validateWithVisitor(visitor, metadata, command, true); - = if (validateVisibility) { // Create model visibility validation visitor visitor =3D new ModelVisibilityValidationVisitor(this.vdbService,= this.vdbName, this.vdbVersion); Deleted: trunk/engine/src/main/java/com/metamatrix/query/validator/Validate= CriteriaVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/validator/ValidateCrite= riaVisitor.java 2009-02-25 20:18:40 UTC (rev 502) +++ trunk/engine/src/main/java/com/metamatrix/query/validator/ValidateCrite= riaVisitor.java 2009-02-25 21:59:42 UTC (rev 503) @@ -1,196 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.query.validator; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; - -import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.query.QueryPlugin; -import com.metamatrix.query.metadata.SupportConstants; -import com.metamatrix.query.sql.lang.AbstractCompareCriteria; -import com.metamatrix.query.sql.lang.BetweenCriteria; -import com.metamatrix.query.sql.lang.CompareCriteria; -import com.metamatrix.query.sql.lang.Criteria; -import com.metamatrix.query.sql.lang.DependentSetCriteria; -import com.metamatrix.query.sql.lang.IsNullCriteria; -import com.metamatrix.query.sql.lang.MatchCriteria; -import com.metamatrix.query.sql.lang.Query; -import com.metamatrix.query.sql.lang.SetCriteria; -import com.metamatrix.query.sql.lang.SubqueryCompareCriteria; -import com.metamatrix.query.sql.lang.SubquerySetCriteria; -import com.metamatrix.query.sql.symbol.ElementSymbol; -import com.metamatrix.query.sql.symbol.Expression; -import com.metamatrix.query.sql.symbol.GroupSymbol; -import com.metamatrix.query.sql.visitor.ElementCollectorVisitor; -import com.metamatrix.query.util.ErrorMessageKeys; - -/** - * Validates that the elements of various criteria are allowed (by metadat= a) - * to be used in the criteria in the way that they are being used. - */ -public class ValidateCriteriaVisitor extends AbstractValidationVisitor { - - // State during validation - private boolean isXML =3D false; // only used for Query commands - - public ValidateCriteriaVisitor() { - super(); - } - - public void reset() { - super.reset(); - this.isXML =3D false; - } - - // ############### Visitor methods for language objects ##############= #### - - public void visit(Query obj) { - if(isXMLCommand(obj)) { - this.isXML =3D true; - } = - } - - public void visit(BetweenCriteria obj) { - checkUncomparableType(obj.getExpression()); - validateCompareElements(obj); - } - - public void visit(CompareCriteria obj) { = - validateCompareCriteria(obj); - } - - private void validateCompareCriteria(AbstractCompareCriteria obj) { - checkUncomparableTypes(obj.getLeftExpression(), obj.getRightExpres= sion()); - validateCompareElements(obj); - } - - public void visit(IsNullCriteria obj) { - validateCompareElements(obj); - } - - public void visit(MatchCriteria obj) { - validateLikeElements(obj); - } - - public void visit(SetCriteria obj) { - checkUncomparableType(obj.getExpression()); - validateCompareElements(obj); - } - - public void visit(SubquerySetCriteria obj) { - checkUncomparableType(obj.getExpression()); - validateCompareElements(obj); - } - - public void visit(DependentSetCriteria obj) { - checkUncomparableType(obj.getExpression()); - validateCompareElements(obj); - } - = - public void visit(SubqueryCompareCriteria obj) { - validateCompareCriteria(obj); - } - - protected void validateCompareElements(Criteria obj) { - if(isXML) { - return; - } - - Collection elements =3D ElementCollectorVisitor.getElements(obj, t= rue); = - Collection badCompareVars =3D validateElementsSupport(filterPhysic= alElements(elements), SupportConstants.Element.SEARCHABLE_COMPARE ); - - if(badCompareVars !=3D null) { - handleValidationError(QueryPlugin.Util.getString("ValidateCrit= eriaVistitor.element_not_comparable", badCompareVars), badCompareVars); //$= NON-NLS-1$ - } - } - - private void checkUncomparableType(Expression expression) { - if(ValidationVisitor.isNonComparable(expression)) { - handleValidationError(QueryPlugin.Util.getString(ErrorMessageK= eys.VALIDATOR_0027, expression), expression); = - } - } - - private void checkUncomparableTypes(Expression leftExpr, Expression ri= ghtExpr) { - List uncomparableExpr =3D null; - if(ValidationVisitor.isNonComparable(leftExpr)) { - uncomparableExpr =3D new ArrayList(); - uncomparableExpr.add(leftExpr); - } - if(ValidationVisitor.isNonComparable(rightExpr)) { - if(uncomparableExpr =3D=3D null) { - uncomparableExpr =3D new ArrayList(); - } - uncomparableExpr.add(rightExpr); - } - = - if(uncomparableExpr !=3D null) { - handleValidationError(QueryPlugin.Util.getString(ErrorMessageK= eys.VALIDATOR_0027, uncomparableExpr), uncomparableExpr); = = - } - } - - protected void validateLikeElements(MatchCriteria obj) { - if(isXML) { - return; - } - - Collection badLikeVars =3D validateElementsSupport( - filterPhysicalElements(ElementCollectorVisitor.getElements(obj= .getLeftExpression(), true)), - SupportConstants.Element.SEARCHABLE_LIKE ); - - if(badLikeVars !=3D null) { - handleValidationError(QueryPlugin.Util.getString(ErrorMessageK= eys.VALIDATOR_0028, badLikeVars), badLikeVars); - } - } - - /** - * Filter out physical elements as criteria restrictions on physical e= lements = - * are stating the capabilities of the source, not access restrictions. - * @param elements Collection of ElementSymbol - * @return Collection of ElementSymbol with physical elements filtered= out = - */ - private Collection filterPhysicalElements(Collection allElements) { - List filtered =3D new ArrayList(); - - try { = - Iterator iter =3D allElements.iterator(); - while(iter.hasNext()) { - ElementSymbol elem =3D (ElementSymbol) iter.next(); - GroupSymbol group =3D elem.getGroupSymbol(); = = - if(getMetadata().isVirtualGroup(group.getMetadataID())) { - filtered.add(elem); = - } - } - } catch(QueryMetadataException e) { - handleException(e); - } catch(MetaMatrixComponentException e) { - handleException(e); - } = - - return filtered; - } - -} Modified: trunk/engine/src/main/java/com/metamatrix/query/validator/Validat= ionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVis= itor.java 2009-02-25 20:18:40 UTC (rev 502) +++ trunk/engine/src/main/java/com/metamatrix/query/validator/ValidationVis= itor.java 2009-02-25 21:59:42 UTC (rev 503) @@ -231,6 +231,9 @@ } = public void visit(SubquerySetCriteria obj) { + if (isNonComparable(obj.getExpression())) { + handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VALID= ATOR_0027),obj); + } this.validateRowLimitFunctionNotInInvalidCriteria(obj); = Collection projSymbols =3D obj.getCommand().getProjectedSymbols(); @@ -957,6 +960,9 @@ * @since 4.3 */ public void visit(BetweenCriteria obj) { + if (isNonComparable(obj.getExpression())) { + handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VA= LIDATOR_0027),obj); = + } this.validateRowLimitFunctionNotInInvalidCriteria(obj); } = @@ -989,6 +995,9 @@ * @since 4.3 */ public void visit(SetCriteria obj) { + if (isNonComparable(obj.getExpression())) { + handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VA= LIDATOR_0027),obj); = + } this.validateRowLimitFunctionNotInInvalidCriteria(obj); } = @@ -997,6 +1006,9 @@ * @since 4.3 */ public void visit(SubqueryCompareCriteria obj) { + if (isNonComparable(obj.getLeftExpression())) { + handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VA= LIDATOR_0027),obj); = + } this.validateRowLimitFunctionNotInInvalidCriteria(obj); } = @@ -1043,5 +1055,12 @@ handleValidationError(QueryPlugin.Util.getString("ValidationVi= sitor.drop_of_nontemptable", drop.getTable()), drop); //$NON-NLS-1$ } } + = + @Override + public void visit(CompareCriteria obj) { + if (isNonComparable(obj.getLeftExpression())) { + handleValidationError(QueryPlugin.Util.getString(ErrorMessageKeys.VA= LIDATOR_0027),obj); = + } + } = } Modified: trunk/engine/src/main/java/com/metamatrix/query/validator/Validat= or.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/validator/Validator.jav= a 2009-02-25 20:18:40 UTC (rev 502) +++ trunk/engine/src/main/java/com/metamatrix/query/validator/Validator.jav= a 2009-02-25 21:59:42 UTC (rev 503) @@ -44,10 +44,6 @@ throws MetaMatrixComponentException { = ValidatorReport report1 =3D Validator.validate(object, metadata, n= ew ValidationVisitor(), false); - if (validateCriteria) { - ValidatorReport report2 =3D Validator.validate(object, metadat= a, new ValidateCriteriaVisitor(), true); - report1.addItems(report2.getItems()); - } return report1; } = Deleted: trunk/engine/src/test/java/com/metamatrix/query/validator/TestCrit= eriaValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/validator/TestCriteriaV= alidator.java 2009-02-25 20:18:40 UTC (rev 502) +++ trunk/engine/src/test/java/com/metamatrix/query/validator/TestCriteriaV= alidator.java 2009-02-25 21:59:42 UTC (rev 503) @@ -1,48 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.query.validator; - -import junit.framework.TestCase; - -public class TestCriteriaValidator extends TestCase { - - public TestCriteriaValidator(String name) { = - super(name); - } = - = - public void testClobEquals() { - TestValidator.helpValidate("SELECT * FROM test.group where e4 =3D = '1'", new String[] {"e4", "'1'"}, TestValidator.exampleMetadata2()); //$NON= -NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } - = - /** - * Should not fail since the update changing set is not really criter= ia - */ - public void testUpdateWithClob() { - TestValidator.helpValidate("update test.group set e4 =3D ?", new S= tring[] {}, TestValidator.exampleMetadata2()); //$NON-NLS-1$ = - } - - public void testBlobLessThan() { - TestValidator.helpValidate("SELECT * FROM test.group where e3 < ?"= , new String[] {"e3", "?"}, TestValidator.exampleMetadata2()); //$NON-NLS-1= $ //$NON-NLS-2$ //$NON-NLS-3$ - } - = -} Modified: trunk/engine/src/test/java/com/metamatrix/query/validator/TestVal= idator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator= .java 2009-02-25 20:18:40 UTC (rev 502) +++ trunk/engine/src/test/java/com/metamatrix/query/validator/TestValidator= .java 2009-02-25 21:59:42 UTC (rev 503) @@ -54,16 +54,8 @@ import com.metamatrix.query.resolver.QueryResolver; import com.metamatrix.query.sql.LanguageObject; import com.metamatrix.query.sql.lang.Command; -import com.metamatrix.query.sql.lang.CompareCriteria; -import com.metamatrix.query.sql.lang.From; -import com.metamatrix.query.sql.lang.Query; import com.metamatrix.query.sql.lang.SPParameter; -import com.metamatrix.query.sql.lang.Select; -import com.metamatrix.query.sql.symbol.Constant; import com.metamatrix.query.sql.symbol.ElementSymbol; -import com.metamatrix.query.sql.symbol.Expression; -import com.metamatrix.query.sql.symbol.ExpressionSymbol; -import com.metamatrix.query.sql.symbol.Function; import com.metamatrix.query.sql.symbol.GroupSymbol; import com.metamatrix.query.sql.visitor.SQLStringVisitor; import com.metamatrix.query.unittest.FakeMetadataFacade; @@ -362,14 +354,12 @@ try { ValidatorReport report =3D Validator.validate(command, metadat= a); //System.out.println("\nReport =3D \n" + report); - ValidatorReport report2 =3D Validator.validate(command, metada= ta, new ValidateCriteriaVisitor(), true); = ValidatorReport report3 =3D Validator.validate(command, metada= ta, new ValueValidationVisitor(), true); = // Get invalid objects from report Collection actualObjs =3D new ArrayList(); report.collectInvalidObjects(actualObjs); - report2.collectInvalidObjects(actualObjs); report3.collectInvalidObjects(actualObjs); = // Compare expected and actual objects @@ -382,7 +372,7 @@ } = if(expectedStrings.size() =3D=3D 0 && actualStrings.size() > 0= ) { - fail("Expected no failures but got some: " + report.getFai= lureMessage() + ", " + report2.getFailureMessage() + ", " + report3.getFail= ureMessage()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ = + fail("Expected no failures but got some: " + report.getFai= lureMessage() + ", " + report3.getFailureMessage()); //$NON-NLS-1$ //$NON-= NLS-2$ //$NON-NLS-3$ = } else if(actualStrings.size() =3D=3D 0 && expectedStrings.siz= e() > 0) { fail("Expected some failures but got none for sql =3D " + = command); //$NON-NLS-1$ } else { @@ -454,47 +444,31 @@ } = public void testValidateCompare1() { = - helpValidate("SELECT e2 FROM vTest.vMap WHERE e2 =3D 'a'", new Str= ing[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ + helpValidate("SELECT e2 FROM vTest.vMap WHERE e2 =3D 'a'", new Str= ing[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ } = - public void testValidateCompare2() { = - helpValidate("SELECT e2 FROM vTest.vMap WHERE e2 IS NULL", new Str= ing[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ - } - - public void testValidateCompare3() { = - helpValidate("SELECT e2 FROM vTest.vMap WHERE e2 IN ('a')", new St= ring[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ - } - public void testValidateCompare4() { = - helpValidate("SELECT e3 FROM vTest.vMap WHERE e3 LIKE 'a'", new St= ring[] {"e3"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ + helpValidate("SELECT e3 FROM vTest.vMap WHERE e3 LIKE 'a'", new St= ring[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ } = - public void testValidateCompare5() { = - helpValidate("SELECT e2 FROM vTest.vMap WHERE e2 BETWEEN 1000 AND = 2000", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ - } - public void testValidateCompare6() { = helpValidate("SELECT e0 FROM vTest.vMap WHERE e0 BETWEEN 1000 AND = 2000", new String[] {}, exampleMetadata()); //$NON-NLS-1$ } = - public void testValidateCompareInHaving1() { = - helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 =3D = 'a'", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ - } - public void testValidateCompareInHaving2() { = - helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 IS N= ULL", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ + helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 IS N= ULL", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testValidateCompareInHaving3() { = - helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 IN (= 'a')", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ + helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 IN (= 'a')", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testValidateCompareInHaving4() { = - helpValidate("SELECT e3 FROM vTest.vMap GROUP BY e3 HAVING e3 LIKE= 'a'", new String[] {"e3"}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ + helpValidate("SELECT e3 FROM vTest.vMap GROUP BY e3 HAVING e3 LIKE= 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testValidateCompareInHaving5() { = - helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 BETW= EEN 1000 AND 2000", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ = //$NON-NLS-2$ + helpValidate("SELECT e2 FROM vTest.vMap GROUP BY e2 HAVING e2 BETW= EEN 1000 AND 2000", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$N= ON-NLS-2$ } = public void testInvalidAggregate1() { = @@ -1048,11 +1022,11 @@ } = = public void testValidateSubquery1() { = - helpValidate("SELECT e2 FROM (SELECT e2 FROM vTest.vMap WHERE e2 = =3D 'a') AS x", new String[] {"e2"}, exampleMetadata()); //$NON-NLS-1$ //$N= ON-NLS-2$ + helpValidate("SELECT e2 FROM (SELECT e2 FROM vTest.vMap WHERE e2 = =3D 'a') AS x", new String[] {}, exampleMetadata()); //$NON-NLS-1$ //$NON-N= LS-2$ } = public void testValidateSubquery2() { = - helpValidate("SELECT e2 FROM (SELECT e3 FROM vTest.vMap) AS x, vTe= st.vMap WHERE e2 =3D 'a'", new String[] {"e2"}, exampleMetadata()); //$NON-= NLS-1$ //$NON-NLS-2$ + helpValidate("SELECT e2 FROM (SELECT e3 FROM vTest.vMap) AS x, vTe= st.vMap WHERE e2 =3D 'a'", new String[] {}, exampleMetadata()); //$NON-NLS-= 1$ //$NON-NLS-2$ } = public void testValidateSubquery3() { = @@ -1064,11 +1038,11 @@ } = public void testValidateExistsSubquery() { = - helpValidate("SELECT e2 FROM test.group2 WHERE EXISTS (SELECT e2 F= ROM vTest.vMap WHERE e2 =3D 'a')", new String[] {"e2"}, exampleMetadata());= //$NON-NLS-1$ //$NON-NLS-2$ + helpValidate("SELECT e2 FROM test.group2 WHERE EXISTS (SELECT e2 F= ROM vTest.vMap WHERE e2 =3D 'a')", new String[] {}, exampleMetadata()); //$= NON-NLS-1$ //$NON-NLS-2$ } = public void testValidateScalarSubquery() { = - helpValidate("SELECT e2, (SELECT e1 FROM vTest.vMap WHERE e2 =3D '= 3') FROM test.group2", new String[] {"e1", "e2"}, exampleMetadata()); //$NO= N-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + helpValidate("SELECT e2, (SELECT e1 FROM vTest.vMap WHERE e2 =3D '= 3') FROM test.group2", new String[] {"e1"}, exampleMetadata()); //$NON-NLS-= 1$ //$NON-NLS-2$ //$NON-NLS-3$ } = public void testValidateAnyCompareSubquery() { = @@ -1662,71 +1636,8 @@ = public void testValidateObjectInComparison() throws Exception { String sql =3D "SELECT IntKey FROM BQT1.SmallA WHERE ObjectValue = =3D 5"; //$NON-NLS-1$ - FakeMetadataFacade metadata =3D FakeMetadataFactory.exampleBQTCach= ed(); - String[] expectedStringArray =3D new String[] { "ObjectValue", "'x= yz'"}; //$NON-NLS-1$ //$NON-NLS-2$ - = - // Parse and modify to add object literal - this is a hack to set = up this test = - // which would really be done using a prepared statement in the se= rver (with setObject()). = - Query command =3D (Query) QueryParser.getQueryParser().parseComman= d(sql); - CompareCriteria crit =3D (CompareCriteria) command.getCriteria(); - crit.setRightExpression(new Constant("xyz", Object.class)); //$NON= -NLS-1$ - = - // Resolve - QueryResolver.resolveCommand(command, metadata); - = - // Validate - ValidatorReport report =3D Validator.validate(command, metadata, n= ew ValidateCriteriaVisitor(), true); - Collection actualObjs =3D new ArrayList(); - report.collectInvalidObjects(actualObjs); - - // Compare expected and actual objects - Set expectedStrings =3D new HashSet(Arrays.asList(expectedStringAr= ray)); - Set actualStrings =3D new HashSet(); - Iterator objIter =3D actualObjs.iterator(); - while(objIter.hasNext()) { - LanguageObject obj =3D (LanguageObject) objIter.next(); - actualStrings.add(SQLStringVisitor.getSQLString(obj)); - } - - if(expectedStrings.size() =3D=3D 0 && actualStrings.size() > 0) { - fail("Expected no failures but got some: " + report.getFailure= Message()); //$NON-NLS-1$ = - } else if(actualStrings.size() =3D=3D 0 && expectedStrings.size() = > 0) { - fail("Expected some failures but got none for sql =3D " + comm= and); //$NON-NLS-1$ - } else { - assertEquals("Expected and actual sets of strings are not the = same: ", expectedStrings, actualStrings); //$NON-NLS-1$ - } = } = - public void testValidateObjectInFunction() throws Exception { - FakeMetadataFacade metadata =3D FakeMetadataFactory.exampleBQTCach= ed(); - = - Query query =3D new Query(); = - Select select =3D new Select(); - select.addSymbol(new ExpressionSymbol("e1", new Constant("x"))); = //$NON-NLS-1$//$NON-NLS-2$ - query.setSelect(select); = - = - GroupSymbol group =3D new GroupSymbol("BQT1.SmallA"); //$NON-NLS-1$ - group.setMetadataID(metadata.getGroupID(group.getName())); - From from =3D new From(); - from.addGroup(group); - query.setFrom(from); - = - CompareCriteria crit =3D new CompareCriteria(); - ElementSymbol elem =3D new ElementSymbol("BQT1.SmallA.ObjectValue"= ); //$NON-NLS-1$ - elem.setMetadataID(metadata.getElementID(elem.getName())); - elem.setType(Object.class); - elem.setGroupSymbol(group); - Function f =3D new Function("fake", new Expression[] { elem }); //= $NON-NLS-1$ - f.setType(Integer.class); = - crit.setLeftExpression(f); - crit.setRightExpression(new Constant(new Integer(5))); - query.setCriteria(crit); = - = - // Validate - ValidatorReport report =3D Validator.validate(query, metadata, new= ValidateCriteriaVisitor(), true); - assertEquals(0, report.getItems().size()); - } = - public void testValidateAssignmentWithFunctionOnParameter_InServer() t= hrows Exception{ String sql =3D "EXEC pm1.vsp36(5)"; //$NON-NLS-1$ QueryMetadataInterface metadata =3D FakeMetadataFactory.example1Ca= ched(); @@ -1829,7 +1740,7 @@ QueryMetadataInterface metadata =3D FakeMetadataFactory.exampleBQT= Cached(); = // Validate - helpValidate(sql, new String[] {"BQT1.SmallA.ObjectValue", "BQT2.S= mallB.ObjectValue"}, metadata); //$NON-NLS-1$ //$NON-NLS-2$ + helpValidate(sql, new String[] {"BQT1.SmallA.ObjectValue =3D BQT2.= SmallB.ObjectValue"}, metadata); //$NON-NLS-1$ //$NON-NLS-2$ } = public void testDefect16772() throws Exception{ @@ -2091,5 +2002,36 @@ Command command =3D helpResolve(procedure, metadata); helpRunValidator(command, new String[] {"variables"}, metadata); /= /$NON-NLS-1$ } + = + public void testClobEquals() { + TestValidator.helpValidate("SELECT * FROM test.group where e4 =3D = '1'", new String[] {"e4 =3D '1'"}, TestValidator.exampleMetadata2()); //$NO= N-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + = + /** + * Should not fail since the update changing set is not really criter= ia + */ + public void testUpdateWithClob() { + TestValidator.helpValidate("update test.group set e4 =3D ?", new S= tring[] {}, TestValidator.exampleMetadata2()); //$NON-NLS-1$ = + } = + public void testBlobLessThan() { + TestValidator.helpValidate("SELECT * FROM test.group where e3 < ?"= , new String[] {"e3 < ?"}, TestValidator.exampleMetadata2()); //$NON-NLS-1$= //$NON-NLS-2$ //$NON-NLS-3$ + } + = + public void testValidateCompare2() { = + helpValidate("SELECT e2 FROM test.group WHERE e4 IS NULL", new Str= ing[] {}, exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testValidateCompare3() { = + helpValidate("SELECT e2 FROM test.group WHERE e4 IN ('a')", new St= ring[] {"e4 IN ('a')"}, exampleMetadata2()); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public void testValidateCompare5() { = + helpValidate("SELECT e2 FROM test.group WHERE e4 BETWEEN '1' AND '= 2'", new String[] {"e4 BETWEEN '1' AND '2'"}, exampleMetadata2()); //$NON-N= LS-1$ //$NON-NLS-2$ + } + = + public void testValidateCompareInHaving1() { = + helpValidate("SELECT e1 FROM test.group GROUP BY e1 HAVING convert= (e1, clob) =3D 'a'", new String[] {"convert(e1, clob) =3D 'a'"}, exampleMet= adata2()); //$NON-NLS-1$ //$NON-NLS-2$ + } + } --===============5818052621730563068==-- From teiid-commits at lists.jboss.org Wed Feb 25 20:02:43 2009 Content-Type: multipart/mixed; boundary="===============3605470490867662651==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r504 - in trunk: common-internal/src/main/java/com/metamatrix/common/config and 8 other directories. Date: Wed, 25 Feb 2009 20:02:42 -0500 Message-ID: --===============3605470490867662651== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-25 20:02:42 -0500 (Wed, 25 Feb 2009) New Revision: 504 Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java trunk/common-internal/src/main/java/com/metamatrix/common/config/Current= Configuration.java trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Hos= tType.java trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/ru= ntime/HostData.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringA= dminImpl.java trunk/server/src/main/java/com/metamatrix/platform/admin/api/runtime/Sys= temStateBuilder.java trunk/server/src/main/java/com/metamatrix/platform/registry/HostControll= erRegistryBinding.java trunk/server/src/main/java/com/metamatrix/server/HostController.java trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeStateA= dminAPIHelper.java trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigA= dminImpl.java trunk/server/src/test/java/com/metamatrix/platform/registry/FakeRegistry= Util.java trunk/server/src/test/java/com/metamatrix/platform/registry/TestClustere= dRegistryState.java Log: TEIID-309: adding host properties to Host object, so that they can be viewe= d by the client applications such as Admin API. Modified: trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java 2= 009-02-25 21:59:42 UTC (rev 503) +++ trunk/client/src/main/java/com/metamatrix/admin/api/objects/Host.java 2= 009-02-26 01:02:42 UTC (rev 504) @@ -28,7 +28,7 @@ * Represents a host in the MetaMatrix system. * *

The identifier pattern for a host is "hostName". - * A hostName is concidered to be unique across the system.

+ * A hostName is considered to be unique across the system.

* @since 4.3 */ public interface Host extends AdminObject { @@ -44,11 +44,6 @@ public static final String LOG_DIRECTORY =3D "metamatrix.log.dir"; //$= NON-NLS-1$ = = /** - * Data Directory Property - */ - public static final String DATA_DIRECTORY =3D "metamatrix.data.dir"; /= /$NON-NLS-1$ - = - /** * Host Directory Property */ public static final String HOST_DIRECTORY =3D "metamatrix.host.dir"; /= /$NON-NLS-1$ = Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= CurrentConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/Curren= tConfiguration.java 2009-02-25 21:59:42 UTC (rev 503) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/Curren= tConfiguration.java 2009-02-26 01:02:42 UTC (rev 504) @@ -217,7 +217,15 @@ public Host getDefaultHost() throws ConfigurationException { String name =3D getBootStrapProperties().getProperty(CONFIGURATION_NA= ME); BasicHost host =3D new BasicHost(new ConfigurationID(name), new HostI= D(name), new ComponentTypeID(name)); - host.setProperties(getBootStrapProperties()); + = + Properties props =3D new Properties(); + props.setProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, = getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.= INSTALL_DIR)); + props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTOR= Y, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Ho= st.HOST_DIRECTORY)); + props.setProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY= , getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Hos= t.LOG_DIRECTORY)); + props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADD= RESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects= .Host.HOST_BIND_ADDRESS)); + props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL= _ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.obj= ects.Host.HOST_PHYSICAL_ADDRESS)); + = + host.setProperties(props); return host; } = = Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= api/HostType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ho= stType.java 2009-02-25 21:59:42 UTC (rev 503) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/api/Ho= stType.java 2009-02-26 01:02:42 UTC (rev 504) @@ -34,8 +34,6 @@ = public static final String LOG_DIRECTORY =3D com.metamatrix.admin.api.= objects.Host.LOG_DIRECTORY; = - public static final String DATA_DIRECTORY =3D com.metamatrix.admin.api= .objects.Host.DATA_DIRECTORY; - = public static final String HOST_DIRECTORY =3D com.metamatrix.admin.api= .objects.Host.HOST_DIRECTORY; = public static final String HOST_ENABLED =3D com.metamatrix.admin.api.o= bjects.Host.HOST_ENABLED; Modified: trunk/common-internal/src/main/java/com/metamatrix/platform/admin= /api/runtime/HostData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/HostData.java 2009-02-25 21:59:42 UTC (rev 503) +++ trunk/common-internal/src/main/java/com/metamatrix/platform/admin/api/r= untime/HostData.java 2009-02-26 01:02:42 UTC (rev 504) @@ -23,6 +23,7 @@ package com.metamatrix.platform.admin.api.runtime; = import java.util.Collection; +import java.util.Properties; = /** * This class contains information about a host that is running or deploye= d for this system @@ -31,6 +32,7 @@ = // Collection of ProcessData objects private Collection processes; + private Properties properties; = = /** @@ -38,9 +40,10 @@ * * @param hostName Name of host */ - public HostData(String hostName, Collection processes, boolean deploye= d, boolean registered) { + public HostData(String hostName, Collection processes, boolean deploye= d, boolean registered, Properties props) { super(hostName, deployed, registered); this.processes =3D processes; + this.properties =3D props; computeHashCode(); } = @@ -56,5 +59,9 @@ public Collection getProcesses() { return processes; } + = + public Properties getProperties() { + return this.properties; + } } = Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerMoni= toringAdminImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoring= AdminImpl.java 2009-02-25 21:59:42 UTC (rev 503) +++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoring= AdminImpl.java 2009-02-26 01:02:42 UTC (rev 504) @@ -503,13 +503,13 @@ host.setRunning(hostData.isRegistered()); host.setRegistered(hostData.isRegistered()); host.setDeployed(false); + host.setProperties(hostData.getProperties()); = runtimeMap.put(hostName.toUpperCase(), host); results.add(host); } } = - = //get config data from ConfigurationServiceProxy Collection hosts =3D getConfigurationServiceProxy().getHosts(); Modified: trunk/server/src/main/java/com/metamatrix/platform/admin/api/runt= ime/SystemStateBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/platform/admin/api/runtime/Sy= stemStateBuilder.java 2009-02-25 21:59:42 UTC (rev 503) +++ trunk/server/src/main/java/com/metamatrix/platform/admin/api/runtime/Sy= stemStateBuilder.java 2009-02-26 01:02:42 UTC (rev 504) @@ -29,6 +29,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Properties; = import com.metamatrix.common.config.CurrentConfiguration; import com.metamatrix.common.config.api.ComponentDefnID; @@ -82,7 +83,7 @@ = // Create a new HostData object for each running host. for (HostControllerRegistryBinding host:allHosts) { - hosts.add(createHostData(host.getHostName())); + hosts.add(createHostData(host)); hostIDs.add(new HostID(host.getHostName())); } = @@ -103,8 +104,10 @@ /** * Create a HostData object from the hostBinding. */ - private HostData createHostData(String hostName) throws Exception { + private HostData createHostData(HostControllerRegistryBinding host) th= rows Exception { = + String hostName =3D host.getHostName(); + = List vmBindings =3D this.registry.getVMs(hostName); List processes =3D new ArrayList(); Collection deployedVMs =3D null; @@ -134,8 +137,7 @@ boolean deployed =3D config.getHostIDs().contains(hostID); = boolean running =3D this.hostManagement.ping(hostName); - return new HostData(hostName, processes, deployed, running); - + return new HostData(hostName, processes, deployed, running, host.g= etProperties()); } = /** @@ -160,7 +162,7 @@ } = boolean running =3D this.hostManagement.ping(hostID.getFullName()); - return new HostData(hostID.getFullName(), processes, true, running= ); + return new HostData(hostID.getFullName(), processes, true, running= , new Properties()); } = = Modified: trunk/server/src/main/java/com/metamatrix/platform/registry/HostC= ontrollerRegistryBinding.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/platform/registry/HostControl= lerRegistryBinding.java 2009-02-25 21:59:42 UTC (rev 503) +++ trunk/server/src/main/java/com/metamatrix/platform/registry/HostControl= lerRegistryBinding.java 2009-02-26 01:02:42 UTC (rev 504) @@ -1,10 +1,11 @@ package com.metamatrix.platform.registry; = import java.io.Serializable; +import java.util.Properties; = import com.metamatrix.common.messaging.MessageBus; +import com.metamatrix.server.HostManagement; import com.metamatrix.server.ResourceFinder; -import com.metamatrix.server.HostManagement; = public class HostControllerRegistryBinding implements Serializable { = @@ -16,10 +17,13 @@ = private String hostName; = + private Properties hostProperties; = - public HostControllerRegistryBinding(String hostName, HostManagement c= ontroller, MessageBus bus) { + = + public HostControllerRegistryBinding(String hostName, Properties prope= rties, HostManagement controller, MessageBus bus) { this.messageBus =3D bus; = this.hostName =3D hostName; + this.hostProperties =3D properties; setHostController(controller); } = @@ -53,4 +57,8 @@ this.hostController =3D (HostManagement)bus.getRPCProxy(this.hostCont= rollerStub); return this.hostController; } = + = + public Properties getProperties() { + return new Properties(this.hostProperties); + } } Modified: trunk/server/src/main/java/com/metamatrix/server/HostController.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/HostController.java 20= 09-02-25 21:59:42 UTC (rev 503) +++ trunk/server/src/main/java/com/metamatrix/server/HostController.java 20= 09-02-26 01:02:42 UTC (rev 504) @@ -94,7 +94,7 @@ = Runtime.getRuntime().addShutdownHook(new ShutdownThread()); = = - this.monitor.hostAdded(new HostControllerRegistryBinding(this.host.getFu= llName(), this, this.messageBus)); + this.monitor.hostAdded(new HostControllerRegistryBinding(this.host.getFu= llName(), this.host.getProperties(), this, this.messageBus)); = if (startProcesses ) { try { Modified: trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntim= eStateAdminAPIHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeState= AdminAPIHelper.java 2009-02-25 21:59:42 UTC (rev 503) +++ trunk/server/src/test/java/com/metamatrix/admin/server/FakeRuntimeState= AdminAPIHelper.java 2009-02-26 01:02:42 UTC (rev 504) @@ -27,6 +27,7 @@ import java.util.Date; import java.util.HashSet; import java.util.List; +import java.util.Properties; import java.util.Set; = import com.metamatrix.admin.api.objects.AdminObject; @@ -240,14 +241,14 @@ VMControllerID vmControllerID1 =3D new VMControllerID(2, "2.2.2.2"= ); //$NON-NLS-1$ ProcessData process2 =3D new ProcessData(vmControllerID1, null, "2= .2.2.2", new ArrayList(), "process2", "31000", true, true); //$NON-NLS-1$ /= /$NON-NLS-2$ //$NON-NLS-3$ processes2.add(process2); = - HostData host2 =3D new HostData("2.2.2.2", processes2, true, true)= ; //$NON-NLS-1$ + HostData host2 =3D new HostData("2.2.2.2", processes2, true, true,= new Properties()); //$NON-NLS-1$ hosts.add(host2); = List processes3 =3D new ArrayList(); = VMControllerID vmControllerID3 =3D new VMControllerID(3, "3.3.3.3"= ); //$NON-NLS-1$ ProcessData process3 =3D new ProcessData(vmControllerID3, null, "3= .3.3.3", new ArrayList(), "process3", "31001", true, true); //$NON-NLS-1$ /= /$NON-NLS-2$ //$NON-NLS-3$ processes3.add(process3); = - HostData host3 =3D new HostData("3.3.3.3", processes3, true, true)= ; //$NON-NLS-1$ + HostData host3 =3D new HostData("3.3.3.3", processes3, true, true,= new Properties()); //$NON-NLS-1$ hosts.add(host3); = = Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServer= ConfigAdminImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfig= AdminImpl.java 2009-02-25 21:59:42 UTC (rev 503) +++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfig= AdminImpl.java 2009-02-26 01:02:42 UTC (rev 504) @@ -152,7 +152,7 @@ String hostIdentifier =3D BOGUS_HOST; = Properties hostProperties =3D new Properties(); hostProperties.setProperty(Host.INSTALL_DIR, "D:\\MetaMatrix\\s434= 01\\"); //$NON-NLS-1$ - hostProperties.setProperty(Host.DATA_DIRECTORY, "D:\\MetaMatrix\\s= 43401\\data"); //$NON-NLS-1$ + hostProperties.setProperty(Host.HOST_DIRECTORY, "D:\\MetaMatrix\\s= 43401\\host"); //$NON-NLS-1$ hostProperties.setProperty(Host.LOG_DIRECTORY, "D:\\MetaMatrix\\s4= 3401\\log"); //$NON-NLS-1$ hostProperties.setProperty(Host.HOST_ENABLED, "true"); //$NON-NLS-= 1$ admin.addHost(hostIdentifier, hostProperties); @@ -162,7 +162,7 @@ String hostIdentifier =3D BOGUS_HOST_IP; = Properties hostProperties =3D new Properties(); hostProperties.setProperty(Host.INSTALL_DIR, "D:\\MetaMatrix\\s434= 01\\"); //$NON-NLS-1$ - hostProperties.setProperty(Host.DATA_DIRECTORY, "D:\\MetaMatrix\\s= 43401\\data"); //$NON-NLS-1$ + hostProperties.setProperty(Host.HOST_DIRECTORY, "D:\\MetaMatrix\\s= 43401\\host"); //$NON-NLS-1$ hostProperties.setProperty(Host.LOG_DIRECTORY, "D:\\MetaMatrix\\s4= 3401\\log"); //$NON-NLS-1$ hostProperties.setProperty(Host.HOST_ENABLED, "true"); //$NON-NLS-= 1$ admin.addHost(hostIdentifier, hostProperties); @@ -172,7 +172,7 @@ String hostIdentifier =3D BOGUS_HOST_FULLY_QUALIFIED; = Properties hostProperties =3D new Properties(); hostProperties.setProperty(Host.INSTALL_DIR, "D:\\MetaMatrix\\s434= 01\\"); //$NON-NLS-1$ - hostProperties.setProperty(Host.DATA_DIRECTORY, "D:\\MetaMatrix\\s= 43401\\data"); //$NON-NLS-1$ + hostProperties.setProperty(Host.HOST_DIRECTORY, "D:\\MetaMatrix\\s= 43401\\host"); //$NON-NLS-1$ hostProperties.setProperty(Host.LOG_DIRECTORY, "D:\\MetaMatrix\\s4= 3401\\log"); //$NON-NLS-1$ hostProperties.setProperty(Host.HOST_ENABLED, "true"); //$NON-NLS-= 1$ admin.addHost(hostIdentifier, hostProperties); Modified: trunk/server/src/test/java/com/metamatrix/platform/registry/FakeR= egistryUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/platform/registry/FakeRegistr= yUtil.java 2009-02-25 21:59:42 UTC (rev 503) +++ trunk/server/src/test/java/com/metamatrix/platform/registry/FakeRegistr= yUtil.java 2009-02-26 01:02:42 UTC (rev 504) @@ -24,6 +24,7 @@ = import java.net.InetAddress; import java.util.Date; +import java.util.Properties; = import org.jboss.cache.notifications.annotation.CacheListener; import org.mockito.Mockito; @@ -134,7 +135,7 @@ } = static HostControllerRegistryBinding buildHostRegistryBinding(String name= ) { - return new HostControllerRegistryBinding(name, null, new NoOpMessageBus(= )); + return new HostControllerRegistryBinding(name, new Properties(), null, n= ew NoOpMessageBus()); } = } = Modified: trunk/server/src/test/java/com/metamatrix/platform/registry/TestC= lusteredRegistryState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/platform/registry/TestCluster= edRegistryState.java 2009-02-25 21:59:42 UTC (rev 503) +++ trunk/server/src/test/java/com/metamatrix/platform/registry/TestCluster= edRegistryState.java 2009-02-26 01:02:42 UTC (rev 504) @@ -24,6 +24,7 @@ = import java.util.Date; import java.util.List; +import java.util.Properties; = import junit.framework.TestCase; = @@ -308,6 +309,6 @@ } = static HostControllerRegistryBinding buildHostRegistryBinding(String name= ) { - return new HostControllerRegistryBinding(name, null, new NoOpMessageBus(= )); + return new HostControllerRegistryBinding(name, new Properties(), null, n= ew NoOpMessageBus()); } } --===============3605470490867662651==-- From teiid-commits at lists.jboss.org Wed Feb 25 22:20:05 2009 Content-Type: multipart/mixed; boundary="===============6686140163292136537==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r505 - in trunk: server/src/test/java/com/metamatrix/platform/config/spi/xml and 1 other directory. Date: Wed, 25 Feb 2009 22:19:01 -0500 Message-ID: --===============6686140163292136537== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-25 22:19:01 -0500 (Wed, 25 Feb 2009) New Revision: 505 Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/Current= Configuration.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCu= rrentConfiguration.java Log: TEIID-309: adding host properties to Host object, so that they can be viewe= d by the client applications such as Admin API. Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= CurrentConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/Curren= tConfiguration.java 2009-02-26 01:02:42 UTC (rev 504) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/Curren= tConfiguration.java 2009-02-26 03:19:01 UTC (rev 505) @@ -216,14 +216,14 @@ */ public Host getDefaultHost() throws ConfigurationException { String name =3D getBootStrapProperties().getProperty(CONFIGURATION_NA= ME); - BasicHost host =3D new BasicHost(new ConfigurationID(name), new HostI= D(name), new ComponentTypeID(name)); + BasicHost host =3D new BasicHost(new ConfigurationID(name), new HostI= D(name), Host.HOST_COMPONENT_TYPE_ID); = Properties props =3D new Properties(); - props.setProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, = getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.= INSTALL_DIR)); - props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTOR= Y, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Ho= st.HOST_DIRECTORY)); - props.setProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY= , getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Hos= t.LOG_DIRECTORY)); - props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADD= RESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects= .Host.HOST_BIND_ADDRESS)); - props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL= _ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.obj= ects.Host.HOST_PHYSICAL_ADDRESS)); + props.setProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, = getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.= INSTALL_DIR, "")); //$NON-NLS-1$ + props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTOR= Y, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Ho= st.HOST_DIRECTORY, "")); //$NON-NLS-1$ + props.setProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY= , getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Hos= t.LOG_DIRECTORY, "")); //$NON-NLS-1$ + props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADD= RESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects= .Host.HOST_BIND_ADDRESS, "")); //$NON-NLS-1$ + props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL= _ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.obj= ects.Host.HOST_PHYSICAL_ADDRESS, "")); //$NON-NLS-1$ = host.setProperties(props); return host; Modified: trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml= /TestCurrentConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestC= urrentConfiguration.java 2009-02-26 01:02:42 UTC (rev 504) +++ trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestC= urrentConfiguration.java 2009-02-26 03:19:01 UTC (rev 505) @@ -113,8 +113,8 @@ printMsg("Starting testCurrentHost"); //$NON-NLS-1$ = try { + System.setProperty(CurrentConfiguration.CONFIGURATION_NAME, "Dumm= yHost"); //$NON-NLS-1$ //$NON-NLS-2$ System.setProperty("metamatrix.vmname", "MetaMatrixProcess"); = //$NON-NLS-1$ //$NON-NLS-2$ - VMNaming.setup("DummyHost", null, null); //$NON-NLS-1$ = init(CONFIG_FILE); = --===============6686140163292136537==-- From teiid-commits at lists.jboss.org Thu Feb 26 10:31:31 2009 Content-Type: multipart/mixed; boundary="===============0722573289457790400==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r506 - trunk/documentation/reference/src/main/docbook/en-US/content. Date: Thu, 26 Feb 2009 10:31:30 -0500 Message-ID: --===============0722573289457790400== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-26 10:31:30 -0500 (Thu, 26 Feb 2009) New Revision: 506 Modified: trunk/documentation/reference/src/main/docbook/en-US/content/scalar_func= tions.xml Log: TEIID-382 adding missing functions Modified: trunk/documentation/reference/src/main/docbook/en-US/content/scal= ar_functions.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/reference/src/main/docbook/en-US/content/scalar_fun= ctions.xml 2009-02-26 03:19:01 UTC (rev 505) +++ trunk/documentation/reference/src/main/docbook/en-US/content/scalar_fun= ctions.xml 2009-02-26 15:31:30 UTC (rev 506) @@ -448,6 +448,50 @@ x in {double}, return type is double + + + BITAND(x, y) + + + Bitwise AND of x and y + + + x, y in {integer}, return type is integer + + + + + BITOR(x, y) + + + Bitwise OR of x and y + + + x, y in {integer}, return type is integer + + + + + BITXOR(x, y) + + + Bitwise XOR of x and y + + + x, y in {integer}, return type is integer + + + + + BITNOT(x) + + + Bitwise NOT of x + + + x in {integer}, return type is integer + + @@ -1168,6 +1212,17 @@ + QUARTER(x) + + + Return quarter + + + x in {date, timestamp}, returns integer + + + + PARSEDATE(x, y) --===============0722573289457790400==-- From teiid-commits at lists.jboss.org Thu Feb 26 13:10:22 2009 Content-Type: multipart/mixed; boundary="===============0537458322880105300==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r507 - in trunk: server/src/main/java/com/metamatrix/admin/server and 1 other directories. Date: Thu, 26 Feb 2009 13:10:22 -0500 Message-ID: --===============0537458322880105300== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-26 13:10:22 -0500 (Thu, 26 Feb 2009) New Revision: 507 Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Deplo= yedHostPanel.java trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoringA= dminImpl.java trunk/server/src/main/java/com/metamatrix/platform/registry/HostControll= erRegistryBinding.java Log: TEIID-309: adding host properties to Host object, so that they can be viewe= d by the client applications such as Admin API. Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deplo= y/DeployedHostPanel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Depl= oyedHostPanel.java 2009-02-26 15:31:30 UTC (rev 506) +++ trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/Depl= oyedHostPanel.java 2009-02-26 18:10:22 UTC (rev 507) @@ -44,11 +44,13 @@ import javax.swing.event.DocumentListener; import javax.swing.table.TableColumn; = +import com.metamatrix.admin.api.server.ServerAdmin; import com.metamatrix.common.config.api.ConfigurationID; import com.metamatrix.common.config.api.Host; import com.metamatrix.common.config.api.HostID; import com.metamatrix.common.config.api.VMComponentDefn; import com.metamatrix.common.config.api.VMComponentDefnType; +import com.metamatrix.common.config.model.BasicHost; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.object.PropertiedObject; import com.metamatrix.common.object.PropertiedObjectEditor; @@ -497,18 +499,19 @@ try { if (theDomainObject =3D=3D null) { // this shouldn't happen since new hosts are created elsew= here - host =3D getConfigurationManager().createHost(getString( - "dhp.newhost")); //$NON-NLS-1$ + host =3D getConfigurationManager().createHost(getString("d= hp.newhost")); //$NON-NLS-1$ } else { if (theDomainObject instanceof Host) { host =3D (Host)theDomainObject; + ServerAdmin admin =3D getConnectionInfo().getServerAdm= in(); + Collection admi= nHosts =3D admin.getHosts(host.getFullName()); + for (com.metamatrix.admin.api.objects.Host adminHost:a= dminHosts) { + ((BasicHost)host).setProperties(adminHost.getProperti= es()); + } } else { - throw new IllegalArgumentException( - getString("msg.invalidclass", //$NON-NLS-1$ - new Object[] {"Host", //$NON-NLS-1$ - theDomainObject.getClass()= })); + throw new IllegalArgumentException(getString("msg.inva= lidclass", new Object[] {"Host", theDomainObject.getClass()})); //$NON-NLS-= 1$ //$NON-NLS-2$ } } = Modified: trunk/server/src/main/java/com/metamatrix/admin/server/ServerMoni= toringAdminImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoring= AdminImpl.java 2009-02-26 15:31:30 UTC (rev 506) +++ trunk/server/src/main/java/com/metamatrix/admin/server/ServerMonitoring= AdminImpl.java 2009-02-26 18:10:22 UTC (rev 507) @@ -540,8 +540,12 @@ host.setEnabled(hostObject.isEnabled()); = Properties properties =3D hostObject.getProperties(); - - host.setProperties(properties); + if (host.getProperties() !=3D null) { + host.getProperties().putAll(properties); + } + else { + host.setProperties(properties); + } host.setDeployed(true); = results.add(host); Modified: trunk/server/src/main/java/com/metamatrix/platform/registry/HostC= ontrollerRegistryBinding.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/platform/registry/HostControl= lerRegistryBinding.java 2009-02-26 15:31:30 UTC (rev 506) +++ trunk/server/src/main/java/com/metamatrix/platform/registry/HostControl= lerRegistryBinding.java 2009-02-26 18:10:22 UTC (rev 507) @@ -59,6 +59,8 @@ } = = public Properties getProperties() { - return new Properties(this.hostProperties); + Properties p =3D new Properties(); + p.putAll(this.hostProperties); + return p; } } --===============0537458322880105300==-- From teiid-commits at lists.jboss.org Thu Feb 26 13:10:59 2009 Content-Type: multipart/mixed; boundary="===============3649548551360201315==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r508 - trunk/common-internal/src/main/java/com/metamatrix/common/config. Date: Thu, 26 Feb 2009 13:10:59 -0500 Message-ID: --===============3649548551360201315== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-26 13:10:59 -0500 (Thu, 26 Feb 2009) New Revision: 508 Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/Current= Configuration.java Log: TEIID-309: adding host properties to Host object, so that they can be viewe= d by the client applications such as Admin API. Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= CurrentConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/Curren= tConfiguration.java 2009-02-26 18:10:22 UTC (rev 507) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/Curren= tConfiguration.java 2009-02-26 18:10:59 UTC (rev 508) @@ -28,7 +28,6 @@ import java.util.Properties; = import com.metamatrix.common.CommonPlugin; -import com.metamatrix.common.config.api.ComponentTypeID; import com.metamatrix.common.config.api.Configuration; import com.metamatrix.common.config.api.ConfigurationID; import com.metamatrix.common.config.api.ConfigurationModelContainer; @@ -219,9 +218,9 @@ BasicHost host =3D new BasicHost(new ConfigurationID(name), new HostI= D(name), Host.HOST_COMPONENT_TYPE_ID); = Properties props =3D new Properties(); - props.setProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, = getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.= INSTALL_DIR, "")); //$NON-NLS-1$ - props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTOR= Y, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Ho= st.HOST_DIRECTORY, "")); //$NON-NLS-1$ - props.setProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY= , getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Hos= t.LOG_DIRECTORY, "")); //$NON-NLS-1$ + props.setProperty(com.metamatrix.admin.api.objects.Host.INSTALL_DIR, = getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Host.= INSTALL_DIR, System.getProperty("user.dir"))); //$NON-NLS-1$ + props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_DIRECTOR= Y, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Ho= st.HOST_DIRECTORY, System.getProperty("user.dir"))); //$NON-NLS-1$ + props.setProperty(com.metamatrix.admin.api.objects.Host.LOG_DIRECTORY= , getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects.Hos= t.LOG_DIRECTORY, System.getProperty("user.dir"))); //$NON-NLS-1$ props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_BIND_ADD= RESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.objects= .Host.HOST_BIND_ADDRESS, "")); //$NON-NLS-1$ props.setProperty(com.metamatrix.admin.api.objects.Host.HOST_PHYSICAL= _ADDRESS, getBootStrapProperties().getProperty(com.metamatrix.admin.api.obj= ects.Host.HOST_PHYSICAL_ADDRESS, "")); //$NON-NLS-1$ = --===============3649548551360201315==-- From teiid-commits at lists.jboss.org Thu Feb 26 14:44:07 2009 Content-Type: multipart/mixed; boundary="===============0274376773444400351==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r509 - in trunk: client/src/main/java/com/metamatrix/common/comm/platform/socket/client and 4 other directories. Date: Thu, 26 Feb 2009 14:44:07 -0500 Message-ID: --===============0274376773444400351== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-26 14:44:06 -0500 (Thu, 26 Feb 2009) New Revision: 509 Added: trunk/client/src/main/resources/teiid-client-settings.properties Removed: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/Pr= intStreamSocketLog.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/So= cketLog.java Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/So= cketUtil.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/SocketServerConnection.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/SocketServerConnectionFactory.java trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/cl= ient/SocketServerInstanceImpl.java trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/cl= ient/TestSocketServerConnection.java trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/cl= ient/TestSocketServerInstanceImpl.java trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/se= rver/SocketClientInstance.java trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/se= rver/SocketListener.java trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/se= rver/TestSocketRemoting.java Log: TEIID-385 removing socket log also added default teiid-client-settings.prop= erties Deleted: trunk/client/src/main/java/com/metamatrix/common/comm/platform/soc= ket/PrintStreamSocketLog.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/P= rintStreamSocketLog.java 2009-02-26 18:10:59 UTC (rev 508) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/P= rintStreamSocketLog.java 2009-02-26 19:44:06 UTC (rev 509) @@ -1,242 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.common.comm.platform.socket; - -import java.io.PrintStream; - -/** - * Writes log messages to a PrintStream. - */ -public class PrintStreamSocketLog implements SocketLog{ - private PrintStream stream; - private String staticContext; - = - private int logLevel =3D SocketLog.NONE; - = - public PrintStreamSocketLog(PrintStream stream, String staticContext, = int logLevel) { - this.stream =3D stream; - this.staticContext =3D staticContext; - this.logLevel =3D logLevel; - } - - - - - /** = - * @see com.metamatrix.common.comm.platform.socket.SocketLog#logCritic= al(java.lang.String, java.lang.String) - * @since 4.3 - */ - public void logCritical(String context, - String message) { - if (isLogged(context, SocketLog.CRITICAL)) { - log(SocketLog.CRITICAL, context, message); - } - } - - - - - /** = - * @see com.metamatrix.common.comm.platform.socket.SocketLog#logCritic= al(java.lang.String, java.lang.Throwable, java.lang.String) - * @since 4.3 - */ - public void logCritical(String context, - Throwable throwable, - String message) { - if (isLogged(context, SocketLog.CRITICAL)) { - log(SocketLog.CRITICAL, context, throwable, message); - } - } - = - /** = - * @see com.metamatrix.common.comm.platform.socket.SocketLog#logError(= java.lang.String, java.lang.String) - * @since 4.3 - */ - public void logError(String context, - String message) { - if (isLogged(context, SocketLog.ERROR)) { - log(SocketLog.ERROR, context, message); - } - } - - /** = - * @see com.metamatrix.common.comm.platform.socket.SocketLog#logError(= java.lang.String, java.lang.Throwable, java.lang.String) - * @since 4.3 - */ - public void logError(String context, - Throwable throwable, - String message) { - if (isLogged(context, SocketLog.ERROR)) { - log(SocketLog.ERROR, context, throwable, message); - } - } - - /** = - * @see com.metamatrix.common.comm.platform.socket.SocketLog#logWarnin= g(java.lang.String, java.lang.String) - * @since 4.3 - */ - public void logWarning(String context, - String message) { - if (isLogged(context, SocketLog.WARNING)) { - log(SocketLog.WARNING, context, message); - } - } - - /** = - * @see com.metamatrix.common.comm.platform.socket.SocketLog#logWarnin= g(java.lang.String, java.lang.Throwable, java.lang.String) - * @since 4.3 - */ - public void logWarning(String context, - Throwable throwable, - String message) { - if (isLogged(context, SocketLog.WARNING)) { - log(SocketLog.WARNING, context, throwable, message); - } - } - - /** = - * @see com.metamatrix.common.comm.platform.socket.SocketLog#logInfo(j= ava.lang.String, java.lang.String) - * @since 4.3 - */ - public void logInfo(String context, - String message) { - if (isLogged(context, SocketLog.INFO)) { - log(SocketLog.INFO, context, message); - } - } - /** = - * @see com.metamatrix.common.comm.platform.socket.SocketLog#logInfo(j= ava.lang.String, java.lang.String) - * @since 4.3 - */ - public void logInfo(String context, - Throwable throwable, - String message) { - if (isLogged(context, SocketLog.INFO)) { - log(SocketLog.INFO, context, throwable, message); - } - } - /** = - * @see com.metamatrix.common.comm.platform.socket.SocketLog#logDetail= (java.lang.String, java.lang.String) - * @since 4.3 - */ - public void logDetail(String context, - String message) { - if (isLogged(context, SocketLog.DETAIL)) { - log(SocketLog.DETAIL, context, message); - } - } - /** = - * @see com.metamatrix.common.comm.platform.socket.SocketLog#logDetail= (java.lang.String, java.lang.String) - * @since 4.3 - */ - public void logDetail(String context, - Throwable throwable, - String message) { - if (isLogged(context, SocketLog.DETAIL)) { - log(SocketLog.DETAIL, context, throwable, message); - } - } - - /** = - * @see com.metamatrix.common.comm.platform.socket.SocketLog#logTrace(= java.lang.String, java.lang.String) - * @since 4.3 - */ - public void logTrace(String context, - String message) { - if (isLogged(context, SocketLog.TRACE)) { - log(SocketLog.TRACE, context, message); - } - } - /** = - * @see com.metamatrix.common.comm.platform.socket.SocketLog#logTrace(= java.lang.String, java.lang.String) - * @since 4.3 - */ - public void logTrace(String context, - Throwable throwable, - String message) { - if (isLogged(context, SocketLog.TRACE)) { - log(SocketLog.TRACE, context, throwable, message); - } - } - - - private void log(int level, String context, String message) { - stream.print(getLogLevelString(level)); - stream.print("\t["); //$NON-NLS-1$ - stream.print(staticContext); - stream.print("]\t"); //$NON-NLS-1$ - stream.print(context); - stream.print("\t"); //$NON-NLS-1$ - stream.println(message); - } - = - private void log(int level, String context, Throwable t, String messag= e) { - log(level, context, message); - t.printStackTrace(stream); - } - = - = - = - public boolean isLogged(String context, int level) { - return this.logLevel >=3D level; - } - = - = - private static String getLogLevelString(int level) { - switch(level) { - case SocketLog.CRITICAL: - return "CRITICAL"; //$NON-NLS-1$ - case SocketLog.ERROR: - return "ERROR"; //$NON-NLS-1$ - case SocketLog.WARNING: - return "WARNING"; //$NON-NLS-1$ = - case SocketLog.INFO: - return "INFO"; //$NON-NLS-1$ - case SocketLog.DETAIL: - return "DETAIL"; //$NON-NLS-1$ - case SocketLog.TRACE: - return "TRACE"; //$NON-NLS-1$ - = - default: - return "NONE"; //$NON-NLS-1$ - } - } - = - public static int getLogLevelInt(String level) { - if (level.equalsIgnoreCase("CRITICAL")) { //$NON-NLS-1$ - return SocketLog.CRITICAL; - } else if (level.equalsIgnoreCase("ERROR")) { //$NON-NLS-1$ - return SocketLog.ERROR; - } else if (level.equalsIgnoreCase("WARNING")) { //$NON-NLS-1$ - return SocketLog.WARNING; - } else if (level.equalsIgnoreCase("INFO")) { //$NON-NLS-1$ - return SocketLog.INFO; - } else if (level.equalsIgnoreCase("DETAIL")) { //$NON-NLS-1$ - return SocketLog.DETAIL; - } else if (level.equalsIgnoreCase("TRACE")) { //$NON-NLS-1$ - return SocketLog.TRACE; - } else { - return SocketLog.NONE; - } - } -} Deleted: trunk/client/src/main/java/com/metamatrix/common/comm/platform/soc= ket/SocketLog.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/S= ocketLog.java 2009-02-26 18:10:59 UTC (rev 508) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/S= ocketLog.java 2009-02-26 19:44:06 UTC (rev 509) @@ -1,93 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.common.comm.platform.socket; - -/** - * Logger used by the socket communication framework. - */ -public interface SocketLog { - = - = - //Message levels copied from com.metamatrix.common.log.MessageLevel - - /** - * Message level value that specifies that no messages are to be recor= ded. - */ - public static final int NONE =3D 0; - - /** - * Message level value that specifies that critical messages are to be= recorded. - */ - public static final int CRITICAL =3D 1; - - /** - * Message level value that specifies that error messages and critical - * messages are to be recorded. - */ - public static final int ERROR =3D 2; - - /** - * Message level value that specifies that warning, error and critical - * messages are to be recorded. - */ - public static final int WARNING =3D 3; - - /** - * Message level value that specifies that information, warning, error= and critical - * messages are to be recorded. - */ - public static final int INFO =3D 4; - - /** - * Message level value that specifies that detailed, information, warn= ing, error and critical - * messages are to be recorded. - */ - public static final int DETAIL =3D 5; - - /** - * Message level value that specifies that all messages are to be reco= rded. - */ - public static final int TRACE =3D 6; - = - = - = - void logCritical(String context, String message); - void logCritical(String context, Throwable throwable, String message); - - void logError(String context, String message); - void logError(String context, Throwable throwable, String message); - = - void logWarning(String context, String message); - void logWarning(String context, Throwable throwable, String message); - = - void logInfo(String context, String message); - void logInfo(String context, Throwable throwable, String message); - = - void logDetail(String context, String message); - void logDetail(String context, Throwable throwable, String message); - = - void logTrace(String context, String message); - void logTrace(String context, Throwable throwable, String message); - = - boolean isLogged(String context, int logLevel); -} Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/SocketUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/S= ocketUtil.java 2009-02-26 18:10:59 UTC (rev 508) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/S= ocketUtil.java 2009-02-26 19:44:06 UTC (rev 509) @@ -49,46 +49,6 @@ * This class provides some utility methods to create ssl sockets using the * keystores and trust stores. these are the properties required for the m= aking the = * ssl connection - *

- * The search for the key stores is follows the path - * MM defined properties ---> javax defined properties - *

- *

    - * 2-way SSL (MetaMatrix based) - *
  • -Dcom.metamatrix.ssl.keyStore (required) - *
  • -Dcom.metamatrix.ssl.keyStorePassword (required) - *
  • -Dcom.metamatrix.ssl.trustStore (required) - *
  • -Dcom.metamatrix.ssl.trustStorePassword (required) - *
  • -Dcom.metamatrix.ssl.protocol (optional;default=3DSSLv3) - *
  • -Dcom.metamatrix.ssl.algorithm (optional;default=3DSunX509) - *
  • -Dcom.metamatrix.ssl.keyStoreType (optional;default=3DJKS) - *
- *

- *

    - * 2-way SSL (javax based; can used where there are no conflicts in JVM= ) - *
  • -Djavax.net.ssl.keyStore (required) - *
  • -Djavax.net.ssl.keyStorePassword (required) - *
  • -Djavax.net.ssl.trustStore (required) - *
  • -Djavax.net.ssl.trustStorePassword (required) - *
  • -Djavax.net.ssl.keyStoreType (optional) - *
- *

- *

    - * 1-way SSL (metamatrix Based) - *
  • -Dcom.metamatrix.ssl.trustStore (required) - *
  • -Dcom.metamatrix.ssl.trustStorePassword (required) - *
  • -Dcom.metamatrix.ssl.protocol (optional;default=3DSSLv3) - *
  • -Dcom.metamatrix.ssl.algorithm (optional;default=3DSunX509) - *
  • -Dcom.metamatrix.ssl.keyStoreType (optional;default=3DJKS) - *
- *

- *

    - * 1-way SSL (javax based; can used where there are no conflicts in JVM= ) - *
  • -Djavax.net.ssl.trustStore (required) - *
  • -Djavax.net.ssl.trustStorePassword (required) - *
  • -Djavax.net.ssl.keyStoreType (optional) - *
- * = */ public class SocketUtil { = @@ -100,7 +60,6 @@ static final String KEYSTORE_PASSWORD =3D "com.metamatrix.ssl.keyStore= Password"; //$NON-NLS-1$ static final String KEYSTORE_FILENAME =3D "com.metamatrix.ssl.keyStore= "; //$NON-NLS-1$ = - static final String DEFAULT_ALGORITHM =3D "SunX509"; //$NON-NLS-1$ static final String DEFAULT_KEYSTORE_PROTOCOL =3D "SSLv3"; //$NON-NLS-= 1$ static final String DEFAULT_KEYSTORE_TYPE =3D "JKS"; //$NON-NLS-1$ = @@ -138,7 +97,7 @@ // -Dcom.metamatrix.ssl.protocol (default SSLv3) String keystoreProtocol =3D props.getProperty(PROTOCOL, DEFAULT_KE= YSTORE_PROTOCOL); = // -Dcom.metamatrix.ssl.algorithm (default SunX509) - String keystoreAlgorithm =3D props.getProperty(KEYSTORE_ALGORITHM,= DEFAULT_ALGORITHM); = + String keystoreAlgorithm =3D props.getProperty(KEYSTORE_ALGORITHM)= ; = // -Dcom.metamatrix.ssl.trustStore (if null; keystore filename use= d) String truststore =3D props.getProperty(TRUSTSTORE_FILENAME, keyst= ore); = // -Dcom.metamatrix.ssl.trustStorePassword (if null; keystore pass= word used) @@ -206,6 +165,9 @@ String protocol) throws IOExce= ption { = try { + if (algorithm =3D=3D null) { + algorithm =3D KeyManagerFactory.getDefaultAlgorithm(); + } // Configure the Keystore Manager KeyManager[] keyManagers =3D null; if (keystore !=3D null) { Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/SocketServerConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerConnection.java 2009-02-26 18:10:59 UTC (rev 508) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerConnection.java 2009-02-26 19:44:06 UTC (rev 509) @@ -40,6 +40,8 @@ import java.util.TimerTask; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; +import java.util.logging.Level; +import java.util.logging.Logger; = import com.metamatrix.admin.api.exception.security.InvalidSessionException; import com.metamatrix.api.exception.MetaMatrixComponentException; @@ -52,7 +54,6 @@ import com.metamatrix.common.comm.exception.ConnectionException; import com.metamatrix.common.comm.exception.SingleInstanceCommunicationExc= eption; import com.metamatrix.common.comm.platform.CommPlatformPlugin; -import com.metamatrix.common.comm.platform.socket.SocketLog; import com.metamatrix.dqp.client.ClientSideDQP; import com.metamatrix.platform.security.api.ILogon; import com.metamatrix.platform.security.api.LogonResult; @@ -68,7 +69,7 @@ private Map existingConnections =3D new H= ashMap(); private SocketServerInstanceFactory connectionFactory; private ServerDiscovery serverDiscovery; - private SocketLog log; + private static Logger log =3D Logger.getLogger("org.teiid.client.socke= ts"); = private boolean secure; private Properties connProps; @@ -82,13 +83,12 @@ public SocketServerConnection( SocketServerInstanceFactory connectionFactory, boolean secure, ServerDiscovery serverDiscovery, Properties connProps, - Timer pingTimer, SocketLog log) throws CommunicationException, Connecti= onException { + Timer pingTimer) throws CommunicationException, ConnectionException { this.connectionFactory =3D connectionFactory; this.serverDiscovery =3D serverDiscovery; this.connProps =3D connProps; this.secure =3D secure; this.logon =3D this.getService(ILogon.class); - this.log =3D log; = authenticate(); = = @@ -157,7 +157,7 @@ } throw new SingleInstanceCommunicationException(ex,CommPlatformPlugin.U= til.getString("SocketServerInstance.Connection_Error.Connect_Failed", hostI= nfo.getHostName(), String.valueOf(hostInfo.getPortNumber()), ex.getMessage(= ))); //$NON-NLS-1$ } - log.logDetail("SocketServerConnection.selectServerInstance", ex, "Unabl= e to connect to host"); //$NON-NLS-1$ //$NON-NLS-2$ + log.log(Level.FINE, "Unable to connect to host", ex); //$NON-NLS-1$ } throw new CommunicationException(CommPlatformPlugin.Util.getString("Sock= etServerInstancePool.No_valid_host_available", hostCopy.toString())); //$NO= N-NLS-1$ } Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/SocketServerConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerConnectionFactory.java 2009-02-26 18:10:59 UTC (rev 508) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerConnectionFactory.java 2009-02-26 19:44:06 UTC (rev 509) @@ -38,8 +38,6 @@ import com.metamatrix.common.comm.exception.CommunicationException; import com.metamatrix.common.comm.exception.ConnectionException; import com.metamatrix.common.comm.platform.socket.Handshake; -import com.metamatrix.common.comm.platform.socket.PrintStreamSocketLog; -import com.metamatrix.common.comm.platform.socket.SocketLog; import com.metamatrix.common.comm.platform.socket.SocketUtil; import com.metamatrix.common.comm.platform.socket.SocketUtil.SSLEngineFact= ory; import com.metamatrix.common.util.NetUtils; @@ -74,7 +72,6 @@ = private static SocketServerConnectionFactory INSTANCE; = - private SocketLog log; = private ObjectChannelFactory channelFactory; private Timer pingTimer; private Properties props; @@ -84,7 +81,7 @@ if (INSTANCE =3D=3D null) { INSTANCE =3D new SocketServerConnectionFactory(); Properties props =3D System.getProperties(); - InputStream is =3D SocketServerConnectionFactory.class.getResourceAsStr= eam("/federate-settings.properties"); //$NON-NLS-1$ + InputStream is =3D SocketServerConnectionFactory.class.getResourceAsStr= eam("/teiid-client-settings.properties"); //$NON-NLS-1$ if (is !=3D null) { props =3D new Properties(props); try { @@ -109,7 +106,6 @@ = public void init(Properties props, boolean usePing) { this.props =3D props; - this.log =3D getLog(SocketServerConnectionFactory.class.getSimpleName()); this.pingTimer =3D new Timer("SocketPing", true); //$NON-NLS-1$ this.channelFactory =3D new NioObjectChannelFactory( getConserveBandwidth(), getInputBufferSize(), @@ -133,7 +129,7 @@ sslEngine =3D this.sslEngineFactory.getSSLEngine(); } } - SocketServerInstanceImpl ssii =3D new SocketServerInstanceImpl(info, ssl= Engine, this.log, getSynchronousTTL()); + SocketServerInstanceImpl ssii =3D new SocketServerInstanceImpl(info, ssl= Engine, getSynchronousTTL()); ssii.connect(this.channelFactory, Handshake.HANDSHAKE_TIMEOUT); return ssii; } @@ -163,7 +159,7 @@ = discovery.init(url, connectionProperties); = - return new SocketServerConnection(this, url.isUsingSSL(), discovery, con= nectionProperties, pingTimer, this.log); + return new SocketServerConnection(this, url.isUsingSSL(), discovery, con= nectionProperties, pingTimer); } = /* @@ -196,21 +192,6 @@ return PropertiesUtils.getIntProperty(props, SOCKET_MAX_THREADS, DEFA= ULT_MAX_THREADS); } = - public SocketLog getLog(String contextName) { - SocketLog result =3D new PrintStreamSocketLog(System.out, contextName= , getLogLevel()); - return result; - } - - /** - * Get the logLevel that SocketLog will use. = - * @return - * @since 4.3 - */ - public int getLogLevel() { - String logLevelString =3D props.getProperty(SOCKET_LOG_LEVEL, DEFAULT= _SOCKET_LOG_LEVEL); - return PrintStreamSocketLog.getLogLevelInt(logLevelString); - } - public int getInputBufferSize() { return PropertiesUtils.getIntProperty(props, SOCKET_INPUT_BUFFER_SIZE= , DEFAULT_SOCKET_INPUT_BUFFER_SIZE); } Modified: trunk/client/src/main/java/com/metamatrix/common/comm/platform/so= cket/client/SocketServerInstanceImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerInstanceImpl.java 2009-02-26 18:10:59 UTC (rev 508) +++ trunk/client/src/main/java/com/metamatrix/common/comm/platform/socket/c= lient/SocketServerInstanceImpl.java 2009-02-26 19:44:06 UTC (rev 509) @@ -38,6 +38,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import java.util.logging.Level; +import java.util.logging.Logger; = import javax.net.ssl.SSLEngine; = @@ -52,7 +54,6 @@ import com.metamatrix.common.comm.platform.CommPlatformPlugin; import com.metamatrix.common.comm.platform.socket.Handshake; import com.metamatrix.common.comm.platform.socket.ObjectChannel; -import com.metamatrix.common.comm.platform.socket.SocketLog; import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelLis= tener; import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelLis= tenerFactory; import com.metamatrix.common.util.crypto.CryptoException; @@ -75,7 +76,7 @@ private HostInfo hostInfo; private SSLEngine engine; private ObjectChannel socketChannel; - private SocketLog log; + private Logger log =3D Logger.getLogger("org.teiid.client.sockets"); private long synchTimeout; = private Cryptor cryptor; @@ -89,9 +90,8 @@ = } = - public SocketServerInstanceImpl(final HostInfo host, SSLEngine engine,= SocketLog log, long synchTimeout) { + public SocketServerInstanceImpl(final HostInfo host, SSLEngine engine,= long synchTimeout) { this.hostInfo =3D host; - this.log =3D log; this.engine =3D engine; this.synchTimeout =3D synchTimeout; } @@ -213,14 +213,14 @@ public void exceptionOccurred(Throwable e) { if (e instanceof CommunicationException) { if (e.getCause() instanceof InvalidClassException) { - log.logError("SocketServerInstance.read", e, "Unknown class o= r incorrect class version:"); //$NON-NLS-1$ //$NON-NLS-2$ + log.log(Level.SEVERE, "Unknown class or incorrect class versi= on:", e); //$NON-NLS-1$ //$NON-NLS-2$ } else { - log.logDetail("SocketServerInstance.read", e, "Unable to read= : socket was already closed."); //$NON-NLS-1$ //$NON-NLS-2$ + log.log(Level.FINE, "Unable to read: socket was already close= d.", e); //$NON-NLS-1$ //$NON-NLS-2$ } } else if (e instanceof EOFException) { - log.logDetail("SocketServerInstance.read", e, "Unable to read: socke= t was already closed."); //$NON-NLS-1$ //$NON-NLS-2$ + log.log(Level.FINE, "Unable to read: socket was already closed= .", e); //$NON-NLS-1$ //$NON-NLS-2$ } else { - log.logDetail("SocketServerInstance.read", e, "Unable to read: unexp= ected exception"); //$NON-NLS-1$ //$NON-NLS-2$ + log.log(Level.WARNING, "Unable to read: unexpected exception",= e); //$NON-NLS-1$ //$NON-NLS-2$ } = synchronized (this) { @@ -242,32 +242,24 @@ } = public void receivedMessage(Object packet) { - log.logDetail("SocketServerInstance.read", "reading"); //$NON-NLS-= 1$ //$NON-NLS-2$ - if (log.isLogged("SocketServerInstance.read", SocketLog.DETAIL)) {= //$NON-NLS-1$ - log.logDetail("SocketServerInstance.read", "read:" + packet); = //$NON-NLS-1$ //$NON-NLS-2$ - } + log.log(Level.FINE, "reading packet"); //$NON-NLS-1$ //$NON-NLS-2$ if (packet instanceof Message) { Message messagePacket =3D (Message)packet; processAsynchronousPacket(messagePacket); } else if (packet instanceof Handshake) { receivedHahdshake((Handshake)packet); } else { - if (log.isLogged("SocketServerInstance.read", SocketLog.DETAIL= )) { //$NON-NLS-1$ - log.logDetail("SocketServerInstance.read", "packet ignored= :" + packet); //$NON-NLS-1$ //$NON-NLS-2$ - } + log.log(Level.FINE, "packet ignored:" + packet); //$NON-NLS-1$ //= $NON-NLS-2$ } } = private void processAsynchronousPacket(Message message) { Serializable messageKey =3D message.getMessageKey(); - if (log.isLogged("SocketServerInstance.read", SocketLog.DETAIL)) {= //$NON-NLS-1$ - log.logDetail("SocketServerInstance.read", "read asynch messag= e:" + message); //$NON-NLS-1$ //$NON-NLS-2$ - } + log.log(Level.FINE, "read asynch message:" + messageKey); //$NON-N= LS-1$ //$NON-NLS-2$ MessageListener listener =3D asynchronousListeners.remove(messageKey); if (listener !=3D null) { listener.deliverMessage(message, messageKey); } - log.logDetail("SocketServerInstanceImpl.deliverMessage", "message = delivered"); //$NON-NLS-1$ //$NON-NLS-2$ } = public void shutdown() { Added: trunk/client/src/main/resources/teiid-client-settings.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/resources/teiid-client-settings.properties = (rev 0) +++ trunk/client/src/main/resources/teiid-client-settings.properties 2009-0= 2-26 19:44:06 UTC (rev 509) @@ -0,0 +1,105 @@ +######################################## +# Settings file for Teiid clients +######################################## + +######################################## +# SSL Settings +######################################## + +# +# Set the key store type. Defaults to JKS +# + +com.metamatrix.ssl.keyStoreType=3DJKS + +# +# Set the key store algorithm, defaults to = +# the system property "ssl.TrustManagerFactory.algorithm" +# + +#com.metamatrix.ssl.algorithm=3D + +# +# Set to the classpath or filesystem location of the +# key store. +# = +# This property is required only if performing 2-way +# authentication that requires a specific private = +# key. +# + +#com.metamatrix.ssl.keyStore=3D + +# +# Set the key store password (not required) +# + +#com.metamatrix.ssl.keyStorePassword=3D + +# +# Set to the classpath or filesystem location of the +# trust store. +# = +# This property is required if performing 1-way +# authentication that requires trust not provided +# by the system defaults. +# +# Set to NONE for anonymous authentication using +# the TLS_DH_anon_WITH_AES_128_CBC_SHA cipher suite = +# + +#com.metamatrix.ssl.trustStore=3D + +# +# Set the trust store password (not required) +# + +#com.metamatrix.ssl.trustStorePassword=3D + +# +# Set the cipher protocol, defaults to SSLv3 +# + +com.metamatrix.ssl.protocol=3DSSLv3 + + +######################################## +# Misc Socket Configuration +######################################## + +# +# Set the max number of NIO worker threads +# +metamatrix.sockets.max.threads=3D15 + +# +# Set the max time to live for an NIO worker thread +# + +metamatrix.sockets.ttl=3D120000 + +# +# Set the max time to live for non-execution synchrnous +# calls. +# + +metamatrix.synchronous.sockets.ttl=3D120000 + +# +# Set the input buffer size +# + +metamatrix.sockets.inputBufferSize=3D102400 + +# +# Set the output buffer size +# + +metamatrix.sockets.outputBufferSize=3D102400 + +# +# Set to true to enable Nagle's algorithm to conserve bandwidth = +# by minimizing the number of segments that are sent. +# + +metamatrix.sockets.conserveBandwidth=3Dfalse Property changes on: trunk/client/src/main/resources/teiid-client-settings.= properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/so= cket/client/TestSocketServerConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestSocketServerConnection.java 2009-02-26 18:10:59 UTC (rev 508) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestSocketServerConnection.java 2009-02-26 19:44:06 UTC (rev 509) @@ -40,7 +40,6 @@ import com.metamatrix.common.comm.exception.CommunicationException; import com.metamatrix.common.comm.exception.ConnectionException; import com.metamatrix.common.comm.exception.SingleInstanceCommunicationExc= eption; -import com.metamatrix.common.comm.platform.socket.SocketLog; import com.metamatrix.common.util.crypto.NullCryptor; import com.metamatrix.dqp.client.ClientSideDQP; import com.metamatrix.dqp.client.ResultsFuture; @@ -130,7 +129,7 @@ }; ServerDiscovery discovery =3D new UrlServerDiscovery(new MMURL("mm://hos= t1:1,host2:2")); try { - new SocketServerConnection(instanceFactory, false, discovery, p, null, = Mockito.mock(SocketLog.class)); + new SocketServerConnection(instanceFactory, false, discovery, p, null); fail("exception expected"); } catch (CommunicationException e) { assertEquals("No valid host available. Attempted connections to: [host1= :1, host2:2]", e.getMessage()); @@ -184,7 +183,7 @@ return instance; } }; - SocketServerConnection connection =3D new SocketServerConnection(instanc= eFactory, false, discovery, p, null, Mockito.mock(SocketLog.class)); + SocketServerConnection connection =3D new SocketServerConnection(instanc= eFactory, false, discovery, p, null); return connection; } = Modified: trunk/client/src/test/java/com/metamatrix/common/comm/platform/so= cket/client/TestSocketServerInstanceImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestSocketServerInstanceImpl.java 2009-02-26 18:10:59 UTC (rev 508) +++ trunk/client/src/test/java/com/metamatrix/common/comm/platform/socket/c= lient/TestSocketServerInstanceImpl.java 2009-02-26 19:44:06 UTC (rev 509) @@ -39,7 +39,6 @@ import com.metamatrix.common.comm.exception.CommunicationException; import com.metamatrix.common.comm.platform.socket.Handshake; import com.metamatrix.common.comm.platform.socket.ObjectChannel; -import com.metamatrix.common.comm.platform.socket.SocketLog; import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelLis= tener; import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelLis= tenerFactory; import com.metamatrix.dqp.client.ResultsFuture; @@ -81,7 +80,7 @@ = private SocketServerInstanceImpl createInstance(ObjectChannelFactory chan= nelFactory) throws CommunicationException, IOException { - SocketServerInstanceImpl ssii =3D new SocketServerInstanceImpl(new HostI= nfo("foo", 1), null, Mockito.mock(SocketLog.class), 1); //$NON-NLS-1$ + SocketServerInstanceImpl ssii =3D new SocketServerInstanceImpl(new HostI= nfo("foo", 1), null, 1); //$NON-NLS-1$ ssii.connect(channelFactory, 1); return ssii; } Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/so= cket/server/SocketClientInstance.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/SocketClientInstance.java 2009-02-26 18:10:59 UTC (rev 508) +++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/SocketClientInstance.java 2009-02-26 19:44:06 UTC (rev 509) @@ -30,7 +30,6 @@ import com.metamatrix.common.comm.platform.CommPlatformPlugin; import com.metamatrix.common.comm.platform.socket.Handshake; import com.metamatrix.common.comm.platform.socket.ObjectChannel; -import com.metamatrix.common.comm.platform.socket.SocketLog; import com.metamatrix.common.comm.platform.socket.SocketVMController; import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelLis= tener; import com.metamatrix.common.log.LogManager; @@ -135,7 +134,7 @@ } = private void processMessagePacket(Message packet) { - if (LogManager.isMessageToBeRecorded(SocketVMController.SOCKET_CONTEXT, = SocketLog.DETAIL)) { = + if (LogManager.isMessageToBeRecorded(SocketVMController.SOCKET_CONTEXT, = MessageLevel.DETAIL)) { = LogManager.logDetail(SocketVMController.SOCKET_CONTEXT, "processing mes= sage:" + packet); //$NON-NLS-1$ } workerPool.execute(new ServerWorkItem(this, packet.getMessageKey(), pack= et, this.server, this.sessionService)); Modified: trunk/server/src/main/java/com/metamatrix/common/comm/platform/so= cket/server/SocketListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/SocketListener.java 2009-02-26 18:10:59 UTC (rev 508) +++ trunk/server/src/main/java/com/metamatrix/common/comm/platform/socket/s= erver/SocketListener.java 2009-02-26 19:44:06 UTC (rev 509) @@ -37,13 +37,13 @@ import com.metamatrix.common.comm.ClientServiceRegistry; import com.metamatrix.common.comm.platform.socket.ObjectChannel; import com.metamatrix.common.comm.platform.socket.SSLAwareChannelHandler; -import com.metamatrix.common.comm.platform.socket.SocketLog; import com.metamatrix.common.comm.platform.socket.SocketVMController; import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelLis= tener; import com.metamatrix.common.comm.platform.socket.ObjectChannel.ChannelLis= tenerFactory; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.queue.WorkerPool; import com.metamatrix.common.queue.WorkerPoolFactory; +import com.metamatrix.core.log.MessageLevel; import com.metamatrix.core.util.MetaMatrixProductVersion; import com.metamatrix.platform.security.api.service.SessionServiceInterfac= e; import com.metamatrix.platform.vm.controller.SocketListenerStats; @@ -80,7 +80,7 @@ = this.server =3D server; this.workerPool =3D workerPool; - if (LogManager.isMessageToBeRecorded(SocketVMController.SOCKET_CON= TEXT, SocketLog.DETAIL)) { = + if (LogManager.isMessageToBeRecorded(SocketVMController.SOCKET_CON= TEXT, MessageLevel.DETAIL)) { = LogManager.logDetail(SocketVMController.SOCKET_CONTEXT, "serve= r =3D " + this.server + "binding to port:" + port); //$NON-NLS-1$ //$NON-NL= S-2$ } = Modified: trunk/server/src/test/java/com/metamatrix/common/comm/platform/so= cket/server/TestSocketRemoting.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/s= erver/TestSocketRemoting.java 2009-02-26 18:10:59 UTC (rev 508) +++ trunk/server/src/test/java/com/metamatrix/common/comm/platform/socket/s= erver/TestSocketRemoting.java 2009-02-26 19:44:06 UTC (rev 509) @@ -31,7 +31,6 @@ = import junit.framework.TestCase; = -import org.mockito.Mockito; = import com.metamatrix.admin.api.exception.security.InvalidSessionException; import com.metamatrix.api.exception.MetaMatrixComponentException; @@ -44,7 +43,6 @@ import com.metamatrix.common.comm.api.MessageListener; import com.metamatrix.common.comm.exception.CommunicationException; import com.metamatrix.common.comm.exception.ConnectionException; -import com.metamatrix.common.comm.platform.socket.SocketLog; import com.metamatrix.common.comm.platform.socket.client.SocketServerConne= ction; import com.metamatrix.common.comm.platform.socket.client.SocketServerInsta= nce; import com.metamatrix.common.comm.platform.socket.client.SocketServerInsta= nceFactory; @@ -215,7 +213,7 @@ return serverInstance; } = - }, false, new UrlServerDiscovery(new MMURL("foo", 1, false)), new Proper= ties(), null, Mockito.mock(SocketLog.class)); //$NON-NLS-1$ + }, false, new UrlServerDiscovery(new MMURL("foo", 1, false)), new Proper= ties(), null); //$NON-NLS-1$ return connection; } = --===============0274376773444400351==-- From teiid-commits at lists.jboss.org Thu Feb 26 15:34:04 2009 Content-Type: multipart/mixed; boundary="===============0988475333298708476==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r510 - in trunk/connector-api/src: test/java/org/teiid and 1 other directory. Date: Thu, 26 Feb 2009 15:34:03 -0500 Message-ID: --===============0988475333298708476== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-26 15:34:03 -0500 (Thu, 26 Feb 2009) New Revision: 510 Removed: trunk/connector-api/src/main/java/com/ trunk/connector-api/src/test/java/org/teiid/data/ Log: removing unused packages --===============0988475333298708476==-- From teiid-commits at lists.jboss.org Thu Feb 26 15:52:47 2009 Content-Type: multipart/mixed; boundary="===============2178310932862923935==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r511 - in trunk: common-core/src/main/java/com/metamatrix/common/protocol/jar and 7 other directories. Date: Thu, 26 Feb 2009 15:52:47 -0500 Message-ID: --===============2178310932862923935== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-26 15:52:47 -0500 (Thu, 26 Feb 2009) New Revision: 511 Modified: trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCac= heFactory.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/JarUR= LConnection.java trunk/common-internal/src/main/java/com/metamatrix/common/config/Current= Configuration.java trunk/common-internal/src/main/java/com/metamatrix/common/util/VMNaming.= java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBArc= hive.java trunk/embedded/src/main/resources/jboss-cache-configuration.xml trunk/embedded/src/test/resources/jboss-cache-configuration.xml trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestWo= rkItem.java trunk/server/src/main/java/com/metamatrix/server/ChannelProvider.java trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceModu= le.java trunk/server/src/main/java/com/metamatrix/server/JGroupsProvider.java trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java Log: Replacing federate name with teiid Modified: trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/J= BossCacheFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCa= cheFactory.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCa= cheFactory.java 2009-02-26 20:52:47 UTC (rev 511) @@ -61,7 +61,7 @@ try { CacheJmxWrapperMBean wrapper =3D new CacheJmxWrapper(cacheStore); = MBeanServer mbs =3D ManagementFactory.getPlatformMBeanServer(); - this.jmxName =3D new ObjectName("Federate:service=3DJBossCache,name=3Dc= ache"); //$NON-NLS-1$ + this.jmxName =3D new ObjectName("Teiid:service=3DJBossCache,name=3Dcach= e"); //$NON-NLS-1$ mbs.registerMBean(wrapper, this.jmxName); wrapper.create(); wrapper.start(); @@ -78,7 +78,7 @@ */ public Cache get(Type type, CacheConfiguration config) { if (!destroyed) { - Node cacheRoot =3D this.cacheStore.getRoot().addChild(Fqn.fromString("F= ederate")); //$NON-NLS-1$ + Node cacheRoot =3D this.cacheStore.getRoot().addChild(Fqn.fromString("T= eiid")); //$NON-NLS-1$ Node node =3D cacheRoot.addChild(Fqn.fromString(type.location())); = = Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/ja= r/JarURLConnection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/JarU= RLConnection.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/JarU= RLConnection.java 2009-02-26 20:52:47 UTC (rev 511) @@ -45,10 +45,10 @@ = /** = * Jar protocol connection class. The class extends the JDK provided JarUR= LConnection factory. - * However Jar protocol can not understand the federate specific protocols= like mmfile, mmrofile etc. + * However Jar protocol can not understand the teiid specific protocols li= ke mmfile, mmrofile etc. * The issue is if you can register application specific protocols during = start-up = * using system properties the bulit in JAR protocol understands those pro= tocols. = - * However in the Federate model this need to work by just dropping in in = any = + * However in the Teiid model this need to work by just dropping in in any = * container. This handler will be called for any class loaders registered = * with {@link MetaMatrixURLStreamHandlerFactory}, so that they understand= the application specific protocols. = */ Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/= CurrentConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/config/Curren= tConfiguration.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/Curren= tConfiguration.java 2009-02-26 20:52:47 UTC (rev 511) @@ -92,7 +92,7 @@ = public String getClusterName() throws ConfigurationException { Properties props =3D getResourceProperties(ResourceNames.JGROUPS); - return props.getProperty(CLUSTER_NAME, "Federate-Cluster"); //$NON= -NLS-1$ + return props.getProperty(CLUSTER_NAME, "Teiid-Cluster"); //$NON-NL= S-1$ } = /** Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/VM= Naming.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/util/VMNaming= .java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/VMNaming= .java 2009-02-26 20:52:47 UTC (rev 511) @@ -123,7 +123,7 @@ try { nvalue =3D InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e) { - nvalue =3D "federate-system"; //$NON-NLS-1$ + nvalue =3D "teiid-system"; //$NON-NLS-1$ } } return nvalue; Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api= /VDBArchive.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBAr= chive.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBAr= chive.java 2009-02-26 20:52:47 UTC (rev 511) @@ -239,7 +239,7 @@ = private void open() { if (!open) { - this.tempDirectory =3D new TempDirectory(FileUtils.TEMP_DIRECTORY+File.= separator+"federate", System.currentTimeMillis(), RANDOM.nextLong()); //$NO= N-NLS-1$ + this.tempDirectory =3D new TempDirectory(FileUtils.TEMP_DIRECTORY+File.= separator+"teiid", System.currentTimeMillis(), RANDOM.nextLong()); //$NON-N= LS-1$ this.tempDirectory.create(); open =3D true; } Modified: trunk/embedded/src/main/resources/jboss-cache-configuration.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/main/resources/jboss-cache-configuration.xml 2009-02= -26 20:34:03 UTC (rev 510) +++ trunk/embedded/src/main/resources/jboss-cache-configuration.xml 2009-02= -26 20:52:47 UTC (rev 511) @@ -1,6 +1,6 @@ - + org.jboss.cache.tr= ansaction.GenericTransactionManagerLookup READ_COMMITTED true Modified: trunk/embedded/src/test/resources/jboss-cache-configuration.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/test/resources/jboss-cache-configuration.xml 2009-02= -26 20:34:03 UTC (rev 510) +++ trunk/embedded/src/test/resources/jboss-cache-configuration.xml 2009-02= -26 20:52:47 UTC (rev 511) @@ -1,6 +1,6 @@ - + org.jboss.cache.tr= ansaction.GenericTransactionManagerLookup READ_COMMITTED true @@ -39,7 +39,7 @@ = org.jboss.cache.loader.FileCacheLoader - location=3D./target/scratch/federate = + location=3D./target/scratch/teiid = = = true Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/Re= questWorkItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestW= orkItem.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestW= orkItem.java 2009-02-26 20:52:47 UTC (rev 511) @@ -271,7 +271,7 @@ if (this.transactionState =3D=3D TransactionState.ACTIVE) { boolean end =3D true; /* - * FEDERATE-111 if we are done producing batches, then proactively clo= se transactional = + * TEIID-14 if we are done producing batches, then proactively close t= ransactional = * executions even ones that were intentionally kept alive. this may = * break the read of a lob from a transactional source under a transac= tion = * if the source does not support holding the clob open after commit Modified: trunk/server/src/main/java/com/metamatrix/server/ChannelProvider.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/ChannelProvider.java 2= 009-02-26 20:34:03 UTC (rev 510) +++ trunk/server/src/main/java/com/metamatrix/server/ChannelProvider.java 2= 009-02-26 20:52:47 UTC (rev 511) @@ -45,7 +45,7 @@ Channel c =3D this.channelMap.get(id); if (c =3D=3D null) { try { - c =3D this.mux.createMuxChannel(id.toString(), "Federate"); //$NON-NLS= -1$ + c =3D this.mux.createMuxChannel(id.toString(), "teiid"); //$NON-NLS-1$ this.channelMap.put(id, c); } catch (Exception e) { throw new MetaMatrixRuntimeException("Failed to create a Channel"); //= $NON-NLS-1$ Modified: trunk/server/src/main/java/com/metamatrix/server/HostControllerGu= iceModule.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceMod= ule.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceMod= ule.java 2009-02-26 20:52:47 UTC (rev 511) @@ -72,7 +72,7 @@ try { systemName =3D CurrentConfiguration.getInstance().getClusterName(); } catch (ConfigurationException err) { - systemName =3D "Federate-Cluster"; //$NON-NLS-1$ + systemName =3D "Teiid-Cluster"; //$NON-NLS-1$ } = = Modified: trunk/server/src/main/java/com/metamatrix/server/JGroupsProvider.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/JGroupsProvider.java 2= 009-02-26 20:34:03 UTC (rev 510) +++ trunk/server/src/main/java/com/metamatrix/server/JGroupsProvider.java 2= 009-02-26 20:52:47 UTC (rev 511) @@ -104,7 +104,7 @@ // register the channel with the JMX server try { MBeanServer mbs =3D ManagementFactory.getPlatformMBeanServer(); - ObjectName on =3D new ObjectName("Federate:service=3DJChannel,name=3DJ= Groups"); //$NON-NLS-1$ + ObjectName on =3D new ObjectName("Teiid:service=3DJChannel,name=3DJGro= ups"); //$NON-NLS-1$ mbs.registerMBean(new org.jgroups.jmx.JChannel(channel), on); } catch (MalformedObjectNameException e) { LogManager.logWarning(LogCommonConstants.CTX_CONFIG, "Failed to regist= er JChannel to JMX"); //$NON-NLS-1$ Modified: trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModul= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java= 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java= 2009-02-26 20:52:47 UTC (rev 511) @@ -75,7 +75,7 @@ try { systemName =3D CurrentConfiguration.getInstance().getClusterName(); } catch (ConfigurationException err) { - systemName =3D "Federate-Cluster"; //$NON-NLS-1$ + systemName =3D "Teiid-Cluster"; //$NON-NLS-1$ } = bindConstant().annotatedWith(Names.named(Configuration.HOSTNAME)).to(hos= t.getFullName()); --===============2178310932862923935==-- From teiid-commits at lists.jboss.org Thu Feb 26 16:14:36 2009 Content-Type: multipart/mixed; boundary="===============0209140200250015695==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r512 - trunk/server/src/main/java/com/metamatrix/server. Date: Thu, 26 Feb 2009 16:14:35 -0500 Message-ID: --===============0209140200250015695== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-26 16:14:35 -0500 (Thu, 26 Feb 2009) New Revision: 512 Modified: trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java Log: TEIID-361 Modified: trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModul= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java= 2009-02-26 20:52:47 UTC (rev 511) +++ trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java= 2009-02-26 21:14:35 UTC (rev 512) @@ -83,7 +83,7 @@ bindConstant().annotatedWith(Names.named(Configuration.VMID)).to(vmID); bind(Host.class).annotatedWith(Names.named(Configuration.HOST)).toInstan= ce(host); bindConstant().annotatedWith(Names.named(Configuration.CLUSTERNAME)).to(= systemName); - bindConstant().annotatedWith(Names.named(Configuration.LOGFILE)).to(Stri= ngUtil.replaceAll(host.getFullName(), ".", "_")+".log"); //$NON-NLS-1$ //$N= ON-NLS-2$ //$NON-NLS-3$ + bindConstant().annotatedWith(Names.named(Configuration.LOGFILE)).to(Stri= ngUtil.replaceAll(host.getFullName(), ".", "_")+this.vmName+".log"); //$NON= -NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ bindConstant().annotatedWith(Names.named(Configuration.LOGDIR)).to(host.= getLogDirectory()); = Names.bindProperties(binder(), CurrentConfiguration.getInstance().getPro= perties()); --===============0209140200250015695==-- From teiid-commits at lists.jboss.org Thu Feb 26 16:26:49 2009 Content-Type: multipart/mixed; boundary="===============9190476635268996196==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r513 - in trunk: engine/src/test/java/com/metamatrix/query/processor/relational and 11 other directories. Date: Thu, 26 Feb 2009 16:26:48 -0500 Message-ID: --===============9190476635268996196== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-26 16:26:48 -0500 (Thu, 26 Feb 2009) New Revision: 513 Removed: trunk/server/src/main/java/com/metamatrix/platform/config/service/Config= urationServiceConstants.java Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/rul= es/TestRuleChooseDependent.java trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Tes= tSelectNode.java trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewrit= er.java trunk/metadata/src/test/java/com/metamatrix/dqp/service/metadata/TestInd= exMetadataService.java trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCur= rentConfigurationReader.java trunk/server/src/main/java/com/metamatrix/platform/service/api/CacheAdmi= n.java trunk/server/src/main/java/com/metamatrix/server/query/service/QueryServ= ice.java trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfigA= dminImpl.java trunk/server/src/test/java/com/metamatrix/common/extensionmodule/TestExt= ensionModuleManager.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/Helper= TestConfiguration.java trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestCu= rrentConfiguration.java trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceSer= vlet.java trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTranslat= ionUtility.java Log: removing unused imports Modified: trunk/engine/src/test/java/com/metamatrix/query/optimizer/relatio= nal/rules/TestRuleChooseDependent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/ru= les/TestRuleChooseDependent.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/engine/src/test/java/com/metamatrix/query/optimizer/relational/ru= les/TestRuleChooseDependent.java 2009-02-26 21:26:48 UTC (rev 513) @@ -40,7 +40,6 @@ import com.metamatrix.query.optimizer.relational.RuleStack; import com.metamatrix.query.optimizer.relational.plantree.JoinStrategyType; import com.metamatrix.query.optimizer.relational.plantree.NodeConstants; -import com.metamatrix.query.optimizer.relational.plantree.NodeEditor; import com.metamatrix.query.optimizer.relational.plantree.NodeFactory; import com.metamatrix.query.optimizer.relational.plantree.PlanNode; import com.metamatrix.query.rewriter.QueryRewriter; Modified: trunk/engine/src/test/java/com/metamatrix/query/processor/relatio= nal/TestSelectNode.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Te= stSelectNode.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/engine/src/test/java/com/metamatrix/query/processor/relational/Te= stSelectNode.java 2009-02-26 21:26:48 UTC (rev 513) @@ -31,7 +31,6 @@ import junit.framework.TestCase; = import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.api.exception.MetaMatrixException; import com.metamatrix.api.exception.MetaMatrixProcessingException; import com.metamatrix.common.buffer.BlockedException; import com.metamatrix.common.buffer.BufferManager; Modified: trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQuer= yRewriter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewri= ter.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/engine/src/test/java/com/metamatrix/query/rewriter/TestQueryRewri= ter.java 2009-02-26 21:26:48 UTC (rev 513) @@ -41,6 +41,7 @@ import com.metamatrix.api.exception.query.QueryResolverException; import com.metamatrix.api.exception.query.QueryValidatorException; import com.metamatrix.common.types.DataTypeManager; +import com.metamatrix.common.util.TimestampWithTimezone; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.dqp.message.ParameterInfo; import com.metamatrix.query.metadata.QueryMetadataInterface; @@ -2094,11 +2095,11 @@ } = public void testRewriteFromUnixTime() throws Exception { - TimeZone.setDefault(TimeZone.getTimeZone("GMT-06:00")); //$NON-NLS-1$ + TimestampWithTimezone.resetCalendar(TimeZone.getTimeZone("GMT-06:00")= ); try { helpTestRewriteCriteria("from_unixtime(pm1.g1.e2) =3D '1992-12-01 07= :00:00'", "timestampadd(SQL_TSI_SECOND, pm1.g1.e2, {ts'1969-12-31 18:00:00.= 0'}) =3D {ts'1992-12-01 07:00:00.0'}"); //$NON-NLS-1$ //$NON-NLS-2$ } finally { - TimeZone.setDefault(null); + TimestampWithTimezone.resetCalendar(null); } } = Modified: trunk/metadata/src/test/java/com/metamatrix/dqp/service/metadata/= TestIndexMetadataService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/metadata/src/test/java/com/metamatrix/dqp/service/metadata/TestIn= dexMetadataService.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/metadata/src/test/java/com/metamatrix/dqp/service/metadata/TestIn= dexMetadataService.java 2009-02-26 21:26:48 UTC (rev 513) @@ -37,7 +37,6 @@ import com.metamatrix.dqp.service.DQPServiceNames; import com.metamatrix.dqp.service.VDBService; import com.metamatrix.query.metadata.QueryMetadataInterface; -import com.metamatrix.query.metadata.SupportConstants; = public class TestIndexMetadataService extends TestCase { private QueryMetadataInterface metadata; Deleted: trunk/server/src/main/java/com/metamatrix/platform/config/service/= ConfigurationServiceConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/platform/config/service/Confi= gurationServiceConstants.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/main/java/com/metamatrix/platform/config/service/Confi= gurationServiceConstants.java 2009-02-26 21:26:48 UTC (rev 513) @@ -1,29 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.platform.config.service; - -import com.metamatrix.common.config.ResourceNames; - -public interface ConfigurationServiceConstants { - public static final String NAME =3D "ConfigurationService"; -} Modified: trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml= /XMLCurrentConfigurationReader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCu= rrentConfigurationReader.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/main/java/com/metamatrix/platform/config/spi/xml/XMLCu= rrentConfigurationReader.java 2009-02-26 21:26:48 UTC (rev 513) @@ -22,14 +22,11 @@ = package com.metamatrix.platform.config.spi.xml; = -import java.util.Collection; import java.util.Properties; = import com.metamatrix.common.config.StartupStateException; import com.metamatrix.common.config.api.Configuration; import com.metamatrix.common.config.api.ConfigurationModelContainer; -import com.metamatrix.common.config.api.Host; -import com.metamatrix.common.config.api.HostID; import com.metamatrix.common.config.api.exceptions.ConfigurationConnection= Exception; import com.metamatrix.common.config.api.exceptions.ConfigurationException; import com.metamatrix.common.config.reader.CurrentConfigurationReader; Modified: trunk/server/src/main/java/com/metamatrix/platform/service/api/Ca= cheAdmin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/platform/service/api/CacheAdm= in.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/main/java/com/metamatrix/platform/service/api/CacheAdm= in.java 2009-02-26 21:26:48 UTC (rev 513) @@ -22,7 +22,6 @@ = package com.metamatrix.platform.service.api; = -import java.rmi.Remote; import java.util.Map; import java.util.Properties; = Modified: trunk/server/src/main/java/com/metamatrix/server/query/service/Qu= eryService.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/query/service/QuerySer= vice.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/main/java/com/metamatrix/server/query/service/QuerySer= vice.java 2009-02-26 21:26:48 UTC (rev 513) @@ -35,7 +35,6 @@ = import com.metamatrix.api.exception.ComponentNotFoundException; import com.metamatrix.api.exception.MetaMatrixComponentException; -import com.metamatrix.api.exception.MetaMatrixProcessingException; import com.metamatrix.api.exception.server.InvalidRequestIDException; import com.metamatrix.common.application.DQPConfigSource; import com.metamatrix.common.comm.ClientServiceRegistry; Modified: trunk/server/src/test/java/com/metamatrix/admin/server/TestServer= ConfigAdminImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfig= AdminImpl.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/test/java/com/metamatrix/admin/server/TestServerConfig= AdminImpl.java 2009-02-26 21:26:48 UTC (rev 513) @@ -21,29 +21,25 @@ */ = package com.metamatrix.admin.server; -import java.io.File; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Properties; +import java.io.File; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Properties; + +import junit.framework.TestCase; + +import com.metamatrix.admin.api.exception.AdminException; +import com.metamatrix.admin.api.objects.Host; +import com.metamatrix.core.util.ObjectConverterUtil; +import com.metamatrix.core.util.UnitTestUtil; +import com.metamatrix.metadata.runtime.api.Model; +import com.metamatrix.metadata.runtime.api.VirtualDatabase; +import com.metamatrix.metadata.runtime.api.VirtualDatabaseID; +import com.metamatrix.platform.registry.ClusteredRegistryState; +import com.metamatrix.platform.registry.FakeRegistryUtil; = -import junit.framework.TestCase; = -import org.jboss.cache.Cache; -import org.jboss.cache.CacheFactory; -import org.jboss.cache.DefaultCacheFactory; - -import com.metamatrix.admin.api.exception.AdminException; -import com.metamatrix.admin.api.objects.Host; -import com.metamatrix.core.util.ObjectConverterUtil; -import com.metamatrix.core.util.UnitTestUtil; -import com.metamatrix.metadata.runtime.api.Model; -import com.metamatrix.metadata.runtime.api.VirtualDatabase; -import com.metamatrix.metadata.runtime.api.VirtualDatabaseID; -import com.metamatrix.platform.registry.ClusteredRegistryState; -import com.metamatrix.platform.registry.FakeRegistryUtil; - - /** = * Unit tests of ServerMonitoringAdminImpl * @since 4.3 Modified: trunk/server/src/test/java/com/metamatrix/common/extensionmodule/= TestExtensionModuleManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/common/extensionmodule/TestEx= tensionModuleManager.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/test/java/com/metamatrix/common/extensionmodule/TestEx= tensionModuleManager.java 2009-02-26 21:26:48 UTC (rev 513) @@ -47,7 +47,6 @@ import com.metamatrix.common.extensionmodule.exception.InvalidExtensionMod= uleTypeException; import com.metamatrix.common.messaging.MessageBusConstants; import com.metamatrix.common.util.PropertiesUtils; -import com.metamatrix.core.CoreConstants; = = public class TestExtensionModuleManager extends TestCase { Modified: trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml= /HelperTestConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/Helpe= rTestConfiguration.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/Helpe= rTestConfiguration.java 2009-02-26 21:26:48 UTC (rev 513) @@ -34,7 +34,6 @@ import com.metamatrix.common.config.api.ConnectorBinding; import com.metamatrix.common.config.api.DeployedComponent; import com.metamatrix.common.config.api.Host; -import com.metamatrix.common.config.api.HostType; import com.metamatrix.common.config.api.SharedResource; import com.metamatrix.common.config.api.exceptions.ConfigurationException; import com.metamatrix.core.util.ArgCheck; Modified: trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml= /TestCurrentConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestC= urrentConfiguration.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestC= urrentConfiguration.java 2009-02-26 21:26:48 UTC (rev 513) @@ -28,7 +28,6 @@ import com.metamatrix.common.config.api.Configuration; import com.metamatrix.common.config.api.ConfigurationModelContainer; import com.metamatrix.common.config.api.Host; -import com.metamatrix.common.util.VMNaming; import com.metamatrix.platform.config.BaseTest; import com.metamatrix.platform.config.CurrentConfigHelper; = Modified: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBReso= urceServlet.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceSe= rvlet.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceSe= rvlet.java 2009-02-26 21:26:48 UTC (rev 513) @@ -22,40 +22,39 @@ = package com.metamatrix.soap.servlet; = -import java.io.File; -import java.io.IOException; -import java.io.Reader; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.sql.CallableStatement; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import java.io.File; +import java.io.IOException; +import java.io.Reader; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.sql.CallableStatement; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import com.metamatrix.common.api.MMURL; -import com.metamatrix.common.api.MMURL.CONNECTION; -import com.metamatrix.common.util.WSDLServletUtil; -import com.metamatrix.core.CoreConstants; -import com.metamatrix.core.log.FileLogWriter; -import com.metamatrix.core.log.LogListener; -import com.metamatrix.core.log.MessageLevel; -import com.metamatrix.core.util.StringUtil; -import com.metamatrix.soap.SOAPPlugin; -import com.metamatrix.soap.util.ErrorMessageKeys; -import com.metamatrix.soap.util.SOAPConstants; +import com.metamatrix.common.util.WSDLServletUtil; +import com.metamatrix.core.CoreConstants; +import com.metamatrix.core.log.FileLogWriter; +import com.metamatrix.core.log.LogListener; +import com.metamatrix.core.log.MessageLevel; +import com.metamatrix.core.util.StringUtil; +import com.metamatrix.soap.SOAPPlugin; +import com.metamatrix.soap.util.ErrorMessageKeys; +import com.metamatrix.soap.util.SOAPConstants; import com.metamatrix.soap.util.WebServiceUtil; = = Modified: trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestT= ranslationUtility.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTransla= tionUtility.java 2009-02-26 21:14:35 UTC (rev 512) +++ trunk/test-integration/src/test/java/com/metamatrix/cdk/api/TestTransla= tionUtility.java 2009-02-26 21:26:48 UTC (rev 513) @@ -22,14 +22,13 @@ = package com.metamatrix.cdk.api; = +import junit.framework.TestCase; + import org.teiid.connector.language.ICommand; import org.teiid.connector.language.IGroup; import org.teiid.connector.language.IQuery; import org.teiid.connector.metadata.runtime.MetadataObject; -import org.teiid.connector.metadata.runtime.RuntimeMetadata; = -import junit.framework.TestCase; - import com.metamatrix.core.util.UnitTestUtil; = public class TestTranslationUtility extends TestCase { --===============9190476635268996196==-- From teiid-commits at lists.jboss.org Thu Feb 26 16:26:52 2009 Content-Type: multipart/mixed; boundary="===============4230022781167643212==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r514 - in trunk/server/src/main/java/com/metamatrix/platform: vm and 1 other directory. Date: Thu, 26 Feb 2009 16:26:52 -0500 Message-ID: --===============4230022781167643212== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-26 16:26:52 -0500 (Thu, 26 Feb 2009) New Revision: 514 Removed: trunk/server/src/main/java/com/metamatrix/platform/config/transaction/ trunk/server/src/main/java/com/metamatrix/platform/vm/util/ Log: removing unused imports --===============4230022781167643212==-- From teiid-commits at lists.jboss.org Thu Feb 26 16:30:23 2009 Content-Type: multipart/mixed; boundary="===============1596101678946601191==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r515 - in trunk: connector-sdk/src/main/java/com/metamatrix/core/commandshell and 14 other directories. Date: Thu, 26 Feb 2009 16:30:23 -0500 Message-ID: --===============1596101678946601191== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-26 16:30:22 -0500 (Thu, 26 Feb 2009) New Revision: 515 Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/ByteArrayHelp= er.java trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Comma= ndShell.java trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/TestC= ommand.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/SOAPConnectorStateImpl.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= l/soap/SOAPExecutor.java trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xm= lsource/XMLSourceConnector.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestCriteriaDesc.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestStringBackedValueReference.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLCapabilities.java trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/xm= l/base/TestXMLExtractor.java trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/meta= matrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java trunk/console/src/main/java/com/metamatrix/console/models/SummaryManager= .java trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util/= PropertyConstants.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language/= GroupImpl.java trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Trans= actionProvider.java trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMessa= ge.java trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/Gen= erateCanonical.java trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Rel= ationalNodeUtil.java trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.j= ava trunk/engine/src/main/java/com/metamatrix/query/rewriter/VariableSubstit= utionVisitor.java trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/multisour= ce/TestMultiSourcePlanToProcessConverter.java Log: removing unused imports Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/ByteAr= rayHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/ByteArrayHel= per.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/ByteArrayHel= per.java 2009-02-26 21:30:22 UTC (rev 515) @@ -28,7 +28,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.util.ArrayList; import java.util.Iterator; = Modified: trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshel= l/CommandShell.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Comm= andShell.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connector-sdk/src/main/java/com/metamatrix/core/commandshell/Comm= andShell.java 2009-02-26 21:30:22 UTC (rev 515) @@ -29,9 +29,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Comparator; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.Stack; @@ -40,8 +38,6 @@ import com.metamatrix.core.CorePlugin; import com.metamatrix.core.MetaMatrixRuntimeException; import com.metamatrix.core.log.FileLogWriter; -import com.metamatrix.core.log.LogListener; -import com.metamatrix.core.log.SystemLogWriter; import com.metamatrix.core.util.FileUtil; import com.metamatrix.core.util.MetaMatrixExceptionUtil; import com.metamatrix.core.util.StringUtil; Modified: trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshel= l/TestCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/Test= Command.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connector-sdk/src/test/java/com/metamatrix/core/commandshell/Test= Command.java 2009-02-26 21:30:22 UTC (rev 515) @@ -24,6 +24,8 @@ = import java.util.TimeZone; import junit.framework.TestCase; + +import com.metamatrix.common.util.TimestampWithTimezone; import com.metamatrix.core.util.UnitTestUtil; = public class TestCommand extends TestCase { @@ -33,11 +35,11 @@ } = public void setUp() { - TimeZone.setDefault(TimeZone.getTimeZone("GMT-06:00")); //$NON-NLS-1$ + TimestampWithTimezone.resetCalendar(TimeZone.getTimeZone("GMT-06:00")); = //$NON-NLS-1$ } = public void tearDown() { - TimeZone.setDefault(null); + TimestampWithTimezone.resetCalendar(null); } = public void test() throws Exception { Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/soap/SOAPConnectorStateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPConnectorStateImpl.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPConnectorStateImpl.java 2009-02-26 21:30:22 UTC (rev 515) @@ -24,8 +24,8 @@ = package com.metamatrix.connector.xml.soap; = -import java.text.MessageFormat; -import java.util.Properties; +import java.text.MessageFormat; +import java.util.Properties; = import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; @@ -34,10 +34,9 @@ import org.teiid.connector.api.ConnectorException; import org.teiid.connector.api.ConnectorLogger; = -import com.metamatrix.connector.xml.SOAPConnectorState; -import com.metamatrix.connector.xml.base.Messages; +import com.metamatrix.connector.xml.SOAPConnectorState; +import com.metamatrix.connector.xml.base.Messages; import com.metamatrix.connector.xml.http.HTTPConnectorState; -import com.metamatrix.connector.xmlsource.soap.SecurityToken; = /** * Contains the data needed to create the SOAP Envelope around an XML Docu= ment. Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xml/soap/SOAPExecutor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPExecutor.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= ml/soap/SOAPExecutor.java 2009-02-26 21:30:22 UTC (rev 515) @@ -45,7 +45,6 @@ import org.apache.axis.client.Service; import org.apache.axis.configuration.SimpleProvider; import org.apache.axis.handlers.SimpleSessionHandler; -import org.apache.axis.message.MessageElement; import org.apache.axis.message.SOAPBodyElement; import org.apache.axis.message.SOAPEnvelope; import org.apache.axis.soap.SOAPConstants; Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/conne= ctor/xmlsource/XMLSourceConnector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceConnector.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/x= mlsource/XMLSourceConnector.java 2009-02-26 21:30:22 UTC (rev 515) @@ -23,7 +23,6 @@ package com.metamatrix.connector.xmlsource; = import org.teiid.connector.api.Connection; -import org.teiid.connector.api.Connector; import org.teiid.connector.api.ConnectorCapabilities; import org.teiid.connector.api.ConnectorEnvironment; import org.teiid.connector.api.ConnectorException; @@ -32,8 +31,7 @@ import org.teiid.connector.basic.BasicConnector; = /** - * XML Source connector, will give provide a XML document as source to - * Metamatrix engine. + * XML Source connector */ @ConnectionPooling public class XMLSourceConnector extends BasicConnector { Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestCriteriaDesc.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestCriteriaDesc.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestCriteriaDesc.java 2009-02-26 21:30:22 UTC (rev 515) @@ -27,25 +27,21 @@ import java.util.Iterator; import java.util.List; = +import junit.framework.TestCase; + import org.teiid.connector.api.ConnectorException; import org.teiid.connector.language.IBaseInCriteria; import org.teiid.connector.language.ICompareCriteria; import org.teiid.connector.language.ICriteria; import org.teiid.connector.language.IElement; import org.teiid.connector.language.IExpression; -import org.teiid.connector.language.IFrom; -import org.teiid.connector.language.IGroup; import org.teiid.connector.language.IQuery; -import org.teiid.connector.language.ISelect; import org.teiid.connector.language.ISelectSymbol; import org.teiid.connector.language.LanguageUtil; import org.teiid.connector.metadata.runtime.Element; -import org.teiid.connector.metadata.runtime.Group; import org.teiid.connector.metadata.runtime.RuntimeMetadata; = -import junit.framework.TestCase; = - /** * created by JChoate on Jun 27, 2005 * Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestStringBackedValueReference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestStringBackedValueReference.java 2009-02-26 21:26:52 UTC (rev 51= 4) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestStringBackedValueReference.java 2009-02-26 21:30:22 UTC (rev 51= 5) @@ -22,8 +22,6 @@ = package com.metamatrix.connector.xml.base; = -import org.teiid.connector.api.ConnectorException; - import junit.framework.TestCase; = = Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLCapabilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLCapabilities.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLCapabilities.java 2009-02-26 21:30:22 UTC (rev 515) @@ -22,10 +22,6 @@ = package com.metamatrix.connector.xml.base; = -import java.util.List; - -import org.teiid.connector.api.ConnectorCapabilities; - import junit.framework.TestCase; = = @@ -83,7 +79,7 @@ * Class under test for List getSupportedFunctions() */ public void testGetSupportedFunctions() { - List funcs =3D m_caps.getSupportedFunctions(); + assertNotNull(m_caps.getSupportedFunctions()); } = public void testSupportsSelectDistinct() { Modified: trunk/connectors/connector-xml/src/test/java/com/metamatrix/conne= ctor/xml/base/TestXMLExtractor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLExtractor.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/connector-xml/src/test/java/com/metamatrix/connector/x= ml/base/TestXMLExtractor.java 2009-02-26 21:30:22 UTC (rev 515) @@ -29,7 +29,6 @@ = import org.jdom.Document; import org.teiid.connector.api.ConnectorException; -import org.teiid.connector.api.ConnectorLogger; = import com.metamatrix.cdk.api.SysLogger; = Modified: trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/c= om/metamatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java 2009-= 02-26 21:26:52 UTC (rev 514) +++ trunk/connectors/sandbox/connector-oracle-spatial/src/main/java/com/met= amatrix/connector/jdbc/oracle/spatial/NnDistanceFunctionModifier.java 2009-= 02-26 21:30:22 UTC (rev 515) @@ -22,8 +22,6 @@ = package com.metamatrix.connector.jdbc.oracle.spatial; = -import java.util.List; - import org.teiid.connector.language.IExpression; import org.teiid.connector.language.IFunction; = Modified: trunk/console/src/main/java/com/metamatrix/console/models/Summary= Manager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/console/src/main/java/com/metamatrix/console/models/SummaryManage= r.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/console/src/main/java/com/metamatrix/console/models/SummaryManage= r.java 2009-02-26 21:30:22 UTC (rev 515) @@ -33,10 +33,8 @@ import java.util.Iterator; = import com.metamatrix.api.exception.security.AuthorizationException; -import com.metamatrix.common.config.api.Configuration; import com.metamatrix.common.config.api.Host; import com.metamatrix.common.config.api.HostID; -import com.metamatrix.common.config.api.HostType; import com.metamatrix.common.config.api.ReleaseInfo; import com.metamatrix.common.log.LogManager; import com.metamatrix.common.util.MetaMatrixProductNames; Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/deplo= y/util/PropertyConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util= /PropertyConstants.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/console/src/main/java/com/metamatrix/console/ui/views/deploy/util= /PropertyConstants.java 2009-02-26 21:30:22 UTC (rev 515) @@ -23,7 +23,6 @@ //########################################################################= ##### package com.metamatrix.console.ui.views.deploy.util; = -import com.metamatrix.common.config.api.HostType; = /** * @version 1.0 Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/la= nguage/GroupImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /GroupImpl.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/datamgr/language= /GroupImpl.java 2009-02-26 21:30:22 UTC (rev 515) @@ -27,7 +27,6 @@ import org.teiid.connector.visitor.framework.LanguageObjectVisitor; = import com.metamatrix.core.util.HashCodeUtil; -import com.metamatrix.metadata.runtime.api.MetadataID; = public class GroupImpl extends BaseLanguageObject implements IGroup { = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/transactio= n/TransactionProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Tran= sactionProvider.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/transaction/Tran= sactionProvider.java 2009-02-26 21:30:22 UTC (rev 515) @@ -31,8 +31,6 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; = -import org.teiid.connector.xa.api.XAConnection; - import com.metamatrix.common.xa.MMXid; import com.metamatrix.common.xa.XATransactionException; = Modified: trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResul= tsMessage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMess= age.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/dqp/message/AtomicResultsMess= age.java 2009-02-26 21:30:22 UTC (rev 515) @@ -28,8 +28,6 @@ import java.io.ObjectOutput; import java.util.List; = -import org.teiid.connector.api.ConnectorException; - import com.metamatrix.common.batch.BatchSerializer; import com.metamatrix.core.util.ExternalizeUtil; = Modified: trunk/engine/src/main/java/com/metamatrix/query/optimizer/relatio= nal/GenerateCanonical.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/Ge= nerateCanonical.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/query/optimizer/relational/Ge= nerateCanonical.java 2009-02-26 21:30:22 UTC (rev 515) @@ -30,7 +30,6 @@ import com.metamatrix.api.exception.query.QueryPlannerException; import com.metamatrix.query.execution.QueryExecPlugin; import com.metamatrix.query.metadata.QueryMetadataInterface; -import com.metamatrix.query.metadata.SupportConstants; import com.metamatrix.query.optimizer.relational.plantree.JoinStrategyType; import com.metamatrix.query.optimizer.relational.plantree.NodeConstants; import com.metamatrix.query.optimizer.relational.plantree.NodeFactory; Modified: trunk/engine/src/main/java/com/metamatrix/query/processor/relatio= nal/RelationalNodeUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Re= lationalNodeUtil.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/query/processor/relational/Re= lationalNodeUtil.java 2009-02-26 21:30:22 UTC (rev 515) @@ -22,8 +22,6 @@ = package com.metamatrix.query.processor.relational; = -import java.util.Collections; - import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.CriteriaEvaluationException; import com.metamatrix.common.buffer.BlockedException; @@ -37,7 +35,6 @@ import com.metamatrix.query.sql.lang.SetQuery; import com.metamatrix.query.sql.lang.Update; import com.metamatrix.query.sql.symbol.Constant; -import com.metamatrix.query.sql.visitor.ElementCollectorVisitor; import com.metamatrix.query.sql.visitor.EvaluateExpressionVisitor; = = Modified: trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRew= riter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.= java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/query/rewriter/QueryRewriter.= java 2009-02-26 21:30:22 UTC (rev 515) @@ -50,7 +50,6 @@ import com.metamatrix.api.exception.query.FunctionExecutionException; import com.metamatrix.api.exception.query.InvalidFunctionException; import com.metamatrix.api.exception.query.QueryMetadataException; -import com.metamatrix.api.exception.query.QueryProcessingException; import com.metamatrix.api.exception.query.QueryResolverException; import com.metamatrix.api.exception.query.QueryValidatorException; import com.metamatrix.common.buffer.BlockedException; Modified: trunk/engine/src/main/java/com/metamatrix/query/rewriter/Variable= SubstitutionVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/main/java/com/metamatrix/query/rewriter/VariableSubsti= tutionVisitor.java 2009-02-26 21:26:52 UTC (rev 514) +++ trunk/engine/src/main/java/com/metamatrix/query/rewriter/VariableSubsti= tutionVisitor.java 2009-02-26 21:30:22 UTC (rev 515) @@ -49,8 +49,6 @@ import com.metamatrix.query.sql.symbol.Constant; import com.metamatrix.query.sql.symbol.ElementSymbol; import com.metamatrix.query.sql.symbol.Expression; -import com.metamatrix.query.sql.symbol.GroupSymbol; -import com.metamatrix.query.sql.symbol.Reference; import com.metamatrix.query.sql.visitor.ExpressionMappingVisitor; import com.metamatrix.query.sql.visitor.ReferenceCollectorVisitor; import com.metamatrix.query.sql.visitor.VariableCollectorVisitor; Modified: trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/mu= ltisource/TestMultiSourcePlanToProcessConverter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/multisou= rce/TestMultiSourcePlanToProcessConverter.java 2009-02-26 21:26:52 UTC (rev= 514) +++ trunk/engine/src/test/java/com/metamatrix/dqp/internal/process/multisou= rce/TestMultiSourcePlanToProcessConverter.java 2009-02-26 21:30:22 UTC (rev= 515) @@ -54,7 +54,6 @@ import com.metamatrix.query.sql.visitor.ElementCollectorVisitor; import com.metamatrix.query.unittest.FakeMetadataFacade; import com.metamatrix.query.unittest.FakeMetadataFactory; -import com.metamatrix.query.unittest.FakeMetadataObject; import com.metamatrix.query.util.CommandContext; = = --===============1596101678946601191==-- From teiid-commits at lists.jboss.org Thu Feb 26 17:08:21 2009 Content-Type: multipart/mixed; boundary="===============5581486522671674687==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r516 - trunk/documentation/reference/src/main/docbook/en-US/content. Date: Thu, 26 Feb 2009 17:08:21 -0500 Message-ID: --===============5581486522671674687== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: shawkins Date: 2009-02-26 17:08:21 -0500 (Thu, 26 Feb 2009) New Revision: 516 Modified: trunk/documentation/reference/src/main/docbook/en-US/content/procedures.= xml trunk/documentation/reference/src/main/docbook/en-US/content/sql_support= .xml Log: TEIID-355 deprecating the use of select into to target a table. Modified: trunk/documentation/reference/src/main/docbook/en-US/content/proc= edures.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/reference/src/main/docbook/en-US/content/procedures= .xml 2009-02-26 21:30:22 UTC (rev 515) +++ trunk/documentation/reference/src/main/docbook/en-US/content/procedures= .xml 2009-02-26 22:08:21 UTC (rev 516) @@ -45,7 +45,7 @@ - The "INTO" clause will project the dynamic SQL into the sp= ecified temp table. At runtime with the "INTO" clause specified, the dynami= c command will actually execute a statement that behaves like a SELECT INTO= . If the dynamic SQL command creates a temporary table with the "INTO" clau= se, then the "AS" clause is required to define the table=E2=80=99s metadata. + The "INTO" clause will project the dynamic SQL into the sp= ecified temp table. With the "INTO" clause specified, the dynamic command w= ill actually execute a statement that behaves like an INSERT with a QUERY E= XPRESSION. If the dynamic SQL command creates a temporary table with the "I= NTO" clause, then the "AS" clause is required to define the table=E2=80=99s= metadata. Modified: trunk/documentation/reference/src/main/docbook/en-US/content/sql_= support.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/reference/src/main/docbook/en-US/content/sql_suppor= t.xml 2009-02-26 21:30:22 UTC (rev 515) +++ trunk/documentation/reference/src/main/docbook/en-US/content/sql_suppor= t.xml 2009-02-26 22:08:21 UTC (rev 516) @@ -824,6 +824,9 @@ INTO Clause + + Usage of the INTO Clause for inserting into a table has been = been deprecated. An INSERT with a = query command should be used instead. + When the into clause is specified with a SELECT, the results of the = query are inserted into the specified table. This is often used to insert r= ecords into a temporary table. The INTO clause immediately precedes the FRO= M clause. = --===============5581486522671674687==-- From teiid-commits at lists.jboss.org Thu Feb 26 18:42:51 2009 Content-Type: multipart/mixed; boundary="===============4511310328688922066==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r517 - in trunk: client-jdbc/src/main/java/com/metamatrix/jdbc and 4 other directories. Date: Thu, 26 Feb 2009 18:42:51 -0500 Message-ID: --===============4511310328688922066== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-26 18:42:51 -0500 (Thu, 26 Feb 2009) New Revision: 517 Removed: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DriverManagerLogger.= java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCLogger.java Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/AbstractMetadataProv= ider.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDataSource.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DeferredMetadataProv= ider.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/FilteredResultsMetad= ata.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMCallableStatement.= java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDatabaseMetaData.j= ava trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement.= java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMResultSet.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMStatement.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAConnection.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAResource.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ResultsMetadataWithP= rovider.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/StaticMetadataProvid= er.java trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/util/MMJDBCURL.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDataSource.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDriver.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMResultSet.java trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/util/TestMMJDBCURL.j= ava trunk/client/src/main/java/com/metamatrix/common/api/MMURL.java trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.java Log: TEIID-385: replaced with java logging. RequestAware logging is no longer av= ailable. Modified: trunk/client/src/main/java/com/metamatrix/common/api/MMURL.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client/src/main/java/com/metamatrix/common/api/MMURL.java 2009-02= -26 22:08:21 UTC (rev 516) +++ trunk/client/src/main/java/com/metamatrix/common/api/MMURL.java 2009-02= -26 23:42:51 UTC (rev 517) @@ -45,20 +45,8 @@ public static final String VDB_VERSION =3D "VirtualDatabaseVersion"; = //$NON-NLS-1$ // constant for vdb version part of serverURL public static final String VERSION =3D "version"; //$NON-NLS-1$ - // string constant that the url contains - public static final String LOG_FILE =3D "logFile"; //$NON-NLS-1$ - // string constant that the url contains - public static final String LOG_LEVEL =3D "logLevel"; //$NON-NLS-1$ - = - // logging level that would log messages - public static final int LOG_NONE =3D 0; - // logging level that would log error messages - public static final int LOG_ERROR =3D 1; - // logging level that would log all info level messages - public static final int LOG_INFO =3D 2; - // logging level that would traces method calls - public static final int LOG_TRACE =3D 3; - public static final String CREDENTIALS =3D "credentials"; //$NON-NLS-1$ + + public static final String CREDENTIALS =3D "credentials"; //$NON-NLS-= 1$ } = public static interface CONNECTION { Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/AbstractMetad= ataProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/AbstractMetadataPro= vider.java 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/AbstractMetadataPro= vider.java 2009-02-26 23:42:51 UTC (rev 517) @@ -24,13 +24,9 @@ = import java.sql.SQLException; = -import com.metamatrix.core.log.Logger; - /** */ public abstract class AbstractMetadataProvider implements ResultsMetadataP= rovider { - Logger logger; - = public String getStringValue(int columnIndex, Integer metadataProperty= Key) throws SQLException { return (String) getValue(columnIndex, metadataPropertyKey); } @@ -42,20 +38,4 @@ public boolean getBooleanValue(int columnIndex, Integer metadataProper= tyKey) throws SQLException { return ((Boolean) getValue(columnIndex, metadataPropertyKey)).bool= eanValue(); } - - /** - * JDBC Logger = - * @param logger - */ - void setLogger(Logger logger) { - this.logger =3D logger; - } - - /** - * JDBC Logger = - * @return logger - */ - public Logger getLogger() { - return this.logger; - } } Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDataSourc= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDataSource.java= 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/BaseDataSource.java= 2009-02-26 23:42:51 UTC (rev 517) @@ -113,19 +113,6 @@ public static final String USER_NAME =3D MMURL.CONNECTION.USER_NAME; = // constant for password part of url public static final String PASSWORD =3D MMURL.CONNECTION.PASSWORD; = - // string constant that the url contains - public static final String LOG_FILE =3D MMURL.JDBC.LOG_FILE; = - // string constant that the url contains - public static final String LOG_LEVEL =3D MMURL.JDBC.LOG_LEVEL; = - // logging level that would log messages - public static final int LOG_NONE =3D MMURL.JDBC.LOG_NONE; - // logging level that would log exception stack traces - public static final int LOG_ERROR =3D MMURL.JDBC.LOG_ERROR; = - // logging level that would log messages - public static final int LOG_INFO =3D MMURL.JDBC.LOG_INFO; - // logging level that would traces method calls - public static final int LOG_TRACE =3D MMURL.JDBC.LOG_TRACE; - = protected static final int DEFAULT_TIMEOUT =3D 0; protected static final int DEFAULT_LOG_LEVEL =3D 0; @@ -194,25 +181,6 @@ */ private String applicationName; = - /** - * The path and file name to which JDBC Log Statements will be written. - * This property is optional; if none is specified, then no Log= Statements will be written. - */ - private String logFile; - - /** - * The level of Log Statements. This property is only used if the logFile property - * is specified, and must be either - *
    - *
  • "0" - no JDBC log messages will be written to th= e file
    • - *
  • "1" - all JDBC log messages will be written to t= he file
    • - *
  • "2" - all JDBC log messages as well as stack tra= ces of any exceptions thrown from - * this driver will be written to the file
    • - *
- * This property is optional and defaults to "0". - */ - private int logLevel; = - /** Support partial results mode or not.*/ private String partialResultsMode; = @@ -322,7 +290,6 @@ */ public BaseDataSource() { this.loginTimeout =3D DEFAULT_TIMEOUT; - this.logLevel =3D DEFAULT_LOG_LEVEL; } = // -------------------------------------------------------------------= ------------------------- @@ -359,14 +326,6 @@ props.put(MMURL.CONNECTION.CLIENT_TOKEN_PROP, token); } = - if ( this.getLogFile() !=3D null && this.getLogFile().trim().lengt= h() !=3D 0 ) { - props.setProperty(BaseDataSource.LOG_FILE,this.getLogFile().tr= im()); - } - - if ( this.getLogLevel() !=3D 0 ) { - props.setProperty(BaseDataSource.LOG_LEVEL,Integer.toString(th= is.getLogLevel())); - } - if (this.getPartialResultsMode() !=3D null && this.getPartialResul= tsMode().trim().length() !=3D 0) { props.setProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_MOD= E, this.getPartialResultsMode()); } @@ -429,16 +388,6 @@ throw new SQLException(reason); } = - reason =3D reasonWhyInvalidLogFile(this.logFile); - if ( reason !=3D null ) { - throw new SQLException(reason); - } - - reason =3D reasonWhyInvalidLogLevel(this.logLevel); - if ( reason !=3D null ) { - throw new SQLException(reason); - } - final String pwd =3D password !=3D null ? password : getPassword(); reason =3D reasonWhyInvalidPassword(pwd); if ( reason !=3D null ) { @@ -666,29 +615,6 @@ } = /** - * Returns the path and file name to which JDBC Log Statements will be= written. - * @return the name of the log file for this data source; may be null - */ - public String getLogFile() { - return logFile; - } - - /** - * Returns the level of logging. This property is only used if the logFile property - * is specified, and must be either - *
    - *
  • "0" - no JDBC log messages will be written to th= e file
    • - *
  • "1" - all JDBC log messages will be written to t= he file
    • - *
  • "2" - all JDBC log messages as well as stack tra= ces of any exceptions thrown from - * this driver will be written to the file
  • - *
- * @return The logging level for this data source - */ - public int getLogLevel() { - return logLevel; - } - - /** * Sets the name of the application. Supplying this property may allo= w an administrator of a * MetaMatrix Server to better identify individual connections and usa= ge patterns. * This property is optional. @@ -764,29 +690,6 @@ this.description =3D description; } = - /** - * Sets the path and file name to which JDBC Log Statements will be wr= itten. - * @param logFile The log file for this data source - */ - public void setLogFile(final String logFile) { - this.logFile =3D logFile; - } - - /** - * Sets the level of logging. This property is only used if the logFile property - * is specified, and must be either - *
    - *
  • "0" - no JDBC log messages will be written to th= e file
    • - *
  • "1" - all JDBC log messages will be written to t= he file
    • - *
  • "2" - all JDBC log messages as well as stack tra= ces of any exceptions thrown from - * this driver will be written to the file
  • - *
- * @param logLevel The logging level for this data source - */ - public void setLogLevel(final int logLevel) { - this.logLevel =3D logLevel; - } - public void setPartialResultsMode(String partialResultsMode) { this.partialResultsMode =3D partialResultsMode; } @@ -1012,31 +915,6 @@ } = /** - * Return the reason why the supplied log file may be invalid, or null - * if it is considered valid. - * @param logFile a possible value for the property - * @return the reason why the property is invalid, or null if it is co= nsidered valid - * @see #setLogFile(String) - */ - public static String reasonWhyInvalidLogFile( final String logFile ) { - return null; - } - - /** - * Return the reason why the supplied log level may be invalid, or nul= l * if it is considered valid. - * @param logLevel a possible value for the property - * @return the reason why the property is invalid, or null if it is co= nsidered valid - * @see #setLogLevel(int) - */ - public static String reasonWhyInvalidLogLevel( final int logLevel ) { - if ( logLevel < BaseDataSource.LOG_NONE || logLevel > BaseDataSour= ce.LOG_TRACE ) { - Object[] params =3D new Object[] {new Integer(BaseDataSource.L= OG_NONE), new Integer(BaseDataSource.LOG_ERROR), new Integer(BaseDataSource= .LOG_INFO), new Integer(BaseDataSource.LOG_TRACE)}; - return getResourceMessage("MMDataSource.Log_level_invalid", pa= rams); //$NON-NLS-1$ - } - return null; - } - - /** * The reason why partialResultsMode is invalid. * @param partialMode boolean flag * @return String reason Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DeferredMetad= ataProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DeferredMetadataPro= vider.java 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DeferredMetadataPro= vider.java 2009-02-26 23:42:51 UTC (rev 517) @@ -28,7 +28,6 @@ = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.MetaMatrixProcessingException; -import com.metamatrix.core.log.Logger; import com.metamatrix.core.util.StringUtil; import com.metamatrix.dqp.client.MetadataResult; import com.metamatrix.dqp.metadata.ResultsMetadataConstants; @@ -46,7 +45,7 @@ DeferredMetadataProvider() { = } = - public static DeferredMetadataProvider createWithInitialData(String[] = columnNames, String[] columnTypes, MMStatement statement, long requestID, L= ogger logger) { + public static DeferredMetadataProvider createWithInitialData(String[] = columnNames, String[] columnTypes, MMStatement statement, long requestID) { if(columnNames =3D=3D null || columnTypes =3D=3D null || columnNam= es.length !=3D columnTypes.length) { Object[] params =3D new Object[] { = StringUtil.toString(columnNames), StringUtil.toString(colu= mnTypes) @@ -56,7 +55,6 @@ = DeferredMetadataProvider provider =3D null; provider =3D new DeferredMetadataProvider(); = - provider.setLogger(logger); provider.setDeferredLookupAttributes(statement, requestID); provider.loadPartialMetadata(columnNames, columnTypes); = return provider; = @@ -75,7 +73,7 @@ columnMetadata[i].put(ResultsMetadataConstants.DATA_TYPE, colu= mnTypes[i]); } = - this.staticProvider =3D StaticMetadataProvider.createWithData(colu= mnMetadata, -1, getLogger()); = + this.staticProvider =3D StaticMetadataProvider.createWithData(colu= mnMetadata, -1); = } = private void loadFullMetadata() throws SQLException { @@ -87,7 +85,7 @@ } catch (MetaMatrixProcessingException e) { throw MMSQLException.create(e); } - this.staticProvider =3D StaticMetadataProvider.createWithData(resu= lts.getColumnMetadata(), results.getParameterCount(), getLogger()); + this.staticProvider =3D StaticMetadataProvider.createWithData(resu= lts.getColumnMetadata(), results.getParameterCount()); } = public int getColumnCount() throws SQLException { Deleted: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DriverManagerL= ogger.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DriverManagerLogger= .java 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/DriverManagerLogger= .java 2009-02-26 23:42:51 UTC (rev 517) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.jdbc; - -import java.io.PrintWriter; - -import com.metamatrix.core.log.Logger; - - -/** = - * Default logger for the JDBC, this hooks to driver manager code - * = - * Note: remember that all the messages logged in the JDBC layer are - * logged with MessageLevel class's log levels, they need to be mapped - * to the jdbc levels. - */ -public class DriverManagerLogger implements Logger { - = - int allowedSeverity =3D BaseDataSource.LOG_NONE; - PrintWriter writer =3D null; - = - public DriverManagerLogger(int loglevel, PrintWriter writer) { - this.allowedSeverity =3D loglevel; - this.writer =3D writer; - } - = - private boolean allow(int level) { - return (JDBCLogger.convertToJDBCLogLevel(level) <=3D this.allowedS= everity); - } - - /** = - * @see com.metamatrix.core.log.Logger#log(int, java.lang.String) - */ - public void log(int severity, String message) { - if (this.writer !=3D null && allow(severity)) { - this.writer.println(message); - } - } - - /** = - * @see com.metamatrix.core.log.Logger#log(int, java.lang.Throwable, j= ava.lang.String) - */ - public void log(int severity, Throwable t, String message) { - if (this.writer !=3D null && allow(severity)) { - this.writer.println(message); - t.printStackTrace(this.writer); - } = - } -} Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/FilteredResul= tsMetadata.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/FilteredResultsMeta= data.java 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/FilteredResultsMeta= data.java 2009-02-26 23:42:51 UTC (rev 517) @@ -24,7 +24,6 @@ = import java.sql.SQLException; = -import com.metamatrix.core.log.Logger; import com.metamatrix.jdbc.api.ResultSetMetaData; = /** @@ -33,16 +32,14 @@ = private ResultSetMetaData delegate; = private int actualColumnCount; - Logger logger; = - static FilteredResultsMetadata newInstance (ResultSetMetaData rsmd, in= t actualColumnCount, Logger logger) { - return new FilteredResultsMetadata(rsmd, actualColumnCount, logger= ); + static FilteredResultsMetadata newInstance (ResultSetMetaData rsmd, in= t actualColumnCount) { + return new FilteredResultsMetadata(rsmd, actualColumnCount); } = = - FilteredResultsMetadata(ResultSetMetaData rsmd, int actualColumnCount,= Logger logger) { + FilteredResultsMetadata(ResultSetMetaData rsmd, int actualColumnCount)= { this.delegate =3D rsmd; this.actualColumnCount =3D actualColumnCount; - this.logger =3D logger; } = public int getColumnCount() throws SQLException { Deleted: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCLogger.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCLogger.java 200= 9-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/JDBCLogger.java 200= 9-02-26 23:42:51 UTC (rev 517) @@ -1,102 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * = - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * = - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * = - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.jdbc; - -import com.metamatrix.core.log.LogListener; -import com.metamatrix.core.log.LogMessage; -import com.metamatrix.core.log.Logger; -import com.metamatrix.core.log.MessageLevel; - - -/** = - * This is Logger used for the logging the Client side JDBC Specific log - * messages. = - */ -class JDBCLogger implements Logger { - static final String PLUGIN_ID =3D "JDBC"; //$NON-NLS-1$ - = - LogListener listener =3D null; - int allowedSeverity =3D BaseDataSource.LOG_NONE; - String connectonId; - = - /** - * ctor = - * @param severity - * @param listener - */ - public JDBCLogger(int severity, LogListener listener, String connId){ - this.allowedSeverity =3D severity; - this.listener =3D listener; - this.connectonId =3D connId; - } - = - = - /** - * The problem is JDBC Logging levels & core MessageLevel levels and - * IStatus logging levels all are different. Tried to minimize the cod= e to - * specify MessageLevel, however user configures to the JDBC level on = URL, and = - * need to write in IStatus level to make use of Listeners. (what a me= ss) = - * @param level - * @return true if allowed - */ - private boolean allow(int level) { - return (convertToJDBCLogLevel(level) <=3D this.allowedSeverity); - } - = - /** - * Convert the message level to jdbc log level = - * @param messageLevel - * @return jdbc level - */ - static int convertToJDBCLogLevel(int messageLevel) { - switch(messageLevel) { - case MessageLevel.CRITICAL: - case MessageLevel.ERROR: - return BaseDataSource.LOG_ERROR; - case MessageLevel.WARNING: - case MessageLevel.INFO: = - return BaseDataSource.LOG_INFO; - case MessageLevel.TRACE: = - return BaseDataSource.LOG_TRACE; = = - default: - return BaseDataSource.LOG_NONE; = - } - } = - = - /** = - * @see com.metamatrix.core.log.Logger#log(int, java.lang.String) - */ - public void log(int severity, String message) { - log(severity, null, message); = - } - - /** = - * @see com.metamatrix.core.log.Logger#log(int, java.lang.Throwable, j= ava.lang.String) - */ - public void log(int severity, Throwable t, String message) { - if (message !=3D null && allow(severity)) { - LogMessage msg =3D new LogMessage(PLUGIN_ID, severity, t, new = Object[] {connectonId, message}); - listener.logMessage(msg); = - } = - } -} Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMCallableSta= tement.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMCallableStatement= .java 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMCallableStatement= .java 2009-02-26 23:42:51 UTC (rev 517) @@ -43,7 +43,6 @@ import java.util.Map; = import com.metamatrix.common.util.TimestampWithTimezone; -import com.metamatrix.core.log.MessageLevel; import com.metamatrix.dqp.message.ResultsMessage; = /** @@ -392,10 +391,7 @@ try { return sendRequestMessageAndWait(commands, false, true, getPar= ameterValues(), false, isBatchedCommand); } catch ( Throwable ex ) { - // logging - String msg =3D JDBCPlugin.Util.getString("MMStatement.Error_ex= ecuting_stmt", commands[0]); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, ex, msg); - throw MMSQLException.create(ex, msg); + throw MMSQLException.create(ex, JDBCPlugin.Util.getString("MMS= tatement.Error_executing_stmt", commands[0])); //$NON-NLS-1$ } } = Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java 2= 009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMConnection.java 2= 009-02-26 23:42:51 UTC (rev 517) @@ -22,14 +22,12 @@ = package com.metamatrix.jdbc; = -import java.io.File; import java.sql.Array; import java.sql.Blob; import java.sql.CallableStatement; import java.sql.Clob; import java.sql.Connection; import java.sql.DatabaseMetaData; -import java.sql.DriverManager; import java.sql.NClob; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -49,6 +47,8 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.logging.Level; +import java.util.logging.Logger; = import javax.transaction.xa.Xid; = @@ -57,9 +57,6 @@ import com.metamatrix.common.comm.exception.CommunicationException; import com.metamatrix.common.xa.MMXid; import com.metamatrix.common.xa.XATransactionException; -import com.metamatrix.core.log.FileLogWriter; -import com.metamatrix.core.log.Logger; -import com.metamatrix.core.log.MessageLevel; import com.metamatrix.dqp.client.ClientSideDQP; import com.metamatrix.jdbc.api.ExecutionProperties; import com.metamatrix.platform.util.ProductInfoConstants; @@ -79,19 +76,17 @@ */ = public abstract class MMConnection extends WrapperImpl implements com.meta= matrix.jdbc.api.Connection { - + private static Logger logger =3D Logger.getLogger("org.teiid.jdbc"); //$N= ON-NLS-1$ + = // Unique request ID generator private long requestIDGenerator; = // url used to create the connection private String url; + = // properties object containing the connection properties. protected Properties propInfo; = - private int logLevel =3D BaseDataSource.LOG_NONE; - private FileLogWriter logWriter; - private Logger logger; - // status of connection object private boolean closed =3D false; // determines if a statement executed should be immediately committed. @@ -168,25 +163,9 @@ } else { info.put(ExecutionProperties.ALLOW_DBL_QUOTED_VARIABLE, Boolea= n.FALSE.toString()); } - - // Get the connection properties from properties object info. - String logFile =3D info.getProperty(BaseDataSource.LOG_FILE); - logLevel =3D readLoggingLevel(info, logLevel); - = - if(logFile !=3D null && logLevel > BaseDataSource.LOG_NONE){ - logWriter =3D new FileLogWriter(new File(logFile)); - logger =3D new JDBCLogger(logLevel, logWriter, serverConn.getL= ogonResult().getSessionID().toString()); = - } - else { - logger =3D new DriverManagerLogger(logLevel, DriverManager.get= LogWriter()); - } = - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMConnection.Session_= success"); //$NON-NLS-1$ - logger.log(MessageLevel.INFO, logMsg); - if (logLevel >=3D BaseDataSource.LOG_ERROR) { - logConnectionProperties(url, info); - } + logger.info(JDBCPlugin.Util.getString("MMConnection.Session_succes= s")); //$NON-NLS-1$ + logConnectionProperties(url, info); = // properties object used in obtaining connection this.propInfo =3D info; @@ -218,7 +197,7 @@ modifiedUrl.append(";").append(connUrl.substring(endIndex= )); //$NON-NLS-1$ } } - logger.log(MessageLevel.INFO, "Connection Url=3D"+modifiedUrl); /= /$NON-NLS-1$ + logger.info("Connection Url=3D"+modifiedUrl); //$NON-NLS-1$ } = // Now clone the properties object and remove password and trusted= token @@ -228,40 +207,18 @@ String key =3D (String)enumeration.nextElement(); Object anObj =3D info.get(key); // Log each property except for password and token. - if (!MMURL.JDBC.CREDENTIALS.equalsIgnoreCase(key) && !MMUR= L.CONNECTION.PASSWORD.equalsIgnoreCase(key) && !MMURL.CONNECTION.CLIENT_TOK= EN_PROP.equalsIgnoreCase(key)) { //$NON-NLS-1$ - logger.log(MessageLevel.INFO, key+"=3D"+anObj); //$NON= -NLS-1$ + if (!MMURL.JDBC.CREDENTIALS.equalsIgnoreCase(key) && !MMUR= L.CONNECTION.PASSWORD.equalsIgnoreCase(key) && !MMURL.CONNECTION.CLIENT_TOK= EN_PROP.equalsIgnoreCase(key)) { = + logger.info(key+"=3D"+anObj); //$NON-NLS-1$ } } } = } - - public static int readLoggingLevel(Properties info, int defaultValue) { - String loggingLevel =3D info.getProperty(BaseDataSource.LOG_LEVEL); - if(loggingLevel !=3D null){ - // get the logging level, aready verified this is an integer - return Integer.parseInt(loggingLevel); - } - return defaultValue; - } - - public static boolean isLoggingOn(Properties info) { - int logLevel =3D readLoggingLevel(info, BaseDataSource.LOG_NONE); - return logLevel > BaseDataSource.LOG_NONE; - } = String getUrl() { return this.url; } - + = /** - * retun the jdbc logger = - * @return - */ - public Logger getLogger() { - return logger; - } - = - /** * Connection identifier of this connection = * @return identifier * @throws SQLException = @@ -319,22 +276,11 @@ throw (SQLException)firstException; } } catch (SQLException se) { - String logMsg =3D JDBCPlugin.Util.getString("MMConnection.Err_= connection_close", se.getMessage()); //$NON-NLS-1$ - logger.log(MessageLevel.ERROR, se, logMsg); - throw MMSQLException.create(se, logMsg); - //throw new MMSQLException(logMsg, se); + throw MMSQLException.create(se, JDBCPlugin.Util.getString("MMC= onnection.Err_connection_close", se.getMessage())); //$NON-NLS-1$ } finally { - //logging - String logMsg =3D JDBCPlugin.Util.getString("MMConnection.Conn= ection_close_success"); //$NON-NLS-1$ - logger.log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMConnection.Connection= _close_success")); //$NON-NLS-1$ // set the status of the connection to closed - closed =3D true; - = - // close the stream after writing to it - if(logWriter !=3D null) { - logWriter.shutdown(); - logWriter =3D null; - } = + closed =3D true; = } } = @@ -399,7 +345,7 @@ } catch (XATransactionException e) { throw MMSQLException.create(e); } - logger.log(MessageLevel.INFO, JDBCPlugin.Util.getString("MMConnect= ion.Commit_success")); //$NON-NLS-1$ + logger.info(JDBCPlugin.Util.getString("MMConnection.Commit_success= ")); //$NON-NLS-1$ } = private void beginLocalTxn() throws SQLException { @@ -764,9 +710,7 @@ } catch (XATransactionException e) { throw MMSQLException.create(e); } - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMConnection.= Rollback_success"); //$NON-NLS-1$ - logger.log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMConnection.Rollba= ck_success")); //$NON-NLS-1$ } finally { if (startTxn) { beginLocalTxn(); @@ -826,10 +770,7 @@ } // During transaction do not allow to change this flag if (!autoCommitFlag || this.transactionXid !=3D null) { - String logMsg =3D JDBCPlugin.Util.getString("MMStatement.Inval= id_During_Transaction", "setReadOnly(" + readOnly + ")");//$NON-NLS-1$ //$N= ON-NLS-2$//$NON-NLS-3$ - MMSQLException e =3D new MMSQLException(logMsg); - logger.log(MessageLevel.ERROR, e, logMsg); - throw e; + throw new MMSQLException(JDBCPlugin.Util.getString("MMStatemen= t.Invalid_During_Transaction", "setReadOnly(" + readOnly + ")"));//$NON-NLS= -1$ //$NON-NLS-2$//$NON-NLS-3$ } this.readOnly =3D readOnly; } @@ -842,11 +783,7 @@ void checkConnection() throws SQLException{ //Check to see the connection is closed and proceed if it is not if (closed) { - //logging - String msg =3D JDBCPlugin.Util.getString("MMConnection.Cant_us= e_closed_connection"); //$NON-NLS-1$ - MMSQLException e =3D new MMSQLException(msg); - logger.log(MessageLevel.ERROR, e, msg); - throw e; + throw new MMSQLException(JDBCPlugin.Util.getString("MMConnecti= on.Cant_use_closed_connection")); //$NON-NLS-1$ } } = @@ -930,7 +867,7 @@ try { statement =3D createStatement(); statement.setQueryTimeout(timeout); - statement.execute("select 1"); + statement.execute("select 1"); //$NON-NLS-1$ return true; } catch (SQLException e) { return false; @@ -949,12 +886,12 @@ //close all open statements this.closeStatements(); } catch (SQLException e) { - this.getLogger().log(MessageLevel.WARNING, e, JDBCPlugin.Util.= getString("MMXAConnection.rolling_back_error")); //$NON-NLS-1$ + logger.log(Level.WARNING, JDBCPlugin.Util.getString("MMXAConne= ction.rolling_back_error"), e); //$NON-NLS-1$ } try { //rollback if still in a transaction if (!this.getAutoCommit()) { - this.getLogger().log(MessageLevel.WARNING, JDBCPlugin.Util= .getString("MMXAConnection.rolling_back")); //$NON-NLS-1$ + logger.warning(JDBCPlugin.Util.getString("MMXAConnection.r= olling_back")); //$NON-NLS-1$ = if (this.getTransactionXid() =3D=3D null) { this.rollback(false); @@ -963,7 +900,7 @@ } } } catch (SQLException e) { - this.getLogger().log(MessageLevel.WARNING, e, JDBCPlugin.Util.= getString("MMXAConnection.rolling_back_error")); //$NON-NLS-1$ + logger.log(Level.WARNING, JDBCPlugin.Util.getString("MMXAConnecti= on.rolling_back_error"), e); //$NON-NLS-1$ } } = Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java 2= 009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDataSource.java 2= 009-02-26 23:42:51 UTC (rev 517) @@ -22,16 +22,11 @@ = package com.metamatrix.jdbc; = -import java.io.FileWriter; -import java.io.PrintWriter; import java.sql.Connection; import java.util.Properties; = import com.metamatrix.common.api.MMURL; import com.metamatrix.core.MetaMatrixCoreException; -import com.metamatrix.core.log.Logger; -import com.metamatrix.core.log.MessageLevel; -import com.metamatrix.core.log.NullLogger; import com.metamatrix.jdbc.util.MMJDBCURL; = /** @@ -101,8 +96,6 @@ = private String discoveryStrategy; = - private transient Logger logger; - /** * Constructor for MMDataSource. */ @@ -223,7 +216,6 @@ final MMDriver driver =3D new MMDriver(); return driver.createMMConnection(buildURL(), props); } catch (MetaMatrixCoreException e) { - getLogger().log(MessageLevel.CRITICAL, e, e.getMessage()); throw MMSQLException.create(e, e.getMessage()); } } @@ -469,30 +461,6 @@ return JDBCPlugin.Util.getString("MMDataSource.alternateServer_is_inv= alid", new String[] { "" + reasonCount, reason }); //$NON-NLS-1$ //$NON-NLS= -2$ } = - = - /** - * JDBC Logger; we create a logger once we create a connection, but if= we - * fail to make connection we need a default logger based on the set p= aramters - * wish we have one place to do this. = - * @return - */ - public Logger getLogger() { - if (this.logger =3D=3D null) { - try { - if (getLogFile() !=3D null) { - this.logger =3D new DriverManagerLogger(getLogLevel(),= new PrintWriter(new FileWriter(getLogFile()))); - } - else { - this.logger =3D new DriverManagerLogger(getLogLevel(),= getLogWriter()); - } - } catch (Exception e) { - this.logger =3D new NullLogger(); - } - } - return this.logger; - } - - = /** = * @return Returns the transparentFailover. */ Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDatabaseMet= aData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDatabaseMetaData.= java 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDatabaseMetaData.= java 2009-02-26 23:42:51 UTC (rev 517) @@ -37,14 +37,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.logging.Logger; = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.query.QueryMetadataException; import com.metamatrix.common.types.DataTypeManager; import com.metamatrix.common.types.MMJDBCSQLTypeInfo; import com.metamatrix.core.MetaMatrixRuntimeException; -import com.metamatrix.core.log.Logger; -import com.metamatrix.core.log.MessageLevel; import com.metamatrix.dqp.message.ResultsMessage; import com.metamatrix.dqp.metadata.ResultsMetadataConstants; import com.metamatrix.dqp.metadata.ResultsMetadataDefaults; @@ -61,7 +60,7 @@ */ = public class MMDatabaseMetaData extends WrapperImpl implements com.metamat= rix.jdbc.api.DatabaseMetaData { - + private static Logger logger =3D Logger.getLogger("org.teiid.jdbc"); //$N= ON-NLS-1$ = /** CONSTANTS */ private static final String PERCENT =3D "%"; //$NON-NLS-1$ = @@ -360,14 +359,6 @@ } = /** - * JDBC Logger = - * @return logger - */ - public Logger getLogger() { - return this.driverConnection.getLogger(); - } - = - /** *

Checks whether the current user has the required security rights= to call * all the procedures returned by the method getProcedures.

* @return true if the precedures are selectable else return false @@ -487,7 +478,7 @@ = // logging String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.Be= st_row_sucess", table); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(logMsg); = // construct results object from column values and their metadata return createResultSet(records, metadataList); @@ -515,14 +506,14 @@ = // logging String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.Ca= talog_success"); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(logMsg); = // construct results object from column values and their metadata return createResultSet(records, metadataList); } = private ResultSet createResultSet(List records, Map[] columnMetadata) = throws SQLException { - ResultSetMetaData rsmd =3D ResultsMetadataWithProvider.newInstance= (StaticMetadataProvider.createWithData(columnMetadata, 0, this.getLogger())= , getLogger()); + ResultSetMetaData rsmd =3D ResultsMetadataWithProvider.newInstance= (StaticMetadataProvider.createWithData(columnMetadata, 0)); = return createResultSet(records, rsmd); } @@ -546,7 +537,7 @@ for (int i =3D 0; i < columnNames.length; i++) { metadata[i] =3D getColumnMetadata(null, columnNames[i], dataTy= pes[i], ResultsMetadataConstants.NULL_TYPES.UNKNOWN); } - return new MMResultSet(resultsMsg, stmt, ResultsMetadataWithProvid= er.newInstance(StaticMetadataProvider.createWithData(metadata, 0, getLogger= ()), getLogger()), 0); + return new MMResultSet(resultsMsg, stmt, ResultsMetadataWithProvid= er.newInstance(StaticMetadataProvider.createWithData(metadata, 0)), 0); } = private ResultsMessage createDummyResultsMessage(String[] columnNames,= String[] dataTypes, List records) { @@ -699,17 +690,12 @@ } catch(Exception e) { // logging String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadat= a.getCols_error", columnNamePattern, tableNamePattern, e.getMessage()); //$= NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, e, logMsg); throw MMSQLException.create(e, logMsg); } = - // close the resultset and driver connection -// results.close(); -// prepareQuery.close(); - // logging String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tCols_success", columnNamePattern, tableNamePattern); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(logMsg); = // construct results object from column values and their metadata return createResultSet(records, rmetadata); @@ -820,7 +806,6 @@ } catch(Exception e) { // logging String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadat= a.getCrossRef_error", primaryTable, foreignTable, e.getMessage()); //$NON-N= LS-1$ - getLogger().log(MessageLevel.ERROR, e, logMsg); throw MMSQLException.create(e, logMsg); } = @@ -828,7 +813,7 @@ = // logging String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tCrossRef_success", primaryTable, foreignTable); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(logMsg); = return resultSet; } @@ -1007,15 +992,12 @@ } catch(Exception e) { // logging String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadat= a.getExpKey_error", table, e.getMessage()); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, e, logMsg); throw MMSQLException.create(e, logMsg); } = ResultSet resultSet =3D getReferenceKeys(results); = - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tExpKey_success", table); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMDatabaseMetadata.getExpKe= y_success", table));//$NON-NLS-1$ = return resultSet; } @@ -1083,17 +1065,13 @@ // make a query against runtimemetadata and get results results =3D (MMResultSet) prepareQuery.executeQuery(); } catch(Exception e) { - // logging String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadat= a.getImpKey_error", table, e.getMessage()); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, e, logMsg); throw MMSQLException.create(e, logMsg); } = ResultSet resultSet =3D getReferenceKeys(results); = - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tImpKey_success", table); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMDatabaseMetadata.getImpKe= y_success", table)); //$NON-NLS-1$ = return resultSet; } @@ -1162,20 +1140,11 @@ rmetadata =3D results.getMetaData(); = } catch (Exception e) { - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadat= a.getIndex_error", table, e.getMessage()); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, e, logMsg); - throw MMSQLException.create(e, logMsg); + throw MMSQLException.create(e, JDBCPlugin.Util.getString("MMDa= tabaseMetadata.getIndex_error", table, e.getMessage())); //$NON-NLS-1$ } = - // close the results and driver connection -// results.close(); -// prepareQuery.close(); + logger.info(JDBCPlugin.Util.getString("MMDatabaseMetadata.getIndex= _success", table)); //$NON-NLS-1$ = - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tIndex_success", table); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); - // construct results object from column values and their metadata return createResultSet(records, rmetadata); } @@ -1467,20 +1436,11 @@ rmetadata =3D results.getMetaData(); = } catch (Exception e) { - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadat= a.getPrimaryKey_error", table, e.getMessage()); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, e, logMsg); - throw MMSQLException.create(e, logMsg); + throw MMSQLException.create(e, JDBCPlugin.Util.getString("MMDa= tabaseMetadata.getPrimaryKey_error", table, e.getMessage())); //$NON-NLS-1$ } = - // close the results and driver connection - //results.close(); - //prepareQuery.close(); + logger.info(JDBCPlugin.Util.getString("MMDatabaseMetadata.getPrima= ryKey_success")); //$NON-NLS-1$ = - // loging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tPrimaryKey_success"); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); - // construct results object from column values and their metadata return createResultSet(records, rmetadata); } @@ -1570,20 +1530,11 @@ rmetadata =3D results.getMetaData(); = } catch (Exception e) { - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata= .getProcCol_error", columnNamePattern, e.getMessage()); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, e, logMsg); - throw MMSQLException.create(e, logMsg); + throw MMSQLException.create(e, JDBCPlugin.Util.getString("MMDat= abaseMetadata.getProcCol_error", columnNamePattern, e.getMessage())); //$NO= N-NLS-1$ } = - // close the results and driver connection - //results.close(); - //prepareQuery.close(); + logger.info(JDBCPlugin.Util.getString("MMDatabaseMetadata.getProcC= ol_success", columnNamePattern, procedureNamePattern)); //$NON-NLS-1$ = - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tProcCol_success", columnNamePattern, procedureNamePattern); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); - // construct results object from column values and their metadata return createResultSet(records, rmetadata); } @@ -1686,20 +1637,11 @@ rmetadata =3D results.getMetaData(); = } catch (Exception e) { - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadat= a.getProc_error", procedureNamePattern, e.getMessage()); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, e, logMsg); - throw MMSQLException.create(e, logMsg); + throw MMSQLException.create(e, JDBCPlugin.Util.getString("MMDa= tabaseMetadata.getProc_error", procedureNamePattern, e.getMessage())); //$N= ON-NLS-1$ } = - // close the results - //results.close(); - //prepareQuery.close(); + logger.info(JDBCPlugin.Util.getString("MMDatabaseMetadata.getProc_= success", procedureNamePattern)); //$NON-NLS-1$ = - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tProc_success", procedureNamePattern); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); - // construct results object from column values and their metadata return createResultSet(records, rmetadata); } @@ -1776,20 +1718,11 @@ rmetadata =3D results.getMetaData(); = } catch(Exception e) { - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadat= a.getschema_error", e.getMessage()); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, e, logMsg); - throw MMSQLException.create(e, logMsg); + throw MMSQLException.create(e, JDBCPlugin.Util.getString("MMDa= tabaseMetadata.getschema_error", e.getMessage())); //$NON-NLS-1$ } = - // close the results (need to close case results exceed cursor siz= e) -// results.close(); -// prepareQuery.close(); + logger.info(JDBCPlugin.Util.getString("MMDatabaseMetadata.getschem= a_success")); //$NON-NLS-1$ = - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tschema_success"); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); - // construct results object from column values and their metadata return createResultSet(records, rmetadata); } @@ -2070,10 +2003,7 @@ } catch (SQLException e) { throw e; } catch (Exception e) { - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadat= a.getTable_error", tableNamePattern, e.getMessage()); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, e, logMsg); - throw MMSQLException.create(e, logMsg); + throw MMSQLException.create(e, JDBCPlugin.Util.getString("MMDa= tabaseMetadata.getTable_error", tableNamePattern, e.getMessage())); //$NON-= NLS-1$ } = // close the results (need to close case results exceed cursor siz= e) @@ -2083,9 +2013,7 @@ // manually send out a close request is very necessary for Prepare= dStatement. //prepareQuery.close(); = - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tTable_success", tableNamePattern); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMDatabaseMetadata.getTable= _success", tableNamePattern)); //$NON-NLS-1$ = // construct results object from column values and their metadata return createResultSet(records, rmetadata); @@ -2152,9 +2080,7 @@ metadataList[0] =3D getColumnMetadata(null, JDBCColumnNames.TABLE_= TYPES.TABLE_TYPE, = MMJDBCSQLTypeInfo.STRING, ResultsMetadataConst= ants.NULL_TYPES.NOT_NULL); = - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tTableType_success"); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMDatabaseMetadata.getTable= Type_success")); //$NON-NLS-1$ = // construct results object from column values and their metadata return createResultSet(records, metadataList); @@ -2219,11 +2145,9 @@ metadataList[16] =3D getColumnMetadata("System.DataTypes", JDBCCol= umnNames.TYPE_INFO.SQL_DATETIME_SUB, MMJDBCSQLTypeInfo.INTEGER, ResultsMet= adataConstants.NULL_TYPES.NULLABLE, ResultsMetadataConstants.SEARCH_TYPES.S= EARCHABLE, Boolean.TRUE, Boolean.TRUE, Boolean.FALSE);//$NON-NLS-1$ = metadataList[17] =3D getColumnMetadata("System.DataTypes", JDBCCol= umnNames.TYPE_INFO.NUM_PREC_RADIX, MMJDBCSQLTypeInfo.INTEGER, ResultsMetad= ataConstants.NULL_TYPES.NULLABLE, ResultsMetadataConstants.SEARCH_TYPES.SEA= RCHABLE, Boolean.FALSE, Boolean.FALSE, Boolean.FALSE);//$NON-NLS-1$ = = - ResultSetMetaData rmetadata =3D ResultsMetadataWithProvider.newIns= tance(StaticMetadataProvider.createWithData(metadataList, 0, getLogger()), = getLogger()); + ResultSetMetaData rmetadata =3D ResultsMetadataWithProvider.newIns= tance(StaticMetadataProvider.createWithData(metadataList, 0)); = - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tTypes_success"); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMDatabaseMetadata.getTypes= _success")); //$NON-NLS-1$ = // construct results object from column values and their metadata return createResultSet(records, rmetadata); @@ -2308,9 +2232,7 @@ // Method not supported, retuning empty ResultSet ResultSet resultSet =3D getBestRowIdentifier(catalog, schema, tabl= e, 0, true); = - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tVersionCols_success"); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMDatabaseMetadata.getVersi= onCols_success")); //$NON-NLS-1$ = return resultSet; } @@ -3289,9 +3211,7 @@ // close the resultset and driver connection //results.close(); = - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadata.ge= tRefKey_success"); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMDatabaseMetadata.getRefKe= y_success")); //$NON-NLS-1$ = // construct results object from column values and their metadata return createResultSet(records, rmetadata); @@ -3385,10 +3305,7 @@ = return results; } catch (Exception e) { - // logging - String logMsg =3D JDBCPlugin.Util.getString("MMDatabaseMetadat= a.getModels_error", modelNamePattern, e.getMessage()); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, e, logMsg); - throw MMSQLException.create(e, logMsg); + throw MMSQLException.create(e, JDBCPlugin.Util.getString("MMDa= tabaseMetadata.getModels_error", modelNamePattern, e.getMessage())); //$NON= -NLS-1$ } } = Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java 2009-= 02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMDriver.java 2009-= 02-26 23:42:51 UTC (rev 517) @@ -22,9 +22,6 @@ = package com.metamatrix.jdbc; = -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; import java.sql.Connection; import java.sql.DriverManager; import java.sql.DriverPropertyInfo; @@ -33,6 +30,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Properties; +import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; = @@ -43,7 +41,6 @@ import com.metamatrix.common.comm.platform.socket.client.SocketServerConne= ctionFactory; import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.core.MetaMatrixCoreException; -import com.metamatrix.core.log.MessageLevel; import com.metamatrix.jdbc.api.ConnectionProperties; import com.metamatrix.jdbc.util.MMJDBCURL; = @@ -58,7 +55,8 @@ */ = public final class MMDriver extends BaseDriver { - + private static Logger logger =3D Logger.getLogger("org.teiid.jdbc"); //$N= ON-NLS-1$ + = static final String JDBC =3D BaseDataSource.JDBC; static final String URL_PREFIX =3D JDBC + BaseDataSource.METAMATRIX_PR= OTOCOL; = static final int MAJOR_VERSION =3D 5; @@ -135,7 +133,7 @@ = // logging String logMsg =3D JDBCPlugin.Util.getString("MMDriver.Connection_s= ucess"); //$NON-NLS-1$ - myConnection.getLogger().log(MessageLevel.INFO, logMsg); + logger.info(logMsg); = return myConnection; } @@ -185,42 +183,8 @@ info.setProperty(BaseDataSource.VDB_VERSION, jdbcURL.getVD= BVersion()); } = - if(optionalParams.containsKey(BaseDataSource.LOG_FILE)) { - String value =3D optionalParams.getProperty(BaseDataSource= .LOG_FILE); - if(value !=3D null) { - try { - File f =3D new File(value); - boolean exists =3D f.exists(); = - FileWriter fw =3D new FileWriter(f, true); - fw.close(); - if (!exists) { - f.delete(); - } - } catch(IOException ioe) { - String msg =3D JDBCPlugin.Util.getString("MMDriver= .Invalid_log_name", value); //$NON-NLS-1$ - throw MMSQLException.create(ioe, msg); - //throw new MMSQLException(msg, ioe); - } - } - } - if(optionalParams.containsKey(BaseDataSource.LOG_LEVEL)) { - try { - int loglevel =3D Integer.parseInt(optionalParams.getPr= operty(BaseDataSource.LOG_LEVEL)); - if(loglevel < BaseDataSource.LOG_NONE || loglevel > Ba= seDataSource.LOG_TRACE) { - Object[] params =3D new Object[] {new Integer(Base= DataSource.LOG_NONE), new Integer(BaseDataSource.LOG_ERROR), new Integer(Ba= seDataSource.LOG_INFO), new Integer(BaseDataSource.LOG_TRACE)}; - String msg =3D JDBCPlugin.Util.getString("MMDriver= .Log_level_invalid", params); //$NON-NLS-1$ - throw new MMSQLException(msg); - } - } catch(NumberFormatException nfe) { - Object[] params =3D new Object[] {new Integer(BaseData= Source.LOG_NONE), new Integer(BaseDataSource.LOG_ERROR), new Integer(BaseDa= taSource.LOG_INFO), new Integer(BaseDataSource.LOG_TRACE)}; - String msg =3D JDBCPlugin.Util.getString("MMDriver.Log= _level_invalid", params); //$NON-NLS-1$ - throw MMSQLException.create(nfe, msg); - //throw new MMSQLException(msg, nfe); - } - } } catch(IllegalArgumentException iae) { - String msg =3D JDBCPlugin.Util.getString("MMDriver.urlFormat")= ; //$NON-NLS-1$ - throw new MMSQLException(msg); + throw new MMSQLException(JDBCPlugin.Util.getString("MMDriver.u= rlFormat")); //$NON-NLS-1$ } = } = Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedSta= tement.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement= .java 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMPreparedStatement= .java 2009-02-26 23:42:51 UTC (rev 517) @@ -48,6 +48,7 @@ import java.util.Map; import java.util.TimeZone; import java.util.TreeMap; +import java.util.logging.Logger; = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.MetaMatrixException; @@ -57,7 +58,6 @@ import com.metamatrix.common.types.MMJDBCSQLTypeInfo; import com.metamatrix.common.util.SqlUtil; import com.metamatrix.common.util.TimestampWithTimezone; -import com.metamatrix.core.log.MessageLevel; import com.metamatrix.core.util.ArgCheck; import com.metamatrix.dqp.client.MetadataResult; import com.metamatrix.dqp.message.ResultsMessage; @@ -75,7 +75,8 @@ */ = public class MMPreparedStatement extends MMStatement implements PreparedSt= atement { - + private static Logger logger =3D Logger.getLogger("org.teiid.jdbc"); //$N= ON-NLS-1$ + = // sql, which this prepared statement is operating on protected String prepareSql; = @@ -241,9 +242,7 @@ throw ex; } = - // logging for getting result set. - String logMsg =3D JDBCPlugin.Util.getString("MMStatement.Success_q= uery", prepareSql); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMStatement.Success_query",= prepareSql)); //$NON-NLS-1$ } = private void processUpdateMessage(ResultsMessage resultsMsg) throws SQ= LException { @@ -280,9 +279,7 @@ //Check to see the statement is closed and throw an exception checkStatement(); if (getMMConnection().isReadOnly()) { - String logMsg =3D JDBCPlugin.Util.getString("MMStatement.Opera= tion_Not_Supported", prepareSql);//$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, logMsg); - throw new MMSQLException(logMsg); + throw new MMSQLException(JDBCPlugin.Util.getString("MMStatemen= t.Operation_Not_Supported", prepareSql)); //$NON-NLS-1$ } = // See NOTE1 @@ -315,11 +312,9 @@ }else{ rowsAffected =3D resultSet.getInt(1); } - String logMsg =3D JDBCPlugin.Util.getString("MMStatement.= Success_update", prepareSql); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMStatement.Succes= s_update", prepareSql)); //$NON-NLS-1$ } catch (SQLException se) { - String msg =3D JDBCPlugin.Util.getString("MMStatement.Err= _getting_update_row"); //$NON-NLS-1$ - setException(MMSQLException.create(se, msg)); + setException(MMSQLException.create(se, JDBCPlugin.Util.ge= tString("MMStatement.Err_getting_update_row"))); //$NON-NLS-1$ } finally { resultSet.close(); resultSet =3D null; @@ -329,10 +324,7 @@ = ex =3D getException(); if(ex !=3D null) { - //logging - String logMsg =3D JDBCPlugin.Util.getString("MMStatement.Err_u= pdate", prepareSql, ex.getMessage()); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, ex, logMsg); - throw MMSQLException.create(ex, ex.getMessage()); + throw MMSQLException.create(ex, JDBCPlugin.Util.getString("MMS= tatement.Err_update", prepareSql, ex.getMessage())); //$NON-NLS-1$ } } = @@ -366,8 +358,8 @@ } catch (MetaMatrixProcessingException e) { throw MMSQLException.create(e); } - StaticMetadataProvider provider =3D StaticMetadataProvider= .createWithData(results.getColumnMetadata(), results.getParameterCount(), g= etLogger()); - metadata =3D ResultsMetadataWithProvider.newInstance(provi= der, getLogger()); + StaticMetadataProvider provider =3D StaticMetadataProvider= .createWithData(results.getColumnMetadata(), results.getParameterCount()); + metadata =3D ResultsMetadataWithProvider.newInstance(provi= der); } } = @@ -768,10 +760,7 @@ try { return sendRequestMessageAndWait(commands, true, false, isPrepare= dBatchUpdate? getParameterValuesList(): getParameterValues(), false, isPrep= aredBatchUpdate); } catch ( Throwable ex ) { - // logging - String msg =3D JDBCPlugin.Util.getString("MMStatement.Error_ex= ecuting_stmt", commands[0]); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, ex, msg); - throw MMSQLException.create(ex, msg); + throw MMSQLException.create(ex, JDBCPlugin.Util.getString("MMS= tatement.Error_executing_stmt", commands[0])); //$NON-NLS-1$ } } = Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMResultSet.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMResultSet.java 20= 09-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMResultSet.java 20= 09-02-26 23:42:51 UTC (rev 517) @@ -46,6 +46,7 @@ import java.util.Map; import java.util.TimeZone; import java.util.concurrent.ExecutionException; +import java.util.logging.Logger; = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.MetaMatrixProcessingException; @@ -54,8 +55,6 @@ import com.metamatrix.common.types.Streamable; import com.metamatrix.common.types.XMLType; import com.metamatrix.common.util.TimestampWithTimezone; -import com.metamatrix.core.log.Logger; -import com.metamatrix.core.log.MessageLevel; import com.metamatrix.dqp.client.ResultsFuture; import com.metamatrix.dqp.client.impl.StreamingLobChunckProducer; import com.metamatrix.dqp.message.ResultsMessage; @@ -71,7 +70,8 @@ */ = public class MMResultSet extends WrapperImpl implements com.metamatrix.jdb= c.api.ResultSet, BatchFetcher { - = + private static Logger logger =3D Logger.getLogger("org.teiid.jdbc"); //$N= ON-NLS-1$ + private static final int BEFORE_FIRST_ROW =3D 0; = // the object which was last read from Results @@ -126,12 +126,10 @@ this.serverTimeZone =3D statement.getServerTimeZone(); = if (metadata =3D=3D null) { - ResultsMetadataProvider provider =3D DeferredMetadataProvider - .createWithInitialData(resultsMsg.getColumnNames(), + ResultsMetadataProvider provider =3D DeferredMetadataProvider.createWit= hInitialData(resultsMsg.getColumnNames(), resultsMsg.getDataTypes(), statement, - statement.getCurrentRequestID(), getLogger()); - rmetadata =3D ResultsMetadataWithProvider.newInstance(provider, - getLogger()); + statement.getCurrentRequestID()); + rmetadata =3D ResultsMetadataWithProvider.newInstance(provider); } else { rmetadata =3D metadata; } @@ -140,7 +138,7 @@ = this.resultColumns =3D columnCount - parameters; if (this.parameters > 0) { - rmetadata =3D FilteredResultsMetadata.newInstance(rmetadata, resultColu= mns, getLogger()); + rmetadata =3D FilteredResultsMetadata.newInstance(rmetadata, resultColu= mns); } } = @@ -337,7 +335,7 @@ } = public Batch requestBatch(int beginRow, int endRow) throws SQLExceptio= n{ - getLogger().log(MessageLevel.DETAIL, "CursorResultsImpl.requestBatch]= thread name: " + Thread.currentThread().getName() + " requestID: " + reque= stID + " beginRow: " + beginRow + " endinRow: " + endRow ); //$NON-NLS-1$ /= /$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + logger.fine("CursorResultsImpl.requestBatch] thread name: " + Thread.= currentThread().getName() + " requestID: " + requestID + " beginRow: " + be= ginRow + " endinRow: " + endRow ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3= $ //$NON-NLS-4$ checkClosed(); try { ResultsFuture results =3D statement.getDQP().proc= essCursorRequest(requestID, beginRow, endRow); @@ -1089,15 +1087,6 @@ } = /** - * JDBC Logger - * = - * @return logger - */ - public Logger getLogger() { - return this.statement.getLogger(); - } - - /** *

* This method returns the meta data of the result set, such as the numbe= r, * types and properties of this resultSets columns. Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMStatement.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMStatement.java 20= 09-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMStatement.java 20= 09-02-26 23:42:51 UTC (rev 517) @@ -45,6 +45,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import java.util.logging.Level; +import java.util.logging.Logger; = import com.metamatrix.api.exception.MetaMatrixComponentException; import com.metamatrix.api.exception.MetaMatrixException; @@ -52,8 +54,6 @@ import com.metamatrix.common.comm.exception.CommunicationException; import com.metamatrix.common.util.PropertiesUtils; import com.metamatrix.common.util.SqlUtil; -import com.metamatrix.core.log.Logger; -import com.metamatrix.core.log.MessageLevel; import com.metamatrix.dqp.client.ClientSideDQP; import com.metamatrix.dqp.message.ParameterInfo; import com.metamatrix.dqp.message.RequestMessage; @@ -75,6 +75,7 @@ */ = public class MMStatement extends WrapperImpl implements Statement { + private static Logger logger =3D Logger.getLogger("org.teiid.jdbc"); //$N= ON-NLS-1$ = // State constants protected static final int TIMED_OUT =3D 4; @@ -159,9 +160,6 @@ = //Map index in results> protected Map outParamIndexMap =3D new HashMap(); - = - // JDBC Logger - Logger logger =3D null; = /** * Factory Constructor = @@ -194,18 +192,8 @@ // silently failover to default } } = - = - this.logger =3D new RequestIdAwareLogger(this.driverConnection.get= Logger()); } = - /** - * JDBC Logger = - * @return logger - */ - public Logger getLogger() { - return logger; = - } - = protected ClientSideDQP getDQP() { return this.driverConnection.getDQP(); } @@ -326,9 +314,7 @@ // Remove link from connection to statement this.driverConnection.closeStatement(this); = - //logging - String logMsg =3D JDBCPlugin.Util.getString("MMStatement.Close_stm= t_success"); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMStatement.Close_stmt_succ= ess")); //$NON-NLS-1$ driverConnection =3D null; } = @@ -340,12 +326,7 @@ protected void checkStatement() throws SQLException { //Check to see the connection is closed and proceed if it is not if ( isClosed ) { - //logging - String logMsg =3D JDBCPlugin.Util.getString("MMStatement.Stmt_= closed"); //$NON-NLS-1$ - if (driverConnection !=3D null) { - getLogger().log(MessageLevel.INFO, logMsg); - } - throw new MMSQLException(logMsg); + throw new MMSQLException(JDBCPlugin.Util.getString("MMStatemen= t.Stmt_closed")); //$NON-NLS-1$ } } = @@ -359,7 +340,7 @@ return; } serverException =3D MMSQLException.create(exception); - getLogger().log(MessageLevel.ERROR, exception, serverException.get= Message()); + logger.log(Level.SEVERE, serverException.getMessage(), exception); } = protected MMSQLException getException() { @@ -420,10 +401,9 @@ rowsAffected =3D resultSet.getInt(1); } String logMsg =3D JDBCPlugin.Util.getString("MMStatement.S= uccess_update", commands[0]); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(logMsg); } catch (SQLException se) { - String msg =3D JDBCPlugin.Util.getString("MMStatement.Err_= getting_update_row"); //$NON-NLS-1$ - setException(MMSQLException.create(se, msg)); + setException(MMSQLException.create(se, JDBCPlugin.Util.get= String("MMStatement.Err_getting_update_row"))); //$NON-NLS-1$ } } } @@ -510,9 +490,7 @@ = public int executeUpdate(String sql) throws SQLException { if (driverConnection.isReadOnly()) { - String logMsg =3D JDBCPlugin.Util.getString("MMStatement.Opera= tion_Not_Supported", sql);//$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, logMsg); - throw new MMSQLException(logMsg); + throw new MMSQLException(JDBCPlugin.Util.getString("MMStatemen= t.Operation_Not_Supported", sql)); //$NON-NLS-1$ } String[] commands =3D new String[] {sql}; executeSql(commands, false); @@ -548,9 +526,7 @@ throw this.serverException; } = - // logging for getting query result - String logMsg =3D JDBCPlugin.Util.getString("MMStatement.Success_q= uery", Arrays.asList(commands)); //$NON-NLS-1$ - getLogger().log(MessageLevel.INFO, logMsg); + logger.info(JDBCPlugin.Util.getString("MMStatement.Success_query",= Arrays.asList(commands))); //$NON-NLS-1$ } = /** @@ -867,7 +843,7 @@ // logging String msg =3D JDBCPlugin.Util.getString("MMStatement.Error_ex= ecuting_stmt", isBatchedCommand ? "" : commands[0]); //$NON-NLS-1$ //$NON-N= LS-2$ if(driverConnection !=3D null) { - getLogger().log(MessageLevel.ERROR, ex, msg); + logger.log(Level.SEVERE, msg, ex); } throw MMSQLException.create(ex); } @@ -925,8 +901,7 @@ * Ends the command and sets the status to TIMED_OUT. */ protected void timeoutOccurred() { - String logMsg =3D JDBCPlugin.Util.getString("MMStatement.Timeout_o= curred_in_Statement."); //$NON-NLS-1$ - getLogger().log(MessageLevel.WARNING, logMsg); + logger.warning(JDBCPlugin.Util.getString("MMStatement.Timeout_ocur= red_in_Statement.")); //$NON-NLS-1$ try { cancel(); = commandStatus =3D TIMED_OUT; @@ -936,8 +911,7 @@ this.resultSet.close(); } } catch (SQLException se) { - logMsg =3D JDBCPlugin.Util.getString("MMStatement.Error_timing= _out."); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, se, logMsg); + logger.log(Level.SEVERE, JDBCPlugin.Util.getString("MMStatemen= t.Error_timing_out."), se); //$NON-NLS-1$ } } = @@ -1157,10 +1131,7 @@ try { return SqlUtil.isUpdateSql(sql); } catch(IllegalArgumentException e) { - // Bad sql string - String logMsg =3D JDBCPlugin.Util.getString("MMStatement.Inval= id_query_type", sql); //$NON-NLS-1$ - getLogger().log(MessageLevel.ERROR, logMsg); - throw new MMSQLException(logMsg); + throw new MMSQLException(JDBCPlugin.Util.getString("MMStatemen= t.Invalid_query_type", sql)); //$NON-NLS-1$ } } = @@ -1191,26 +1162,6 @@ this.defaultCalendar =3D cal; } = - /** - * A simple wrapper to grab the request id from the = - * statement. - */ - class RequestIdAwareLogger implements Logger { = - Logger delegate =3D null; - RequestIdAwareLogger(Logger sourcelogger){ - this.delegate =3D sourcelogger; - } - public void log(int severity, String message) { - this.delegate.log(severity, convert(message)); - } - public void log(int severity, Throwable t, String message) { - this.delegate.log(severity, t, convert(message)); - } - String convert(String msg){ - return " "+msg;//$NON-NLS-1$ //$NO= N-NLS-2$ - } = - } - public boolean isPoolable() throws SQLException { checkStatement(); return false; Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAConnectio= n.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAConnection.java= 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAConnection.java= 2009-02-26 23:42:51 UTC (rev 517) @@ -37,8 +37,6 @@ import javax.sql.XAConnection; import javax.transaction.xa.XAResource; = -import com.metamatrix.core.log.Logger; - /** * Implementation of XAConnection. */ @@ -116,14 +114,7 @@ = return connection; } - = - public Logger getLogger() { - if (connection =3D=3D null) { - return null; - } - return connection.getLogger(); - } - = + = public synchronized void addConnectionEventListener(ConnectionEventListen= er listener){ if(listeners =3D=3D null){ listeners =3D new HashSet(); Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAResource.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAResource.java 2= 009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/MMXAResource.java 2= 009-02-26 23:42:51 UTC (rev 517) @@ -23,6 +23,8 @@ package com.metamatrix.jdbc; = import java.sql.SQLException; +import java.util.logging.Level; +import java.util.logging.Logger; = import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -31,13 +33,13 @@ import com.metamatrix.common.comm.exception.CommunicationException; import com.metamatrix.common.xa.MMXid; import com.metamatrix.common.xa.XATransactionException; -import com.metamatrix.core.log.Logger; -import com.metamatrix.core.log.MessageLevel; = /** * Implementation of XAResource. */ public class MMXAResource implements XAResource{ + private static Logger logger =3D Logger.getLogger("org.teiid.jdbc"); //$N= ON-NLS-1$ + private MMXAConnection mmConnection; private int timeOut; = @@ -48,11 +50,7 @@ public MMXAResource(MMXAConnection mmConnection){ this.mmConnection =3D mmConnection; } = - = - public Logger getLogger() { - return this.mmConnection.getLogger(); - } - = + = /** * @see javax.transaction.xa.XAResource#commit(javax.transaction.xa.Xi= d, boolean) */ @@ -66,9 +64,9 @@ } } = - private XAException handleError(Exception e, - String logMsg) { - getLogger().log(MessageLevel.ERROR, e, logMsg); + private XAException handleError(Exception e,String logMsg) { + logger.log(Level.SEVERE, logMsg, e); + if(e instanceof MMSQLException){ Throwable ex =3D ((MMSQLException)e).getCause(); if(ex instanceof XAException){ Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ResultsMetada= taWithProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ResultsMetadataWith= Provider.java 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/ResultsMetadataWith= Provider.java 2009-02-26 23:42:51 UTC (rev 517) @@ -25,7 +25,6 @@ import java.sql.SQLException; = import com.metamatrix.common.types.MMJDBCSQLTypeInfo; -import com.metamatrix.core.log.Logger; import com.metamatrix.dqp.metadata.ResultsMetadataConstants; = /** @@ -33,20 +32,18 @@ public class ResultsMetadataWithProvider extends WrapperImpl implements co= m.metamatrix.jdbc.api.ResultSetMetaData { = private ResultsMetadataProvider provider; - Logger logger; = /** * Factory Constructor = * @param statement * @param valueID */ - public static ResultsMetadataWithProvider newInstance(ResultsMetadataP= rovider provider, Logger logger) { - return new ResultsMetadataWithProvider(provider, logger); = + public static ResultsMetadataWithProvider newInstance(ResultsMetadataP= rovider provider) { + return new ResultsMetadataWithProvider(provider); = } = - public ResultsMetadataWithProvider(ResultsMetadataProvider provider, L= ogger logger) { + public ResultsMetadataWithProvider(ResultsMetadataProvider provider) { setMetadataProvider(provider); - this.logger =3D logger; } = void setMetadataProvider(ResultsMetadataProvider provider) { Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/StaticMetadat= aProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/StaticMetadataProvi= der.java 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/StaticMetadataProvi= der.java 2009-02-26 23:42:51 UTC (rev 517) @@ -25,7 +25,6 @@ import java.sql.SQLException; import java.util.Map; = -import com.metamatrix.core.log.Logger; = /** */ @@ -38,11 +37,10 @@ StaticMetadataProvider() { } = - public static StaticMetadataProvider createWithData(Map[] columnMetada= ta, int paramCount, Logger logger) { + public static StaticMetadataProvider createWithData(Map[] columnMetada= ta, int paramCount) { StaticMetadataProvider provider =3D null; = provider =3D new StaticMetadataProvider(); = - provider.setLogger(logger); provider.setData(columnMetadata); provider.setParameterCount(paramCount); = return provider; Modified: trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/util/MMJDBCUR= L.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/util/MMJDBCURL.java= 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/main/java/com/metamatrix/jdbc/util/MMJDBCURL.java= 2009-02-26 23:42:51 UTC (rev 517) @@ -49,8 +49,6 @@ BaseDataSource.VDB_VERSION, BaseDataSource.USER_NAME, BaseDataSource.PASSWORD, - BaseDataSource.LOG_FILE, - BaseDataSource.LOG_LEVEL, ExecutionProperties.PROP_TXN_AUTO_WRAP, ExecutionProperties.PROP_PARTIAL_RESULTS_MODE, ExecutionProperties.RESULT_SET_CACHE_MODE, @@ -228,15 +226,7 @@ } return properties.getProperty(BaseDataSource.VERSION); } - = - public String getLogFile() { - return properties.getProperty(BaseDataSource.LOG_FILE); - } - = - public String getLogLevel() { - return properties.getProperty(BaseDataSource.LOG_LEVEL); - } - = + = public String getTransactionAutowrapMode() { return properties.getProperty(ExecutionProperties.PROP_TXN_AUTO_WR= AP); } Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDataSou= rce.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDataSource.ja= va 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDataSource.ja= va 2009-02-26 23:42:51 UTC (rev 517) @@ -69,8 +69,6 @@ dataSource.setDatabaseVersion(STD_DATABASE_VERSION); dataSource.setDatabaseName(STD_DATABASE_NAME); dataSource.setPortNumber(STD_PORT_NUMBER); - dataSource.setLogFile(STD_LOG_FILE); - dataSource.setLogLevel(STD_LOG_LEVEL); dataSource.setDataSourceName(STD_DATA_SOURCE_NAME); dataSource.setTransactionAutoWrap(STD_TXN_AUTO_WRAP); dataSource.setPartialResultsMode(STD_PARTIAL_MODE); @@ -91,8 +89,6 @@ return MMDataSource.reasonWhyInvalidDataSourceName(value); } else if ( propertyName.equals("Description") ) { //$NON-NLS-1$ return MMDataSource.reasonWhyInvalidDescription(value); - } else if ( propertyName.equals("LogFile") ) { //$NON-NLS-1$ - return MMDataSource.reasonWhyInvalidLogFile(value); } else if ( propertyName.equals("ServerName") ) { //$NON-NLS-1$ return MMDataSource.reasonWhyInvalidServerName(value); } else if ( propertyName.equals("TransactionAutoWrap") ) { //$NON-= NLS-1$ @@ -112,9 +108,7 @@ } = protected String getReasonWhyInvalid( final String propertyName, final= int value ) { - if ( propertyName.equals("LogLevel") ) { //$NON-NLS-1$ - return MMDataSource.reasonWhyInvalidLogLevel(value); - } else if ( propertyName.equals("PortNumber") ) { //$NON-NLS-1$ + if ( propertyName.equals("PortNumber") ) { //$NON-NLS-1$ return MMDataSource.reasonWhyInvalidPortNumber(value); } fail("Unknown property name \"" + propertyName + "\""); //$NON-NLS= -1$ //$NON-NLS-2$ @@ -144,7 +138,6 @@ public void helpTestBuildingURL( final String vdbName, final String vd= bVersion, final String serverName, final int po= rtNumber, final String alternateServers, - final String logfile, final int logle= vel, final String txnAutoWrap, final Strin= g partialMode, final int fetchSize, final boolean sh= owPlan, final boolean secure, final String ex= pectedURL) { @@ -154,8 +147,6 @@ ds.setDatabaseVersion(vdbVersion); ds.setDatabaseName(vdbName); ds.setPortNumber(portNumber); - ds.setLogFile(logfile); - ds.setLogLevel(loglevel); ds.setFetchSize(fetchSize); ds.setTransactionAutoWrap(txnAutoWrap); ds.setPartialResultsMode(partialMode); @@ -172,7 +163,6 @@ public Connection helpTestConnection( final String vdbName, final Stri= ng vdbVersion, final String serverName, final int por= tNumber, final String alternateServers, = final String user, final String passwo= rd, - final String logfile, final int loglev= el, final String dataSourceName, final String txnAutoWrap, final String= partialMode, final String configFile ) @@ -186,8 +176,6 @@ ds.setPortNumber(portNumber); ds.setUser(user); ds.setPassword(password); - ds.setLogFile(logfile); - ds.setLogLevel(loglevel); ds.setDataSourceName(dataSourceName); ds.setTransactionAutoWrap(txnAutoWrap); ds.setPartialResultsMode(partialMode); @@ -252,16 +240,6 @@ assertEquals(result,STD_PORT_NUMBER); } = - public void testGetLogFile() { - final String result =3D dataSource.getLogFile(); - assertEquals(result,STD_LOG_FILE); - } - - public void testGetLogLevel() { - final int result =3D dataSource.getLogLevel(); - assertEquals(result,STD_LOG_LEVEL); - } - public void testGetDataSourceName() { final String result =3D dataSource.getDataSourceName(); assertEquals(result,STD_DATA_SOURCE_NAME); @@ -375,43 +353,6 @@ helpTestReasonWhyInvalid("Description", null, VALID); //$NON-NLS-1$ } = - - public void testReasonWhyInvalidLogFile1() { - helpTestReasonWhyInvalid("LogFile", "Valid Log File", VALID); //$N= ON-NLS-1$ //$NON-NLS-2$ - } - public void testReasonWhyInvalidLogFile2() { - helpTestReasonWhyInvalid("LogFile", "", VALID); //$NON-NLS-1$ //$N= ON-NLS-2$ - } - public void testReasonWhyInvalidLogFile3() { - helpTestReasonWhyInvalid("LogFile", null, VALID); //$NON-NLS-1$ - } - - - public void testReasonWhyInvalidLogLevel1() { - helpTestReasonWhyInvalid("LogLevel", 0, VALID); //$NON-NLS-1$ - } - public void testReasonWhyInvalidLogLevel2() { - helpTestReasonWhyInvalid("LogLevel", 1, VALID); //$NON-NLS-1$ - } - public void testReasonWhyInvalidLogLevel3() { - helpTestReasonWhyInvalid("LogLevel", 2, VALID); //$NON-NLS-1$ - } - public void testReasonWhyInvalidLogLevel4() { - helpTestReasonWhyInvalid("LogLevel", 3, VALID); //$NON-NLS-1$ - } - public void testReasonWhyInvalidLogLevel5() { - helpTestReasonWhyInvalid("LogLevel", 4, INVALID); //$NON-NLS-1$ - } - public void testReasonWhyInvalidLogLevel6() { - helpTestReasonWhyInvalid("LogLevel", -1, INVALID); //$NON-NLS-1$ - } - public void testReasonWhyInvalidLogLevel7() { - helpTestReasonWhyInvalid("LogLevel", 300, INVALID); //$NON-NLS-1$ - } - public void testReasonWhyInvalidLogLevel8() { - helpTestReasonWhyInvalid("LogLevel", -300, INVALID); //$NON-NLS-1$ - } - public void testReasonWhyInvalidPortNumber1() { helpTestReasonWhyInvalid("PortNumber", 1, VALID); //$NON-NLS-1$ } @@ -559,13 +500,11 @@ final String vdbName =3D "vdbName"; //$NON-NLS-1$ final String vdbVersion =3D "1.2.3"; //$NON-NLS-1$ final int portNumber =3D 7001; - final String logfile =3D null; - final int loglevel =3D 1; final String transactionAutoWrap =3D null; final String partialMode =3D "true"; //$NON-NLS-1$ final boolean secure =3D false; - helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,null,= logfile,loglevel,transactionAutoWrap, partialMode, 500, false, secure, - "jdbc:metamatrix:vdbName(a)mm://hostname:7001;= fetchSize=3D500;logLevel=3D1;serverURL=3Dmm://hostname:7001;VirtualDatabase= Version=3D1.2.3;partialResultsMode=3Dtrue;VirtualDatabaseName=3DvdbName"); = //$NON-NLS-1$ + helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,null,= transactionAutoWrap, partialMode, 500, false, secure, + "jdbc:metamatrix:vdbName(a)mm://hostname:7001;= fetchSize=3D500;serverURL=3Dmm://hostname:7001;VirtualDatabaseVersion=3D1.2= .3;partialResultsMode=3Dtrue;VirtualDatabaseName=3DvdbName"); //$NON-NLS-1$ } = public void testBuildingURL2() { @@ -573,13 +512,11 @@ final String vdbName =3D "vdbName"; //$NON-NLS-1$ final String vdbVersion =3D ""; //$NON-NLS-1$ final int portNumber =3D 7001; - final String logfile =3D "myLogFile"; //$NON-NLS-1$ - final int loglevel =3D 1; final String transactionAutoWrap =3D MMDataSource.TXN_AUTO_WRAP_PE= SSIMISTIC; final String partialMode =3D "false"; //$NON-NLS-1$ final boolean secure =3D false; - helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,null,= logfile,loglevel,transactionAutoWrap, partialMode, -1, false, secure, = - "jdbc:metamatrix:vdbName(a)mm://hostname:7001;= logLevel=3D1;serverURL=3Dmm://hostname:7001;logFile=3DmyLogFile;txnAutoWrap= =3DPESSIMISTIC;partialResultsMode=3Dfalse;VirtualDatabaseName=3DvdbName"); = //$NON-NLS-1$ = + helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,null,= transactionAutoWrap, partialMode, -1, false, secure, = + "jdbc:metamatrix:vdbName(a)mm://hostname:7001;= serverURL=3Dmm://hostname:7001;txnAutoWrap=3DPESSIMISTIC;partialResultsMode= =3Dfalse;VirtualDatabaseName=3DvdbName"); //$NON-NLS-1$ = } = public void testBuildURL3() { @@ -587,13 +524,11 @@ final String vdbName =3D "vdbName"; //$NON-NLS-1$ final String vdbVersion =3D ""; //$NON-NLS-1$ final int portNumber =3D 7001; - final String logfile =3D "myLogFile"; //$NON-NLS-1$ - final int loglevel =3D 1; final String transactionAutoWrap =3D MMDataSource.TXN_AUTO_WRAP_PE= SSIMISTIC; final String partialMode =3D "false"; //$NON-NLS-1$ final boolean secure =3D false; - helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,null,= logfile,loglevel,transactionAutoWrap, partialMode, -1, true, secure, - "jdbc:metamatrix:vdbName(a)mm://hostname:7001;= logLevel=3D1;serverURL=3Dmm://hostname:7001;logFile=3DmyLogFile;txnAutoWrap= =3DPESSIMISTIC;partialResultsMode=3Dfalse;VirtualDatabaseName=3DvdbName;sql= Options=3DSHOWPLAN"); //$NON-NLS-1$ = + helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,null,= transactionAutoWrap, partialMode, -1, true, secure, + "jdbc:metamatrix:vdbName(a)mm://hostname:7001;= serverURL=3Dmm://hostname:7001;txnAutoWrap=3DPESSIMISTIC;partialResultsMode= =3Dfalse;VirtualDatabaseName=3DvdbName;sqlOptions=3DSHOWPLAN"); //$NON-NLS-= 1$ = } = // Test secure protocol @@ -602,13 +537,11 @@ final String vdbName =3D "vdbName"; //$NON-NLS-1$ final String vdbVersion =3D ""; //$NON-NLS-1$ final int portNumber =3D 7001; - final String logfile =3D "myLogFile"; //$NON-NLS-1$ - final int loglevel =3D 1; final String transactionAutoWrap =3D MMDataSource.TXN_AUTO_WRAP_PE= SSIMISTIC; final String partialMode =3D "false"; //$NON-NLS-1$ final boolean secure =3D true; - helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,null,= logfile,loglevel,transactionAutoWrap, partialMode, -1, true, secure, - "jdbc:metamatrix:vdbName(a)mms://hostname:7001= ;logLevel=3D1;serverURL=3Dmms://hostname:7001;logFile=3DmyLogFile;txnAutoWr= ap=3DPESSIMISTIC;partialResultsMode=3Dfalse;VirtualDatabaseName=3DvdbName;s= qlOptions=3DSHOWPLAN"); //$NON-NLS-1$ = + helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,null,= transactionAutoWrap, partialMode, -1, true, secure, + "jdbc:metamatrix:vdbName(a)mms://hostname:7001= ;serverURL=3Dmms://hostname:7001;txnAutoWrap=3DPESSIMISTIC;partialResultsMo= de=3Dfalse;VirtualDatabaseName=3DvdbName;sqlOptions=3DSHOWPLAN"); //$NON-NL= S-1$ = } = /* @@ -622,13 +555,11 @@ final String vdbVersion =3D ""; //$NON-NLS-1$ final int portNumber =3D 7001; final String alternateServers =3D "hostName:7002,hostName2:7001,ho= stName2:7002"; //$NON-NLS-1$ - final String logfile =3D "myLogFile"; //$NON-NLS-1$ - final int loglevel =3D 1; final String transactionAutoWrap =3D MMDataSource.TXN_AUTO_WRAP_PE= SSIMISTIC; final String partialMode =3D "false"; //$NON-NLS-1$ final boolean secure =3D false; - helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,alter= nateServers,logfile,loglevel,transactionAutoWrap, partialMode, -1, true, se= cure, - "jdbc:metamatrix:vdbName(a)mm://hostName:7001,= hostName:7002,hostName2:7001,hostName2:7002;logLevel=3D1;serverURL=3Dmm://h= ostName:7001,hostName:7002,hostName2:7001,hostName2:7002;logFile=3DmyLogFil= e;txnAutoWrap=3DPESSIMISTIC;partialResultsMode=3Dfalse;VirtualDatabaseName= =3DvdbName;sqlOptions=3DSHOWPLAN"); //$NON-NLS-1$ = + helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,alter= nateServers,transactionAutoWrap, partialMode, -1, true, secure, + "jdbc:metamatrix:vdbName(a)mm://hostName:7001,= hostName:7002,hostName2:7001,hostName2:7002;serverURL=3Dmm://hostName:7001,= hostName:7002,hostName2:7001,hostName2:7002;txnAutoWrap=3DPESSIMISTIC;parti= alResultsMode=3Dfalse;VirtualDatabaseName=3DvdbName;sqlOptions=3DSHOWPLAN")= ; //$NON-NLS-1$ = } = /* @@ -642,13 +573,11 @@ final String vdbVersion =3D ""; //$NON-NLS-1$ final int portNumber =3D 7001; final String alternateServers =3D "hostName:7002,hostName2:7001,ho= stName2:7002"; //$NON-NLS-1$ - final String logfile =3D "myLogFile"; //$NON-NLS-1$ - final int loglevel =3D 1; final String transactionAutoWrap =3D MMDataSource.TXN_AUTO_WRAP_PE= SSIMISTIC; final String partialMode =3D "false"; //$NON-NLS-1$ final boolean secure =3D true; - helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,alter= nateServers,logfile,loglevel,transactionAutoWrap, partialMode, -1, true, se= cure, - "jdbc:metamatrix:vdbName(a)mms://hostName:7001= ,hostName:7002,hostName2:7001,hostName2:7002;logLevel=3D1;serverURL=3Dmms:/= /hostName:7001,hostName:7002,hostName2:7001,hostName2:7002;logFile=3DmyLogF= ile;txnAutoWrap=3DPESSIMISTIC;partialResultsMode=3Dfalse;VirtualDatabaseNam= e=3DvdbName;sqlOptions=3DSHOWPLAN"); //$NON-NLS-1$ = + helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,alter= nateServers,transactionAutoWrap, partialMode, -1, true, secure, + "jdbc:metamatrix:vdbName(a)mms://hostName:7001= ,hostName:7002,hostName2:7001,hostName2:7002;serverURL=3Dmms://hostName:700= 1,hostName:7002,hostName2:7001,hostName2:7002;txnAutoWrap=3DPESSIMISTIC;par= tialResultsMode=3Dfalse;VirtualDatabaseName=3DvdbName;sqlOptions=3DSHOWPLAN= "); //$NON-NLS-1$ = } = /* @@ -663,20 +592,18 @@ final String vdbVersion =3D ""; //$NON-NLS-1$ final int portNumber =3D 7001; final String alternateServers =3D "hostName:7002,hostName2,hostNam= e2:7002"; //$NON-NLS-1$ - final String logfile =3D "myLogFile"; //$NON-NLS-1$ - final int loglevel =3D 1; final String transactionAutoWrap =3D MMDataSource.TXN_AUTO_WRAP_PE= SSIMISTIC; final String partialMode =3D "false"; //$NON-NLS-1$ final boolean secure =3D false; - helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,alter= nateServers,logfile,loglevel,transactionAutoWrap, partialMode, -1, true, se= cure, - "jdbc:metamatrix:vdbName(a)mm://hostName:7001,= hostName:7002,hostName2:7001,hostName2:7002;logLevel=3D1;serverURL=3Dmm://h= ostName:7001,hostName:7002,hostName2:7001,hostName2:7002;logFile=3DmyLogFil= e;txnAutoWrap=3DPESSIMISTIC;partialResultsMode=3Dfalse;VirtualDatabaseName= =3DvdbName;sqlOptions=3DSHOWPLAN"); //$NON-NLS-1$ = + helpTestBuildingURL(vdbName,vdbVersion,serverName,portNumber,alter= nateServers,transactionAutoWrap, partialMode, -1, true, secure, + "jdbc:metamatrix:vdbName(a)mm://hostName:7001,= hostName:7002,hostName2:7001,hostName2:7002;serverURL=3Dmm://hostName:7001,= hostName:7002,hostName2:7001,hostName2:7002;txnAutoWrap=3DPESSIMISTIC;parti= alResultsMode=3Dfalse;VirtualDatabaseName=3DvdbName;sqlOptions=3DSHOWPLAN")= ; //$NON-NLS-1$ = } = public void testBuildURL_AdditionalProperties() { final MMDataSource ds =3D new MMDataSource(); - ds.setAdditionalProperties("foo=3Dbar;a=3Db"); - ds.setServerName("hostName"); - ds.setDatabaseName("vdbName"); + ds.setAdditionalProperties("foo=3Dbar;a=3Db"); //$NON-NLS-1$ + ds.setServerName("hostName"); //$NON-NLS-1$ + ds.setDatabaseName("vdbName"); //$NON-NLS-1$ ds.setPortNumber(1); assertEquals("jdbc:metamatrix:vdbName(a)mm://hostname:1;fetchSize=3D2= 000;serverURL=3Dmm://hostname:1;a=3Db;VirtualDatabaseName=3DvdbName;foo=3Db= ar", ds.buildURL()); //$NON-NLS-1$ } @@ -686,13 +613,11 @@ final String vdbName =3D "vdbName"; //$NON-NLS-1$ final String vdbVersion =3D ""; //$NON-NLS-1$ final int portNumber =3D -1; // this is what is inval= id - final String logfile =3D "myLogFile"; //$NON-NLS-1$ - final int loglevel =3D 1; final String dataSourceName =3D null; final String transactionAutoWrap =3D null; final String configFile =3D UnitTestUtil.getTestDataPath() + "/con= fig.txt"; //$NON-NLS-1$ try { - helpTestConnection(vdbName,vdbVersion,serverName,portNumber, n= ull, null, null, logfile,loglevel,dataSourceName,transactionAutoWrap, + helpTestConnection(vdbName,vdbVersion,serverName,portNumber, n= ull, null, null, dataSourceName,transactionAutoWrap, "false", configFile); // TRUE TO OVERRIDE USERNAME &= PASSWORD //$NON-NLS-1$ fail("Unexpectedly able to connect"); //$NON-NLS-1$ } catch ( SQLException e) { @@ -711,29 +636,15 @@ final String vdbVersion =3D ""; //$NON-NLS-1$ final int portNumber =3D 31000; final String alternateServers =3D "hostName:-1"; // this is what i= s invalid //$NON-NLS-1$ - final String logfile =3D "myLogFile"; //$NON-NLS-1$ - final int loglevel =3D 1; final String dataSourceName =3D null; final String transactionAutoWrap =3D null; final String configFile =3D UnitTestUtil.getTestDataPath() + "/con= fig.txt"; //$NON-NLS-1$ try { helpTestConnection(vdbName, vdbVersion, serverName, portNumber= , = - alternateServers, null, null, logfile, loglevel, - dataSourceName, transactionAutoWrap, "false", configFile); = // TRUE TO OVERRIDE USERNAME & PASSWORD + alternateServers, null, null, dataSourceName, transactionAut= oWrap, "false", configFile); //$NON-NLS-1$ // TRUE TO OVERRIDE USERNAM= E & PASSWORD fail("Unexpectedly able to connect"); //$NON-NLS-1$ } catch ( SQLException e) { // this is expected! } } - = - public void testSerialization() throws Exception { - MMDataSource dataSource =3D new MMDataSource(); - = - assertNotNull(dataSource.getLogger()); - = - dataSource =3D UnitTestUtil.helpSerialize(dataSource); - = - assertNotNull(dataSource.getLogger()); - } - } \ No newline at end of file Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDriver.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDriver.java 2= 009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMDriver.java 2= 009-02-26 23:42:51 UTC (rev 517) @@ -113,15 +113,14 @@ = public void testParseURL3() throws SQLException{ Properties p =3D new Properties(); - MMDriver.getInstance().parseURL("jdbc:metamatrix:BQT(a)mm://slwxp1= 57:1234,slntmm01:43401,sluxmm09:43302;version=3D4;txnAutoWrap=3DON;partialR= esultsMode=3DYES;logFile=3DjdbcLogFile.log", p); //$NON-NLS-1$ + MMDriver.getInstance().parseURL("jdbc:metamatrix:BQT(a)mm://slwxp1= 57:1234,slntmm01:43401,sluxmm09:43302;version=3D4;txnAutoWrap=3DON;partialR= esultsMode=3DYES", p); //$NON-NLS-1$ assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); = //$NON-NLS-1$ assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("4"));= //$NON-NLS-1$ assertTrue(p.getProperty(ExecutionProperties.PROP_TXN_AUTO_WRAP).e= quals("ON")); //$NON-NLS-1$ assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_= MODE).equals("YES")); //$NON-NLS-1$ - assertTrue(p.getProperty(BaseDataSource.LOG_FILE).equals("jdbcLogF= ile.log")); //$NON-NLS-1$ assertTrue(p.getProperty(MMURL.CONNECTION.SERVER_URL).equals("mm:/= /slwxp157:1234,slntmm01:43401,sluxmm09:43302")); //$NON-NLS-1$ assertTrue(p.getProperty(BaseDataSource.VERSION).equals("4")); //$= NON-NLS-1$ - assertEquals(7, p.size()); = + assertEquals(6, p.size()); = } = = public void testGetPropertyInfo1() throws Exception { = Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMResultS= et.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMResultSet.jav= a 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/TestMMResultSet.jav= a 2009-02-26 23:42:51 UTC (rev 517) @@ -700,7 +700,6 @@ = static MMStatement createMockStatement() throws SQLException { MMStatement statement =3D mock(MMStatement.class); - stub(statement.getLogger()).toReturn(mock(Logger.class)); stub(statement.getDQP()).toReturn(mock(ClientSideDQP.class)); stub(statement.getResultSetType()).toReturn( ResultSet.TYPE_SCROLL_INSENSITIVE); Modified: trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/util/TestMMJD= BCURL.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/util/TestMMJDBCURL.= java 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/client-jdbc/src/test/java/com/metamatrix/jdbc/util/TestMMJDBCURL.= java 2009-02-26 23:42:51 UTC (rev 517) @@ -78,13 +78,12 @@ = public void testCaseConversion() { // Different case ------------------------------------HERE -v ---= -------------and HERE -v - String URL =3D "jdbc:metamatrix:bqt(a)mm://localhost:12345;VERSION= =3D1;user=3Dxyz;password=3D***;loglevel=3D1;configFile=3Dtestdata/bqt/dqp_s= tmt_e2e.xmi"; //$NON-NLS-1$ + String URL =3D "jdbc:metamatrix:bqt(a)mm://localhost:12345;VERSION= =3D1;user=3Dxyz;password=3D***;configFile=3Dtestdata/bqt/dqp_stmt_e2e.xmi";= //$NON-NLS-1$ = Properties expectedProperties =3D new Properties(); expectedProperties.setProperty("version", "1"); //$NON-NLS-1$ //$N= ON-NLS-2$ expectedProperties.setProperty("user", "xyz"); //$NON-NLS-1$ //$NO= N-NLS-2$ expectedProperties.setProperty("password", "***"); //$NON-NLS-1$ /= /$NON-NLS-2$ - expectedProperties.setProperty("logLevel", "1"); //$NON-NLS-1$ //$= NON-NLS-2$ expectedProperties.setProperty("configFile", "testdata/bqt/dqp_stm= t_e2e.xmi"); //$NON-NLS-1$ //$NON-NLS-2$ MMJDBCURL url =3D new MMJDBCURL(URL); = assertEquals("bqt", url.getVDBName()); //$NON-NLS-1$ Modified: trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriv= er.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.jav= a 2009-02-26 22:08:21 UTC (rev 516) +++ trunk/embedded/src/test/java/com/metamatrix/jdbc/TestEmbeddedDriver.jav= a 2009-02-26 23:42:51 UTC (rev 517) @@ -107,15 +107,13 @@ = public void testParseURL3() throws SQLException{ Properties p =3D new Properties(); - driver.parseURL("jdbc:metamatrix:BQT@/metamatrix/dqp/dqp.propertie= s;version=3D4;txnAutoWrap=3DON;partialResultsMode=3DYES;logFile=3DD:\\metam= atrix\\work\\DQP\\log\\jdbcLogFile.log", p); //$NON-NLS-1$ + driver.parseURL("jdbc:metamatrix:BQT@/metamatrix/dqp/dqp.propertie= s;version=3D4;txnAutoWrap=3DON;partialResultsMode=3DYES;", p); //$NON-NLS-1$ assertTrue(p.getProperty(BaseDataSource.VDB_NAME).equals("BQT")); = //$NON-NLS-1$ - assertTrue(p.get(EmbeddedDataSource.DQP_BOOTSTRAP_FILE).toString()= .equals("mmfile:/metamatrix/dqp/dqp.properties")); //$NON-NLS-1$ assertTrue(p.getProperty(BaseDataSource.VDB_VERSION).equals("4"));= //$NON-NLS-1$ assertTrue(p.getProperty(BaseDataSource.VERSION).equals("4")); //$= NON-NLS-1$ assertTrue(p.getProperty(ExecutionProperties.PROP_TXN_AUTO_WRAP).e= quals("ON")); //$NON-NLS-1$ assertTrue(p.getProperty(ExecutionProperties.PROP_PARTIAL_RESULTS_= MODE).equals("YES")); //$NON-NLS-1$ - assertTrue(p.getProperty(BaseDataSource.LOG_FILE).equals("D:\\meta= matrix\\work\\DQP\\log\\jdbcLogFile.log")); //$NON-NLS-1$ - assertEquals(7, p.size()); = + assertEquals(6, p.size()); = } = public void testParseURL4() throws SQLException{ --===============4511310328688922066==-- From teiid-commits at lists.jboss.org Fri Feb 27 10:44:08 2009 Content-Type: multipart/mixed; boundary="===============7787921469171071121==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r518 - trunk/server/src/main/java/com/metamatrix/server. Date: Fri, 27 Feb 2009 10:44:08 -0500 Message-ID: --===============7787921469171071121== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-27 10:44:08 -0500 (Fri, 27 Feb 2009) New Revision: 518 Modified: trunk/server/src/main/java/com/metamatrix/server/ServiceManager.java Log: TEIID-387 Modified: trunk/server/src/main/java/com/metamatrix/server/ServiceManager.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/server/src/main/java/com/metamatrix/server/ServiceManager.java 20= 09-02-26 23:42:51 UTC (rev 517) +++ trunk/server/src/main/java/com/metamatrix/server/ServiceManager.java 20= 09-02-27 15:44:08 UTC (rev 518) @@ -1204,7 +1204,7 @@ } = public void doShutdownServer() { - System.out.println("All the servers in Cluster is being shutdown"); /= /$NON-NLS-1$ + System.out.println("All the servers in Cluster are being shutdown"); = //$NON-NLS-1$ this.hostManager.killAllServersInCluster(); } = --===============7787921469171071121==-- From teiid-commits at lists.jboss.org Fri Feb 27 10:59:22 2009 Content-Type: multipart/mixed; boundary="===============5996112888608233203==" MIME-Version: 1.0 From: teiid-commits at lists.jboss.org To: teiid-commits at lists.jboss.org Subject: [teiid-commits] teiid SVN: r519 - trunk/common-core/src/main/java/com/metamatrix/common/util. Date: Fri, 27 Feb 2009 10:59:22 -0500 Message-ID: --===============5996112888608233203== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rareddy Date: 2009-02-27 10:59:22 -0500 (Fri, 27 Feb 2009) New Revision: 519 Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/TimestampWith= Timezone.java Log: fixing the build Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/Timest= ampWithTimezone.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common-core/src/main/java/com/metamatrix/common/util/TimestampWit= hTimezone.java 2009-02-27 15:44:08 UTC (rev 518) +++ trunk/common-core/src/main/java/com/metamatrix/common/util/TimestampWit= hTimezone.java 2009-02-27 15:59:22 UTC (rev 519) @@ -186,4 +186,8 @@ } = } = + public static void resetCalendar(TimeZone tz) { + TimeZone.setDefault(tz); + } + = } \ No newline at end of file --===============5996112888608233203==--