Author: rareddy Date: 2011-11-02 11:15:47 -0400 (Wed, 02 Nov 2011) New Revision: 3601 Added: branches/as7/cache-jbosscache/src/test/java/ branches/as7/client/src/main/java/org/teiid/client/ResizingArrayList.java branches/as7/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java branches/as7/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java branches/as7/common-core/src/main/java/org/teiid/core/util/ExecutorUtils.java branches/as7/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceHandlerResolver.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/AllOrNoneHeader.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DataCategory.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DataCategoryGroupSobjectTypePair.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupResult.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructureResult.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructures.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructuresResponse.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroups.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupsResponse.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSoftphoneScreenPopOption.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DisableFeedTrackingHeader.java branches/as7/connectors/salesforce-api/src/main/resources/partner_v22.wsdl branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java branches/as7/documentation/reference/src/main/docbook/en-US/content/vdbs.xml branches/as7/engine/src/main/java/org/teiid/common/buffer/BaseCacheEntry.java branches/as7/engine/src/main/java/org/teiid/common/buffer/CacheKey.java branches/as7/engine/src/main/java/org/teiid/common/buffer/ExtensibleBufferedInputStream.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/BlockByteBuffer.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/BlockInputStream.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/BlockManager.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/BlockOutputStream.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/BlockStore.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/ConcurrentBitSet.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/DataObjectInputStream.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/DataObjectOutputStream.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/LrfuEvictionQueue.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/PhysicalInfo.java branches/as7/engine/src/test/java/org/teiid/common/buffer/impl/TestBufferFrontedFileStoreCache.java branches/as7/engine/src/test/java/org/teiid/common/buffer/impl/TestConcurrentBitSet.java branches/as7/engine/src/test/java/org/teiid/common/buffer/impl/TestLrfuEvictionQueue.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestFunctionPushdown.java branches/as7/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidConfiguration.java Removed: branches/as7/client/src/main/java/org/teiid/jdbc/CancellationTimer.java branches/as7/connectors/salesforce-api/src/main/resources/partner_v17.wsdl branches/as7/documentation/reference/src/main/docbook/en-US/content/multisource.xml branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/BlockBitSetTree.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/BlockClosedLongIntHashTable.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/BlockManager.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/FileStoreCache.java branches/as7/engine/src/test/java/org/teiid/common/buffer/impl/TestBlockBitSetTree.java branches/as7/engine/src/test/java/org/teiid/common/buffer/impl/TestBlockClosedLongIntHashTable.java branches/as7/engine/src/test/java/org/teiid/common/buffer/impl/TestFileStoreCache.java branches/as7/jboss-integration/src/test/java/org/teiid/jboss/TestTeiidOperations.java Modified: branches/as7/ branches/as7/admin/pom.xml branches/as7/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java branches/as7/admin/src/test/java/org/teiid/adminapi/impl/TestRequestMetadata.java branches/as7/admin/src/test/java/org/teiid/adminapi/impl/TestSessionMetadata.java branches/as7/admin/src/test/java/org/teiid/adminapi/impl/TestTransactionMetadata.java branches/as7/adminshell/pom.xml branches/as7/adminshell/src/main/java/groovy/ branches/as7/adminshell/src/main/java/groovy/sql/ branches/as7/adminshell/src/main/java/groovy/sql/TeiidSql.java branches/as7/adminshell/src/main/java/org/teiid/adminshell/ branches/as7/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java branches/as7/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java branches/as7/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java branches/as7/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java branches/as7/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java branches/as7/adminshell/src/main/java/org/teiid/adminshell/Help.java branches/as7/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java branches/as7/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java branches/as7/adminshell/src/main/resources/org/ branches/as7/adminshell/src/main/resources/org/codehaus/ branches/as7/adminshell/src/main/resources/org/codehaus/groovy/ branches/as7/adminshell/src/main/resources/org/codehaus/groovy/tools/ branches/as7/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/ branches/as7/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml branches/as7/adminshell/src/main/resources/org/teiid/ branches/as7/adminshell/src/main/resources/org/teiid/adminshell/ branches/as7/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties branches/as7/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties branches/as7/adminshell/src/test/java/org/ branches/as7/adminshell/src/test/java/org/teiid/ branches/as7/adminshell/src/test/java/org/teiid/adminshell/ branches/as7/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java branches/as7/adminshell/src/test/resources/foo/ branches/as7/adminshell/src/test/resources/foo/bar.txt branches/as7/api/pom.xml branches/as7/api/src/main/java/org/teiid/events/ branches/as7/api/src/main/java/org/teiid/events/EventDistributor.java branches/as7/api/src/main/java/org/teiid/events/EventDistributorFactory.java branches/as7/api/src/main/java/org/teiid/language/Call.java branches/as7/api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java branches/as7/build/kits/ branches/as7/build/kits/adminshell/ branches/as7/build/kits/jboss-container/ branches/as7/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml branches/as7/build/kits/jboss-container/teiid-releasenotes.html branches/as7/build/pom.xml branches/as7/cache-jbosscache/pom.xml branches/as7/cache-jbosscache/src/main/java/org/ branches/as7/cache-jbosscache/src/main/java/org/teiid/ branches/as7/cache-jbosscache/src/main/java/org/teiid/cache/ branches/as7/cache-jbosscache/src/main/java/org/teiid/cache/jboss/ branches/as7/cache-jbosscache/src/main/java/org/teiid/events/ branches/as7/cache-jbosscache/src/main/java/org/teiid/replication/ branches/as7/cache-jbosscache/src/main/java/org/teiid/replication/jboss/ branches/as7/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java branches/as7/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java branches/as7/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java branches/as7/client-jdk15/pom.xml branches/as7/client/pom.xml branches/as7/client/src/main/java/org/teiid/client/BatchSerializer.java branches/as7/client/src/main/java/org/teiid/client/ResultsMessage.java branches/as7/client/src/main/java/org/teiid/client/util/ branches/as7/client/src/main/java/org/teiid/client/util/ExceptionHolder.java branches/as7/client/src/main/java/org/teiid/client/util/ExceptionUtil.java branches/as7/client/src/main/java/org/teiid/client/util/ResultsFuture.java branches/as7/client/src/main/java/org/teiid/client/util/ResultsReceiver.java branches/as7/client/src/main/java/org/teiid/jdbc/ branches/as7/client/src/main/java/org/teiid/jdbc/BaseDataSource.java branches/as7/client/src/main/java/org/teiid/jdbc/BatchResults.java branches/as7/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java branches/as7/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java branches/as7/client/src/main/java/org/teiid/jdbc/ConnectionListener.java branches/as7/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java branches/as7/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java branches/as7/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java branches/as7/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java branches/as7/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java branches/as7/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java branches/as7/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java branches/as7/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java branches/as7/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java branches/as7/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java branches/as7/client/src/main/java/org/teiid/jdbc/JDBCURL.java branches/as7/client/src/main/java/org/teiid/jdbc/MetadataProvider.java branches/as7/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java branches/as7/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java branches/as7/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java branches/as7/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java branches/as7/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java branches/as7/client/src/main/java/org/teiid/jdbc/SQLStates.java branches/as7/client/src/main/java/org/teiid/jdbc/SocketProfile.java branches/as7/client/src/main/java/org/teiid/jdbc/StatementImpl.java branches/as7/client/src/main/java/org/teiid/jdbc/TeiidConnection.java branches/as7/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java branches/as7/client/src/main/java/org/teiid/jdbc/TeiidDriver.java branches/as7/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java branches/as7/client/src/main/java/org/teiid/jdbc/TeiidStatement.java branches/as7/client/src/main/java/org/teiid/jdbc/WarningUtil.java branches/as7/client/src/main/java/org/teiid/jdbc/WrapperImpl.java branches/as7/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java branches/as7/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java branches/as7/client/src/main/java/org/teiid/net/socket/ branches/as7/client/src/main/java/org/teiid/net/socket/Handshake.java branches/as7/client/src/main/java/org/teiid/net/socket/Message.java branches/as7/client/src/main/java/org/teiid/net/socket/ObjectChannel.java branches/as7/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java branches/as7/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java branches/as7/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java branches/as7/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java branches/as7/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java branches/as7/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java branches/as7/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java branches/as7/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java branches/as7/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java branches/as7/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java branches/as7/client/src/main/java/org/teiid/net/socket/SocketUtil.java branches/as7/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java branches/as7/client/src/main/resources/org/ branches/as7/client/src/main/resources/org/teiid/ branches/as7/client/src/main/resources/org/teiid/jdbc/ branches/as7/client/src/main/resources/org/teiid/net/ branches/as7/client/src/test/java/org/teiid/client/TestBatchSerializer.java branches/as7/client/src/test/java/org/teiid/client/plan/ branches/as7/client/src/test/java/org/teiid/client/plan/TestPlanNode.java branches/as7/client/src/test/java/org/teiid/client/util/ branches/as7/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java branches/as7/client/src/test/java/org/teiid/client/util/TestResultsFuture.java branches/as7/client/src/test/java/org/teiid/jdbc/ branches/as7/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java branches/as7/client/src/test/java/org/teiid/jdbc/TestBatchResults.java branches/as7/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java branches/as7/client/src/test/java/org/teiid/jdbc/TestConnection.java branches/as7/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java branches/as7/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java branches/as7/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java branches/as7/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java branches/as7/client/src/test/java/org/teiid/jdbc/TestResultSet.java branches/as7/client/src/test/java/org/teiid/jdbc/TestSQLException.java branches/as7/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java branches/as7/client/src/test/java/org/teiid/jdbc/TestStatement.java branches/as7/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java branches/as7/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java branches/as7/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java branches/as7/client/src/test/java/org/teiid/jdbc/TestXAConnection.java branches/as7/client/src/test/java/org/teiid/jdbc/util/ branches/as7/client/src/test/java/org/teiid/net/ branches/as7/client/src/test/java/org/teiid/net/TestTeiidURL.java branches/as7/client/src/test/java/org/teiid/net/socket/ branches/as7/common-core/pom.xml branches/as7/common-core/src/main/java/org/ branches/as7/common-core/src/main/java/org/teiid/ branches/as7/common-core/src/main/java/org/teiid/core/ branches/as7/common-core/src/main/java/org/teiid/core/BundleUtil.java branches/as7/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java branches/as7/common-core/src/main/java/org/teiid/core/CoreConstants.java branches/as7/common-core/src/main/java/org/teiid/core/CorePlugin.java branches/as7/common-core/src/main/java/org/teiid/core/TeiidComponentException.java branches/as7/common-core/src/main/java/org/teiid/core/TeiidException.java branches/as7/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java branches/as7/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java branches/as7/common-core/src/main/java/org/teiid/core/crypto/ branches/as7/common-core/src/main/java/org/teiid/core/types/ branches/as7/common-core/src/main/java/org/teiid/core/types/BaseLob.java branches/as7/common-core/src/main/java/org/teiid/core/types/BlobImpl.java branches/as7/common-core/src/main/java/org/teiid/core/types/BlobType.java branches/as7/common-core/src/main/java/org/teiid/core/types/ClobImpl.java branches/as7/common-core/src/main/java/org/teiid/core/types/ClobType.java branches/as7/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java branches/as7/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java branches/as7/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java branches/as7/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java branches/as7/common-core/src/main/java/org/teiid/core/types/NullType.java branches/as7/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java branches/as7/common-core/src/main/java/org/teiid/core/types/Sequencable.java branches/as7/common-core/src/main/java/org/teiid/core/types/SourceTransform.java branches/as7/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java branches/as7/common-core/src/main/java/org/teiid/core/types/Streamable.java branches/as7/common-core/src/main/java/org/teiid/core/types/Transform.java branches/as7/common-core/src/main/java/org/teiid/core/types/TransformationException.java branches/as7/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java branches/as7/common-core/src/main/java/org/teiid/core/types/XMLType.java branches/as7/common-core/src/main/java/org/teiid/core/types/basic/ branches/as7/common-core/src/main/java/org/teiid/core/util/ branches/as7/common-core/src/test/java/org/ branches/as7/common-core/src/test/java/org/teiid/ branches/as7/common-core/src/test/java/org/teiid/core/ branches/as7/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java branches/as7/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java branches/as7/common-core/src/test/java/org/teiid/core/crypto/ branches/as7/common-core/src/test/java/org/teiid/core/types/ branches/as7/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java branches/as7/common-core/src/test/java/org/teiid/core/types/TestClobValue.java branches/as7/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java branches/as7/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java branches/as7/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java branches/as7/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java branches/as7/common-core/src/test/java/org/teiid/core/types/basic/ branches/as7/common-core/src/test/java/org/teiid/core/util/ branches/as7/common-core/src/test/java/org/teiid/core/util/UnitTestUtil.java branches/as7/common-core/src/test/java/org/teiid/query/ branches/as7/common-core/src/test/java/org/teiid/query/unittest/ branches/as7/connectors/connector-file/pom.xml branches/as7/connectors/connector-file/src/main/java/org/teiid/resource/adapter/ branches/as7/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file/ branches/as7/connectors/connector-file/src/main/resources/org/ branches/as7/connectors/connector-file/src/main/resources/org/teiid/ branches/as7/connectors/connector-file/src/main/resources/org/teiid/resource/ branches/as7/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/ branches/as7/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/ branches/as7/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties branches/as7/connectors/connector-file/src/test/java/org/ branches/as7/connectors/connector-file/src/test/java/org/teiid/ branches/as7/connectors/connector-file/src/test/java/org/teiid/resource/ branches/as7/connectors/connector-file/src/test/java/org/teiid/resource/adapter/ branches/as7/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/ branches/as7/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java branches/as7/connectors/connector-ldap/pom.xml branches/as7/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ branches/as7/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap/ branches/as7/connectors/connector-ldap/src/test/java/org/teiid/resource/adapter/ldap/TestLDAPConnection.java branches/as7/connectors/connector-salesforce/pom.xml branches/as7/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java branches/as7/connectors/connector-ws/pom.xml branches/as7/connectors/connector-ws/src/main/resources/org/ branches/as7/connectors/connector-ws/src/main/resources/org/teiid/ branches/as7/connectors/connector-ws/src/main/resources/org/teiid/resource/ branches/as7/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ branches/as7/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/ branches/as7/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties branches/as7/connectors/pom.xml branches/as7/connectors/salesforce-api/pom.xml branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeGlobalSObjectResult.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeLayout.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeLayoutResult.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSObjectResult.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSoftphoneLayoutCallType.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/Field.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/FieldType.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/GetUserInfoResult.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidFieldFault.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidIdFault.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidNewPasswordFault.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidQueryLocatorFault.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidSObjectFault.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/LoginFault.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/MalformedQueryFault.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/MalformedSearchFault.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/ObjectFactory.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/SforceService.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/Soap.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/StatusCode.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/UnexpectedErrorFault.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/fault/ExceptionCode.java branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/fault/ObjectFactory.java branches/as7/connectors/sandbox/pom.xml branches/as7/connectors/sandbox/translator-yahoo/pom.xml branches/as7/connectors/translator-file/pom.xml branches/as7/connectors/translator-jdbc/pom.xml branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCProcedureExecution.java branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/LocateFunctionModifier.java branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/ branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java branches/as7/connectors/translator-ldap/pom.xml branches/as7/connectors/translator-ldap/src/main/java/org/teiid/translator/ branches/as7/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/ branches/as7/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPExecutionFactory.java branches/as7/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSyncQueryExecution.java branches/as7/connectors/translator-loopback/pom.xml branches/as7/connectors/translator-olap/pom.xml branches/as7/connectors/translator-salesforce/pom.xml branches/as7/connectors/translator-ws/pom.xml branches/as7/console/pom.xml branches/as7/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java branches/as7/console/src/main/resources/META-INF/rhq-plugin.xml branches/as7/documentation/admin-guide/pom.xml branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/performance.xml branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/security.xml branches/as7/documentation/caching-guide/pom.xml branches/as7/documentation/client-developers-guide/pom.xml branches/as7/documentation/developer-guide/pom.xml branches/as7/documentation/pom.xml branches/as7/documentation/quick-start-example/pom.xml branches/as7/documentation/reference/pom.xml branches/as7/documentation/reference/src/main/docbook/en-US/Reference.xml branches/as7/documentation/reference/src/main/docbook/en-US/content/architecture.xml branches/as7/documentation/reference/src/main/docbook/en-US/content/scalar_functions.xml branches/as7/documentation/reference/src/main/docbook/en-US/content/translators.xml branches/as7/engine/pom.xml branches/as7/engine/src/main/java/org/teiid/api/ branches/as7/engine/src/main/java/org/teiid/api/exception/ branches/as7/engine/src/main/java/org/teiid/api/exception/query/ branches/as7/engine/src/main/java/org/teiid/api/exception/query/ExpressionEvaluationException.java branches/as7/engine/src/main/java/org/teiid/api/exception/query/FunctionExecutionException.java branches/as7/engine/src/main/java/org/teiid/api/exception/query/FunctionMetadataException.java branches/as7/engine/src/main/java/org/teiid/api/exception/query/InvalidFunctionException.java branches/as7/engine/src/main/java/org/teiid/api/exception/query/QueryMetadataException.java branches/as7/engine/src/main/java/org/teiid/api/exception/query/QueryParserException.java branches/as7/engine/src/main/java/org/teiid/api/exception/query/QueryPlannerException.java branches/as7/engine/src/main/java/org/teiid/api/exception/query/QueryProcessingException.java branches/as7/engine/src/main/java/org/teiid/api/exception/query/QueryResolverException.java branches/as7/engine/src/main/java/org/teiid/api/exception/query/QueryValidatorException.java branches/as7/engine/src/main/java/org/teiid/api/exception/query/UnresolvedSymbolDescription.java branches/as7/engine/src/main/java/org/teiid/common/ branches/as7/engine/src/main/java/org/teiid/common/buffer/ branches/as7/engine/src/main/java/org/teiid/common/buffer/AbstractTupleSource.java branches/as7/engine/src/main/java/org/teiid/common/buffer/AutoCleanupUtil.java branches/as7/engine/src/main/java/org/teiid/common/buffer/BatchManager.java branches/as7/engine/src/main/java/org/teiid/common/buffer/BlockedException.java branches/as7/engine/src/main/java/org/teiid/common/buffer/BufferManager.java branches/as7/engine/src/main/java/org/teiid/common/buffer/Cache.java branches/as7/engine/src/main/java/org/teiid/common/buffer/CacheEntry.java branches/as7/engine/src/main/java/org/teiid/common/buffer/FileStore.java branches/as7/engine/src/main/java/org/teiid/common/buffer/FileStoreInputStreamFactory.java branches/as7/engine/src/main/java/org/teiid/common/buffer/IndexedTupleSource.java branches/as7/engine/src/main/java/org/teiid/common/buffer/LightWeightCopyOnWriteList.java branches/as7/engine/src/main/java/org/teiid/common/buffer/LobManager.java branches/as7/engine/src/main/java/org/teiid/common/buffer/SPage.java branches/as7/engine/src/main/java/org/teiid/common/buffer/STree.java branches/as7/engine/src/main/java/org/teiid/common/buffer/Serializer.java branches/as7/engine/src/main/java/org/teiid/common/buffer/StorageManager.java branches/as7/engine/src/main/java/org/teiid/common/buffer/TupleBatch.java branches/as7/engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java branches/as7/engine/src/main/java/org/teiid/common/buffer/TupleBuffer.java branches/as7/engine/src/main/java/org/teiid/common/buffer/TupleSource.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/ branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/ExtensibleBufferedOutputStream.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/MemoryStorageManager.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/SizeUtility.java branches/as7/engine/src/main/java/org/teiid/common/buffer/impl/SplittableStorageManager.java branches/as7/engine/src/main/java/org/teiid/core/ branches/as7/engine/src/main/java/org/teiid/core/id/ branches/as7/engine/src/main/java/org/teiid/dqp/internal/process/AccessInfo.java branches/as7/engine/src/main/java/org/teiid/dqp/internal/process/AuthorizationValidationVisitor.java branches/as7/engine/src/main/java/org/teiid/dqp/internal/process/DQPConfiguration.java branches/as7/engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java branches/as7/engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java branches/as7/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java branches/as7/engine/src/main/java/org/teiid/dqp/internal/process/MetaDataProcessor.java branches/as7/engine/src/main/java/org/teiid/dqp/internal/process/PreparedPlan.java branches/as7/engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java branches/as7/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java branches/as7/engine/src/main/java/org/teiid/dqp/internal/process/ThreadReuseExecutor.java branches/as7/engine/src/main/java/org/teiid/dqp/message/RequestID.java branches/as7/engine/src/main/java/org/teiid/query/ branches/as7/engine/src/main/java/org/teiid/query/ObjectReplicator.java branches/as7/engine/src/main/java/org/teiid/query/QueryPlugin.java branches/as7/engine/src/main/java/org/teiid/query/ReplicatedObject.java branches/as7/engine/src/main/java/org/teiid/query/analysis/ branches/as7/engine/src/main/java/org/teiid/query/analysis/AnalysisRecord.java branches/as7/engine/src/main/java/org/teiid/query/eval/ branches/as7/engine/src/main/java/org/teiid/query/function/ branches/as7/engine/src/main/java/org/teiid/query/function/CharsetUtils.java branches/as7/engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java branches/as7/engine/src/main/java/org/teiid/query/function/FunctionForm.java branches/as7/engine/src/main/java/org/teiid/query/function/FunctionLibrary.java branches/as7/engine/src/main/java/org/teiid/query/function/FunctionMetadataSource.java branches/as7/engine/src/main/java/org/teiid/query/function/FunctionMethods.java branches/as7/engine/src/main/java/org/teiid/query/function/FunctionTree.java branches/as7/engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java branches/as7/engine/src/main/java/org/teiid/query/function/UDFSource.java branches/as7/engine/src/main/java/org/teiid/query/function/aggregate/ branches/as7/engine/src/main/java/org/teiid/query/function/metadata/ branches/as7/engine/src/main/java/org/teiid/query/function/source/ branches/as7/engine/src/main/java/org/teiid/query/mapping/ branches/as7/engine/src/main/java/org/teiid/query/mapping/relational/ branches/as7/engine/src/main/java/org/teiid/query/mapping/xml/ branches/as7/engine/src/main/java/org/teiid/query/metadata/ branches/as7/engine/src/main/java/org/teiid/query/metadata/TempMetadataID.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/ branches/as7/engine/src/main/java/org/teiid/query/optimizer/BatchedUpdatePlanner.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/CommandPlanner.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/DdlPlanner.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/ProcedurePlanner.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/QueryOptimizer.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/capabilities/ branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/ branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/AliasGenerator.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/OptimizerRule.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/PartitionAnalyzer.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/PlanHints.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/RuleStack.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/plantree/ branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/rules/ branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/rules/JoinRegion.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleAssignOutputElements.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleConstants.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeVirtual.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanProcedures.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleRaiseAccess.java branches/as7/engine/src/main/java/org/teiid/query/optimizer/xml/ branches/as7/engine/src/main/java/org/teiid/query/parser/ branches/as7/engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java branches/as7/engine/src/main/java/org/teiid/query/processor/ branches/as7/engine/src/main/java/org/teiid/query/processor/BatchCollector.java branches/as7/engine/src/main/java/org/teiid/query/processor/BatchIterator.java branches/as7/engine/src/main/java/org/teiid/query/processor/BatchedUpdatePlan.java branches/as7/engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java branches/as7/engine/src/main/java/org/teiid/query/processor/DdlPlan.java branches/as7/engine/src/main/java/org/teiid/query/processor/ProcessorDataManager.java branches/as7/engine/src/main/java/org/teiid/query/processor/ProcessorPlan.java branches/as7/engine/src/main/java/org/teiid/query/processor/QueryProcessor.java branches/as7/engine/src/main/java/org/teiid/query/processor/proc/ branches/as7/engine/src/main/java/org/teiid/query/processor/relational/ branches/as7/engine/src/main/java/org/teiid/query/processor/relational/AccessNode.java branches/as7/engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java branches/as7/engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java branches/as7/engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java branches/as7/engine/src/main/java/org/teiid/query/processor/relational/NestedTableJoinStrategy.java branches/as7/engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java branches/as7/engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java branches/as7/engine/src/main/java/org/teiid/query/processor/xml/ branches/as7/engine/src/main/java/org/teiid/query/report/ branches/as7/engine/src/main/java/org/teiid/query/resolver/ branches/as7/engine/src/main/java/org/teiid/query/resolver/CommandResolver.java branches/as7/engine/src/main/java/org/teiid/query/resolver/ProcedureContainerResolver.java branches/as7/engine/src/main/java/org/teiid/query/resolver/QueryResolver.java branches/as7/engine/src/main/java/org/teiid/query/resolver/VariableResolver.java branches/as7/engine/src/main/java/org/teiid/query/resolver/command/ branches/as7/engine/src/main/java/org/teiid/query/resolver/util/ branches/as7/engine/src/main/java/org/teiid/query/rewriter/ branches/as7/engine/src/main/java/org/teiid/query/sql/ branches/as7/engine/src/main/java/org/teiid/query/sql/LanguageObject.java branches/as7/engine/src/main/java/org/teiid/query/sql/LanguageVisitor.java branches/as7/engine/src/main/java/org/teiid/query/sql/ProcedureReservedWords.java branches/as7/engine/src/main/java/org/teiid/query/sql/lang/ branches/as7/engine/src/main/java/org/teiid/query/sql/navigator/ branches/as7/engine/src/main/java/org/teiid/query/sql/proc/ branches/as7/engine/src/main/java/org/teiid/query/sql/symbol/ branches/as7/engine/src/main/java/org/teiid/query/sql/symbol/Constant.java branches/as7/engine/src/main/java/org/teiid/query/sql/util/ branches/as7/engine/src/main/java/org/teiid/query/sql/visitor/ branches/as7/engine/src/main/java/org/teiid/query/tempdata/ branches/as7/engine/src/main/java/org/teiid/query/tempdata/TempTable.java branches/as7/engine/src/main/java/org/teiid/query/util/ branches/as7/engine/src/main/java/org/teiid/query/validator/ branches/as7/engine/src/main/java/org/teiid/query/xquery/ branches/as7/engine/src/main/java/org/teiid/query/xquery/saxon/ branches/as7/engine/src/main/java/org/teiid/vdb/ branches/as7/engine/src/main/java/org/teiid/vdb/runtime/ branches/as7/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj branches/as7/engine/src/main/resources/org/teiid/query/i18n.properties branches/as7/engine/src/test/java/org/teiid/cache/ branches/as7/engine/src/test/java/org/teiid/cache/TestDefaultCache.java branches/as7/engine/src/test/java/org/teiid/common/ branches/as7/engine/src/test/java/org/teiid/common/buffer/ branches/as7/engine/src/test/java/org/teiid/common/buffer/BufferManagerFactory.java branches/as7/engine/src/test/java/org/teiid/common/buffer/TestSTree.java branches/as7/engine/src/test/java/org/teiid/common/buffer/impl/TestFileStorageManager.java branches/as7/engine/src/test/java/org/teiid/common/buffer/impl/TestSizeUtility.java branches/as7/engine/src/test/java/org/teiid/common/queue/ branches/as7/engine/src/test/java/org/teiid/common/queue/TestThreadReuseExecutor.java branches/as7/engine/src/test/java/org/teiid/dqp/internal/process/TestAuthorizationValidationVisitor.java branches/as7/engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java branches/as7/engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java branches/as7/engine/src/test/java/org/teiid/dqp/internal/process/TestMetaDataProcessor.java branches/as7/engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatementBatchedUpdate.java branches/as7/engine/src/test/java/org/teiid/dqp/message/TestRequestID.java branches/as7/engine/src/test/java/org/teiid/query/ branches/as7/engine/src/test/java/org/teiid/query/analysis/ branches/as7/engine/src/test/java/org/teiid/query/function/ branches/as7/engine/src/test/java/org/teiid/query/function/TestFunction.java branches/as7/engine/src/test/java/org/teiid/query/function/TestFunctionLibrary.java branches/as7/engine/src/test/java/org/teiid/query/function/TestFunctionMetadataReader.java branches/as7/engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java branches/as7/engine/src/test/java/org/teiid/query/function/TestFunctionTree.java branches/as7/engine/src/test/java/org/teiid/query/function/TestResolvedFunctions.java branches/as7/engine/src/test/java/org/teiid/query/function/metadata/ branches/as7/engine/src/test/java/org/teiid/query/function/source/ branches/as7/engine/src/test/java/org/teiid/query/mapping/ branches/as7/engine/src/test/java/org/teiid/query/mapping/xml/ branches/as7/engine/src/test/java/org/teiid/query/metadata/ branches/as7/engine/src/test/java/org/teiid/query/optimizer/ branches/as7/engine/src/test/java/org/teiid/query/optimizer/FakeFunctionMetadataSource.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/InlineViewCase.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestAccessPatterns.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestAggregatePushdown.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestAnsiJoinPushdown.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestBatchedUpdatePlanner.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestComparableMetadataPushdown.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestExpressionsInGroupBy.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestInlineView.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestJoinPushdownRestrictions.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestJoinWithFunction.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestLimit.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestOptimizer.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestOptionalJoins.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestPartitionedJoinPlanning.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestRuleRaiseNull.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestRuleRemoveSorts.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestSortOptimization.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestStoredProcedurePlanning.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/capabilities/ branches/as7/engine/src/test/java/org/teiid/query/optimizer/proc/ branches/as7/engine/src/test/java/org/teiid/query/optimizer/relational/ branches/as7/engine/src/test/java/org/teiid/query/optimizer/relational/TestAliasGenerator.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/relational/TestMaterialization.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/relational/TestRuleStack.java branches/as7/engine/src/test/java/org/teiid/query/optimizer/relational/plantree/ branches/as7/engine/src/test/java/org/teiid/query/optimizer/relational/rules/ branches/as7/engine/src/test/java/org/teiid/query/optimizer/xml/ branches/as7/engine/src/test/java/org/teiid/query/parser/ branches/as7/engine/src/test/java/org/teiid/query/parser/TestParser.java branches/as7/engine/src/test/java/org/teiid/query/processor/ branches/as7/engine/src/test/java/org/teiid/query/processor/FakeDataManager.java branches/as7/engine/src/test/java/org/teiid/query/processor/FakeDataStore.java branches/as7/engine/src/test/java/org/teiid/query/processor/FakeProcessorPlan.java branches/as7/engine/src/test/java/org/teiid/query/processor/FakeTupleSource.java branches/as7/engine/src/test/java/org/teiid/query/processor/HardcodedDataManager.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestArrayTable.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestBaseProcessorPlan.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestBatchIterator.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestBatchedUpdatePlan.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestCollectionTupleSource.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestJoinWithFunction.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestMaterialization.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestOptionalJoins.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestOrderByProcessing.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestProcedureRelational.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestProcessor.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestQueryProcessor.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestSecurityFunctions.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestTempTables.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestTextTable.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestVirtualDepJoin.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java branches/as7/engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java branches/as7/engine/src/test/java/org/teiid/query/processor/eval/ branches/as7/engine/src/test/java/org/teiid/query/processor/proc/ branches/as7/engine/src/test/java/org/teiid/query/processor/proc/TestProcedureProcessor.java branches/as7/engine/src/test/java/org/teiid/query/processor/relational/ branches/as7/engine/src/test/java/org/teiid/query/processor/relational/TestSortNode.java branches/as7/engine/src/test/java/org/teiid/query/processor/xml/ branches/as7/engine/src/test/java/org/teiid/query/resolver/ branches/as7/engine/src/test/java/org/teiid/query/rewriter/ branches/as7/engine/src/test/java/org/teiid/query/sql/ branches/as7/engine/src/test/java/org/teiid/query/sql/lang/ branches/as7/engine/src/test/java/org/teiid/query/sql/proc/ branches/as7/engine/src/test/java/org/teiid/query/sql/symbol/ branches/as7/engine/src/test/java/org/teiid/query/sql/util/ branches/as7/engine/src/test/java/org/teiid/query/sql/visitor/ branches/as7/engine/src/test/java/org/teiid/query/unittest/ branches/as7/engine/src/test/java/org/teiid/query/util/ branches/as7/engine/src/test/java/org/teiid/query/validator/ branches/as7/engine/src/test/java/org/teiid/vdb/ branches/as7/engine/src/test/java/org/teiid/vdb/runtime/ branches/as7/engine/src/test/resources/text/ branches/as7/engine/src/test/resources/text/TextParts_HeaderRow2.csv branches/as7/engine/src/test/resources/text/cdm_dos.txt branches/as7/engine/src/test/resources/text/cdm_dos_win.txt branches/as7/engine/src/test/resources/text/test-file.txt.csv branches/as7/hibernate-dialect/pom.xml branches/as7/hibernate-dialect/src/main/java/org/teiid/dialect/TeiidDialect.java branches/as7/jboss-integration/pom.xml branches/as7/jboss-integration/src/main/java/org/teiid/jboss/Element.java branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidAdd.java branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TeiidSubsystemParser.java branches/as7/jboss-integration/src/main/java/org/teiid/jboss/TransportAdd.java branches/as7/jboss-integration/src/main/resources/org/teiid/jboss/i18n.properties branches/as7/jboss-integration/src/main/resources/schema/jboss-teiid.xsd branches/as7/jboss-integration/src/test/resources/teiid-model-config.txt branches/as7/jboss-integration/src/test/resources/teiid-model-json.txt branches/as7/jboss-integration/src/test/resources/teiid-sample-config.xml branches/as7/metadata/pom.xml branches/as7/metadata/src/test/java/org/teiid/cdk/ branches/as7/metadata/src/test/java/org/teiid/cdk/api/ branches/as7/metadata/src/test/java/org/teiid/cdk/unittest/ branches/as7/metadata/src/test/java/org/teiid/core/ branches/as7/metadata/src/test/java/org/teiid/core/util/ branches/as7/metadata/src/test/java/org/teiid/internal/ branches/as7/metadata/src/test/java/org/teiid/internal/core/ branches/as7/metadata/src/test/java/org/teiid/internal/core/index/ branches/as7/pom.xml branches/as7/runtime/pom.xml branches/as7/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java branches/as7/runtime/src/main/java/org/teiid/services/BufferServiceImpl.java branches/as7/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java branches/as7/runtime/src/main/java/org/teiid/transport/SSLConfiguration.java branches/as7/runtime/src/main/java/org/teiid/transport/SocketClientInstance.java branches/as7/runtime/src/main/java/org/teiid/transport/pg/ branches/as7/runtime/src/main/java/org/teiid/transport/pg/PGbytea.java branches/as7/runtime/src/main/resources/org/teiid/transport/ branches/as7/runtime/src/test/java/org/teiid/deployers/TestExtendedPropertyMetadata.java branches/as7/runtime/src/test/java/org/teiid/dqp/ branches/as7/runtime/src/test/java/org/teiid/dqp/service/ branches/as7/runtime/src/test/java/org/teiid/dqp/service/buffer/ branches/as7/runtime/src/test/java/org/teiid/dqp/service/buffer/TestLocalBufferService.java branches/as7/runtime/src/test/java/org/teiid/transport/TestCommSockets.java branches/as7/test-integration/common/pom.xml branches/as7/test-integration/common/src/test/java/org/teiid/arquillian/TestDeployment.java branches/as7/test-integration/common/src/test/java/org/teiid/cdk/ branches/as7/test-integration/common/src/test/java/org/teiid/cdk/api/ branches/as7/test-integration/common/src/test/java/org/teiid/dqp/ branches/as7/test-integration/common/src/test/java/org/teiid/dqp/internal/ branches/as7/test-integration/common/src/test/java/org/teiid/dqp/internal/process/ branches/as7/test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestXMLTypeTranslations.java branches/as7/test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java branches/as7/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewReplication.java branches/as7/test-integration/common/src/test/java/org/teiid/transport/ branches/as7/test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java branches/as7/test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java branches/as7/test-integration/common/src/test/resources/TestJDBCSocketTransport/ branches/as7/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected branches/as7/test-integration/common/src/test/resources/TestODBCSocketTransport/ branches/as7/test-integration/common/src/test/resources/TestODBCSocketTransport/testColumnMetadataWithAlias.expected branches/as7/test-integration/common/src/test/resources/TestODBCSocketTransport/testPk.expected branches/as7/test-integration/common/src/test/resources/TestODBCSocketTransport/testPkPrepared.expected branches/as7/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected branches/as7/test-integration/common/src/test/resources/TestSystemVirtualModel/ branches/as7/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected branches/as7/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected branches/as7/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected branches/as7/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected branches/as7/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected branches/as7/test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected branches/as7/test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected branches/as7/test-integration/common/src/test/resources/TestSystemVirtualModel/testSchemas.expected branches/as7/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected branches/as7/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected branches/as7/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected branches/as7/test-integration/db/pom.xml branches/as7/test-integration/db/src/main/java/org/teiid/internal/ branches/as7/test-integration/db/src/main/java/org/teiid/internal/core/ branches/as7/test-integration/db/src/main/java/org/teiid/internal/core/xml/ branches/as7/test-integration/db/src/test/java/com/ branches/as7/test-integration/db/src/test/java/org/teiid/internal/ branches/as7/test-integration/db/src/test/java/org/teiid/internal/core/ branches/as7/test-integration/pom.xml Log: TEIID-1720: forward merge svn merge -r 3506:3597 Property changes on: branches/as7 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:3188-3450,3452-3506 + /branches/7.4.x:3535-3555 /trunk:3188-3450,3452-3597 Modified: branches/as7/admin/pom.xml =================================================================== --- branches/as7/admin/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/admin/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-admin</artifactId> Modified: branches/as7/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java =================================================================== --- branches/as7/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/admin/src/main/java/org/teiid/adminapi/impl/VDBMetaData.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -94,6 +94,7 @@ private VDB.Status status = VDB.Status.INACTIVE; private ConnectionType connectionType = VDB.ConnectionType.BY_VERSION; private boolean removed; + private long queryTimeout = Long.MIN_VALUE; @XmlAttribute(name = "name", required = true) public String getName() { @@ -344,4 +345,15 @@ public boolean isPreview() { return Boolean.valueOf(getPropertyValue("preview")); //$NON-NLS-1$ } + public long getQueryTimeout() { + if (queryTimeout == Long.MIN_VALUE) { + String timeout = getPropertyValue("query-timeout"); //$NON-NLS-1$ + if (timeout != null) { + queryTimeout = Math.max(0, Long.parseLong(timeout)); + } else { + queryTimeout = 0; + } + } + return queryTimeout; + } } Modified: branches/as7/admin/src/test/java/org/teiid/adminapi/impl/TestRequestMetadata.java =================================================================== --- branches/as7/admin/src/test/java/org/teiid/adminapi/impl/TestRequestMetadata.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/admin/src/test/java/org/teiid/adminapi/impl/TestRequestMetadata.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -57,76 +57,71 @@ return request; } - public static final String desc = "{\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"OBJECT\"\n" + + public static final String desc = "{\"attributes\" : {\n" + + " \"execution-id\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + + " },\n" + + " \"description\" : \"Unique Identifier for Request\",\n" + + " \"required\" : true\n" + " },\n" + - " \"attributes\" : {\n" + - " \"execution-id\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + - " },\n" + - " \"description\" : \"Unique Identifier for Request\",\n" + - " \"required\" : true\n" + + " \"session-id\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + " },\n" + - " \"session-id\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"Session Identifier\",\n" + - " \"required\" : true\n" + + " \"description\" : \"Session Identifier\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"start-time\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + " },\n" + - " \"start-time\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + - " },\n" + - " \"description\" : \"Start time for the request\",\n" + - " \"required\" : true\n" + + " \"description\" : \"Start time for the request\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"command\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + " },\n" + - " \"command\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"Executing Command\",\n" + - " \"required\" : true\n" + + " \"description\" : \"Executing Command\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"source-request\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"BOOLEAN\"\n" + " },\n" + - " \"source-request\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"BOOLEAN\"\n" + - " },\n" + - " \"description\" : \"Is this Connector level request\",\n" + - " \"required\" : true\n" + + " \"description\" : \"Is this Connector level request\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"node-id\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"INT\"\n" + " },\n" + - " \"node-id\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"INT\"\n" + - " },\n" + - " \"description\" : \"Node Identifier\",\n" + - " \"required\" : false\n" + + " \"description\" : \"Node Identifier\",\n" + + " \"required\" : false\n" + + " },\n" + + " \"transaction-id\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + " },\n" + - " \"transaction-id\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"Get Transaction XID if transaction involved\",\n" + - " \"required\" : false\n" + + " \"description\" : \"Get Transaction XID if transaction involved\",\n" + + " \"required\" : false\n" + + " },\n" + + " \"processing-state\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + " },\n" + - " \"processing-state\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"State of the Request\",\n" + - " \"required\" : true\n" + + " \"description\" : \"State of the Request\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"thread-state\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + " },\n" + - " \"thread-state\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"Thread state\",\n" + - " \"required\" : true\n" + - " }\n" + + " \"description\" : \"Thread state\",\n" + + " \"required\" : true\n" + " }\n" + - "}"; + "}}"; @Test public void testDescribe() { assertEquals(desc, VDBMetadataMapper.RequestMetadataMapper.INSTANCE.describe(new ModelNode()).toJSONString(false)); } Modified: branches/as7/admin/src/test/java/org/teiid/adminapi/impl/TestSessionMetadata.java =================================================================== --- branches/as7/admin/src/test/java/org/teiid/adminapi/impl/TestSessionMetadata.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/admin/src/test/java/org/teiid/adminapi/impl/TestSessionMetadata.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -51,83 +51,78 @@ } - private static final String describe = "{\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"OBJECT\"\n" + + private static final String describe = "{\"attributes\" : {\n" + + " \"application-name\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + + " },\n" + + " \"description\" : \"Application assosiated with Session\",\n" + + " \"required\" : false\n" + " },\n" + - " \"attributes\" : {\n" + - " \"application-name\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"Application assosiated with Session\",\n" + - " \"required\" : false\n" + + " \"created-time\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + " },\n" + - " \"created-time\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + - " },\n" + - " \"description\" : \"When session created\",\n" + - " \"required\" : true\n" + + " \"description\" : \"When session created\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"client-host-address\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + " },\n" + - " \"client-host-address\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + - " },\n" + - " \"description\" : \"Host name from where the session created\",\n" + - " \"required\" : true\n" + + " \"description\" : \"Host name from where the session created\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"ip-address\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + " },\n" + - " \"ip-address\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"IP address from where session is created\",\n" + - " \"required\" : true\n" + + " \"description\" : \"IP address from where session is created\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"last-ping-time\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + " },\n" + - " \"last-ping-time\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + - " },\n" + - " \"description\" : \"Last ping time\",\n" + - " \"required\" : true\n" + + " \"description\" : \"Last ping time\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"session-id\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + " },\n" + - " \"session-id\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"Session Identifier\",\n" + - " \"required\" : true\n" + + " \"description\" : \"Session Identifier\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"user-name\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + " },\n" + - " \"user-name\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"User name associated with session\",\n" + - " \"required\" : true\n" + + " \"description\" : \"User name associated with session\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"vdb-name\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + " },\n" + - " \"vdb-name\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"The Virtual Database Name\",\n" + - " \"required\" : true\n" + + " \"description\" : \"The Virtual Database Name\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"vdb-version\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"INT\"\n" + " },\n" + - " \"vdb-version\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"INT\"\n" + - " },\n" + - " \"description\" : \"The Virtual Database Version\",\n" + - " \"required\" : true\n" + + " \"description\" : \"The Virtual Database Version\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"security-domain\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + " },\n" + - " \"security-domain\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"Security domain that session used for login\",\n" + - " \"required\" : false\n" + - " }\n" + + " \"description\" : \"Security domain that session used for login\",\n" + + " \"required\" : false\n" + " }\n" + - "}"; + "}}"; @Test public void testDescribe() { ModelNode n = VDBMetadataMapper.SessionMetadataMapper.INSTANCE.describe(new ModelNode()); Modified: branches/as7/admin/src/test/java/org/teiid/adminapi/impl/TestTransactionMetadata.java =================================================================== --- branches/as7/admin/src/test/java/org/teiid/adminapi/impl/TestTransactionMetadata.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/admin/src/test/java/org/teiid/adminapi/impl/TestTransactionMetadata.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -48,41 +48,36 @@ assertEquals(tm.getScope(), tm1.getScope()); } - private static final String describe = "{\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"OBJECT\"\n" + + private static final String describe = "{\"attributes\" : {\n" + + " \"session-id\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + + " },\n" + + " \"description\" : \"Session Identifier\",\n" + + " \"required\" : true\n" + " },\n" + - " \"attributes\" : {\n" + - " \"session-id\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"Session Identifier\",\n" + - " \"required\" : true\n" + + " \"txn-created-time\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + " },\n" + - " \"txn-created-time\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + - " },\n" + - " \"description\" : \"Transaction created time\",\n" + - " \"required\" : true\n" + + " \"description\" : \"Transaction created time\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"txn-scope\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + " },\n" + - " \"txn-scope\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"LONG\"\n" + - " },\n" + - " \"description\" : \"Transaction scope (Request, Local, Global)\",\n" + - " \"required\" : true\n" + + " \"description\" : \"Transaction scope (Request, Local, Global)\",\n" + + " \"required\" : true\n" + + " },\n" + + " \"txn-id\" : {\n" + + " \"type\" : {\n" + + " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + " },\n" + - " \"txn-id\" : {\n" + - " \"type\" : {\n" + - " \"TYPE_MODEL_VALUE\" : \"STRING\"\n" + - " },\n" + - " \"description\" : \"Transaction Identifier (XID)\",\n" + - " \"required\" : true\n" + - " }\n" + + " \"description\" : \"Transaction Identifier (XID)\",\n" + + " \"required\" : true\n" + " }\n" + - "}"; + "}}"; @Test public void testDescribe() { ModelNode n = VDBMetadataMapper.TransactionMetadataMapper.INSTANCE.describe(new ModelNode()); Modified: branches/as7/adminshell/pom.xml =================================================================== --- branches/as7/adminshell/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/adminshell/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-adminshell</artifactId> @@ -37,13 +37,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> <version>4.4</version> - <scope>test</scope> </dependency> <dependency> <groupId>jline</groupId> Property changes on: branches/as7/adminshell/src/main/java/groovy ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/groovy:3535-3555* /trunk/adminshell/src/main/java/groovy:3507-3597 Property changes on: branches/as7/adminshell/src/main/java/groovy/sql ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/groovy/sql:3535-3555* /trunk/adminshell/src/main/java/groovy/sql:3507-3597 Property changes on: branches/as7/adminshell/src/main/java/groovy/sql/TeiidSql.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/groovy/sql/TeiidSql.java:3535-3555 /trunk/adminshell/src/main/java/groovy/sql/TeiidSql.java:3507-3597 Property changes on: branches/as7/adminshell/src/main/java/org/teiid/adminshell ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell:3535-3555* /trunk/adminshell/src/main/java/org/teiid/adminshell:3507-3597 Property changes on: branches/as7/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/AdminHelpCommand.java:3507-3597 Property changes on: branches/as7/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:2901-2940 /trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3188-3450,3452-3506 + /branches/7.1.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:2901-2940 /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/AdminShell.java:3188-3450,3452-3597 Property changes on: branches/as7/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminConsole.java:3507-3597 Property changes on: branches/as7/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/GroovyAdminShell.java:3507-3597 Property changes on: branches/as7/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/GroovySqlExtensions.java:3507-3597 Property changes on: branches/as7/adminshell/src/main/java/org/teiid/adminshell/Help.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/Help.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/Help.java:3507-3597 Property changes on: branches/as7/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/MigrationUtil.java:3507-3597 Property changes on: branches/as7/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3535-3555 /trunk/adminshell/src/main/java/org/teiid/adminshell/SqlHelpCommand.java:3507-3597 Property changes on: branches/as7/adminshell/src/main/resources/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org:3535-3555* /trunk/adminshell/src/main/resources/org:3507-3597 Property changes on: branches/as7/adminshell/src/main/resources/org/codehaus ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/codehaus:3535-3555* /trunk/adminshell/src/main/resources/org/codehaus:3507-3597 Property changes on: branches/as7/adminshell/src/main/resources/org/codehaus/groovy ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy:3535-3555* /trunk/adminshell/src/main/resources/org/codehaus/groovy:3507-3597 Property changes on: branches/as7/adminshell/src/main/resources/org/codehaus/groovy/tools ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools:3535-3555* /trunk/adminshell/src/main/resources/org/codehaus/groovy/tools:3507-3597 Property changes on: branches/as7/adminshell/src/main/resources/org/codehaus/groovy/tools/shell ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3535-3555* /trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell:3507-3597 Property changes on: branches/as7/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3535-3555 /trunk/adminshell/src/main/resources/org/codehaus/groovy/tools/shell/commands.xml:3507-3597 Property changes on: branches/as7/adminshell/src/main/resources/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/teiid:3535-3555* /trunk/adminshell/src/main/resources/org/teiid:3507-3597 Property changes on: branches/as7/adminshell/src/main/resources/org/teiid/adminshell ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell:3535-3555* /trunk/adminshell/src/main/resources/org/teiid/adminshell:3507-3597 Property changes on: branches/as7/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3535-3555 /trunk/adminshell/src/main/resources/org/teiid/adminshell/AdminHelpCommand.properties:3507-3597 Property changes on: branches/as7/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3535-3555 /trunk/adminshell/src/main/resources/org/teiid/adminshell/SqlHelpCommand.properties:3507-3597 Property changes on: branches/as7/adminshell/src/test/java/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/test/java/org:3535-3555* /trunk/adminshell/src/test/java/org:3507-3597 Property changes on: branches/as7/adminshell/src/test/java/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/test/java/org/teiid:3535-3555* /trunk/adminshell/src/test/java/org/teiid:3507-3597 Property changes on: branches/as7/adminshell/src/test/java/org/teiid/adminshell ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell:3535-3555* /trunk/adminshell/src/test/java/org/teiid/adminshell:3507-3597 Property changes on: branches/as7/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3535-3555 /trunk/adminshell/src/test/java/org/teiid/adminshell/TestAdminShell.java:3507-3597 Property changes on: branches/as7/adminshell/src/test/resources/foo ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/test/resources/foo:3535-3555* /trunk/adminshell/src/test/resources/foo:3507-3597 Property changes on: branches/as7/adminshell/src/test/resources/foo/bar.txt ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/adminshell/src/test/resources/foo/bar.txt:3535-3555 /trunk/adminshell/src/test/resources/foo/bar.txt:3507-3597 Modified: branches/as7/api/pom.xml =================================================================== --- branches/as7/api/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/api/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-api</artifactId> Property changes on: branches/as7/api/src/main/java/org/teiid/events ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/api/src/main/java/org/teiid/events:3535-3555* /trunk/api/src/main/java/org/teiid/events:3507-3597 Property changes on: branches/as7/api/src/main/java/org/teiid/events/EventDistributor.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.java:3340-3349 /trunk/api/src/main/java/org/teiid/events/EventDistributor.java:3188-3450,3452-3506 + /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributor.java:3340-3349,3535-3555 /trunk/api/src/main/java/org/teiid/events/EventDistributor.java:3188-3450,3452-3597 Property changes on: branches/as7/api/src/main/java/org/teiid/events/EventDistributorFactory.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3535-3555 /trunk/api/src/main/java/org/teiid/events/EventDistributorFactory.java:3507-3597 Modified: branches/as7/api/src/main/java/org/teiid/language/Call.java =================================================================== --- branches/as7/api/src/main/java/org/teiid/language/Call.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/api/src/main/java/org/teiid/language/Call.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -93,6 +93,9 @@ return null; } + /** + * @return the result set types or a zero length array if no result set is returned + */ public Class<?>[] getResultSetColumnTypes() { ColumnSet<Procedure> resultSet = this.metadataObject.getResultSet(); if (resultSet == null) { Modified: branches/as7/api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java =================================================================== --- branches/as7/api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -81,6 +81,7 @@ import org.teiid.language.SQLConstants.Tokens; import org.teiid.language.SortSpecification.Ordering; import org.teiid.metadata.AbstractMetadataRecord; +import org.teiid.metadata.Table; /** @@ -434,13 +435,7 @@ } public void visit(NamedTable obj) { - AbstractMetadataRecord groupID = obj.getMetadataObject(); - if(groupID != null) { - buffer.append(getName(groupID)); - } else { - buffer.append(obj.getName()); - } - + appendBaseName(obj); if (obj.getCorrelationName() != null) { buffer.append(Tokens.SPACE); if (useAsInGroupAlias()){ @@ -450,6 +445,15 @@ buffer.append(obj.getCorrelationName()); } } + + protected void appendBaseName(NamedTable obj) { + Table groupID = obj.getMetadataObject(); + if(groupID != null) { + buffer.append(getName(groupID)); + } else { + buffer.append(obj.getName()); + } + } /** * Indicates whether group alias should be of the form Property changes on: branches/as7/build/kits ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits:3535-3555* /trunk/build/kits:3507-3597 Property changes on: branches/as7/build/kits/adminshell ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/adminshell:3535-3555 /trunk/build/kits/adminshell:3507-3597 Property changes on: branches/as7/build/kits/jboss-container ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/build/kits/jboss-container:3535-3555 /trunk/build/kits/jboss-container:3507-3597 Modified: branches/as7/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml =================================================================== --- branches/as7/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -24,10 +24,10 @@ <property name="useDisk">true</property> <!-- Directory location for the buffer files --> <property name="diskDirectory">${jboss.server.temp.dir}/teiid</property> - <!-- The max row count of a batch sent internally within the query processor. Should be <= the connectorBatchSize. (default 512) --> - <property name="processorBatchSize">512</property> - <!-- The max row count of a batch from a connector. Should be even multiple of processorBatchSize. (default 1024) --> - <property name="connectorBatchSize">1024</property> + <!-- The max row count of a batch sent internally within the query processor. Should be <= the connectorBatchSize. (default 256) --> + <property name="processorBatchSize">256</property> + <!-- The max row count of a batch from a connector. Should be even multiple of processorBatchSize. (default 512) --> + <property name="connectorBatchSize">512</property> <!-- The approximate amount of buffer memory in kilobytes allowable for a single processing operation (sort, grouping, etc.) regardless of existing memory commitments. -1 means to automatically calculate a value (default -1). See the admin guide for more. @@ -48,6 +48,14 @@ However inline lob values are not supported by pre-7.6 clients, so disable this property if using older clients utilizing lobs. (default true) --> <property name="inlineLobs">true</property> + <!-- Memory buffer space used by the buffer manager in MB. -1 determines the setting automatically from the maxReserveKB (default -1). + This value cannot be smaller than maxStorageObjectSize.--> + <property name="memoryBufferSpace">-1</property> + <!-- Set to true to hold the memory buffer off-heap. If true you must ensure that the VM can allocate that much direct memory (default false). --> + <property name="memoryBufferOffHeap">false</property> + <!-- The maximum size of a buffer managed object (typically a table page or a results batch) in bytes (default 8388608 or 8MB). + Setting this value too high will reduce the effectiveness of the memory buffer.--> + <property name="maxStorageObjectSize">8388608</property> </bean> <bean name="CacheFactory" class="org.teiid.cache.jboss.ClusterableCacheFactory"> @@ -138,6 +146,8 @@ <property name="objectReplicatorName">teiid/replicator</property> <!-- Set to true for the engine to detect local change events. Should be disabled if using external change data capture tools. (default true) --> <property name="detectingChangeEvents">true</property> + <!-- Set the default query timeout for all queries in milliseconds. 0 indicates no timeout. Lesser timeout values may be set per VDB or by clients. (default 0) --> + <property name="queryTimeout">0</property> </bean> <!-- An authorization validator that by default uses data role information stored in VDBs --> @@ -229,6 +239,9 @@ <property name="truststorePassword">passwd</property> <!-- 1-way, 2-way, anonymous --> <property name="authenticationMode">anonymous</property> + <!-- uncomment for enforcing the minimum 128 bit encryption, edit or supply only supported cipher suites from JVM + <property name="enabledCipherSuites">SSL_RSA_WITH_RC4_128_MD5,SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_3DES_EDE_CBC_SHA,SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA,SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_DSS_WITH_AES_128_CBC_SHA,TLS_KRB5_WITH_RC4_128_MD5,TLS_KRB5_WITH_RC4_128_SHA,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_KRB5_WITH_3DES_EDE_CBC_MD5,TLS_KRB5_WITH_3DES_EDE_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_DSS_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA</property> + --> </bean> <!-- JDBC Socket connection properties (SSL see below) --> Modified: branches/as7/build/kits/jboss-container/teiid-releasenotes.html =================================================================== --- branches/as7/build/kits/jboss-container/teiid-releasenotes.html 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/build/kits/jboss-container/teiid-releasenotes.html 2011-11-02 15:15:47 UTC (rev 3601) @@ -30,7 +30,11 @@ <LI><B>File Enhancements</B> - the file translator can now optionally (via the ExceptionIfFileNotFound property) throw an exception if the path refers to a file that doesn't exist. The file resource adapter can be configured to map file names and can prevent parent path .. references. See the Admin Guide or the file-ds.xml template for more. <LI><B>TEXTTABLE Enhancements</B> - TEXTTABLE can now parse fixed width files that do not use a row delimiter and can optionally produce fixed values that haven't been trimmed. <LI><B>Temp table transactions</B> - Internal materialized views and temp table usage from a session and within procedures can take advantage of greater transaction support. - <LI><B>Buffering Improvements</B> - Added the ability to inline memory based or small lobs and added tracking of the memory held by soft references. + <LI><B>Buffering Improvements</B> - Added the ability to inline memory based or small lobs and added tracking of the memory held by soft references. Also switched to a concurrent LFRU algorithm that significantly reduces writes and read misses with temporary tables. Added a memory buffer to better handle file storage. + The memory buffer may be optional be configured as off-heap for better large memory performance - see the Admin Guide for more. Overhead is now tracked to help prevent memory errors when dealing with 10s of millions or more of batches/pages. Serialization and disk utilization were also improved. + <LI><B>GSSAPI</B> - both the Teiid JDBC client/server and the ODBC pg backend can now support GSSAPI for single sign-on. + <LI><B>Server-side Query Timeouts</B> - default query timeouts can be configured at both the VDB (via the query-timeout VDB property) and entire server (via the teiid-jboss-beans.xml queryTimeout property). + <LI><B>Native Queries</B> - added the ability to specify native query SQL for JDBC physical tables and stored procedures via extension metadata. </UL> <h2><a name="Compatibility">Compatibility Issues</a></h2> @@ -44,6 +48,7 @@ <ul> <li>Leave was added as a reserved word. <li>Lob inlining is incompatible with clients older than 7.6. If a 7.6 server will have older clients that use lobs connect to it, then the BufferService property inlineLobs should be set to false in the teiid-jboss-beans.xml file. + <li>Oracle translators assume they are using Oracle supplied drivers. If that is not the case, set the Oracle translator execution property oracleSuppliedDriver to false. </ul> <h4>from 7.4</h4> @@ -116,6 +121,12 @@ <h4>from 7.4</h4> <ul> + <li>The configuration for the buffer service now defaults to 256/512 for processor and connector batch sizes respectively. The buffer service also has 4 new properties inlineLobs, memoryBufferSpace, memoryBufferOffHeap, and maxStorageObjectSize. + If you were explicitly setting the value for maxReserveKb, you should consider lowering that value to account for the memory buffer and/or explicitly set the memoryBufferSpace. +</ul> + +<h4>from 7.4</h4> +<ul> <LI>The configuration for authorization has been moved off of the RuntimeEngineDeployer bean and onto separate AuthorizationValidator and PolicyDecider beans. <LI>The configuration for the buffer manager has been simplified to refer to memory sizes in KB, rather than batch columns. </ul> Modified: branches/as7/build/pom.xml =================================================================== --- branches/as7/build/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/build/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid</artifactId> Modified: branches/as7/cache-jbosscache/pom.xml =================================================================== --- branches/as7/cache-jbosscache/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/cache-jbosscache/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-cache-jbosscache</artifactId> Property changes on: branches/as7/cache-jbosscache/src/main/java/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org:3535-3555* /trunk/cache-jbosscache/src/main/java/org:3507-3597 Property changes on: branches/as7/cache-jbosscache/src/main/java/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid:3507-3597 Property changes on: branches/as7/cache-jbosscache/src/main/java/org/teiid/cache ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid/cache:3507-3597 Property changes on: branches/as7/cache-jbosscache/src/main/java/org/teiid/cache/jboss ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3535-3555 /trunk/cache-jbosscache/src/main/java/org/teiid/cache/jboss:3507-3597 Property changes on: branches/as7/cache-jbosscache/src/main/java/org/teiid/events ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/events:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid/events:3507-3597 Property changes on: branches/as7/cache-jbosscache/src/main/java/org/teiid/replication ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid/replication:3507-3597 Property changes on: branches/as7/cache-jbosscache/src/main/java/org/teiid/replication/jboss ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3535-3555* /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss:3507-3597 Property changes on: branches/as7/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3535-3555 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsInputStream.java:3507-3597 Property changes on: branches/as7/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3535-3555 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsObjectReplicator.java:3507-3597 Property changes on: branches/as7/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3535-3555 /trunk/cache-jbosscache/src/main/java/org/teiid/replication/jboss/JGroupsOutputStream.java:3507-3597 Property changes on: branches/as7/cache-jbosscache/src/test/java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/cache-jbosscache/src/test/java:3535-3555* /trunk/cache-jbosscache/src/test/java:3507-3597 Modified: branches/as7/client/pom.xml =================================================================== --- branches/as7/client/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/client/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client</artifactId> @@ -20,25 +20,5 @@ <artifactId>teiid-common-core</artifactId> <type>test-jar</type> </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-dmr</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-controller-client</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-cli</artifactId> - <scope>provided</scope> - </dependency> - <!-- - <dependency> - <groupId>org.jboss.man</groupId> - <artifactId>jboss-managed</artifactId> - </dependency> - --> </dependencies> </project> \ No newline at end of file Modified: branches/as7/client/src/main/java/org/teiid/client/BatchSerializer.java =================================================================== --- branches/as7/client/src/main/java/org/teiid/client/BatchSerializer.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/client/src/main/java/org/teiid/client/BatchSerializer.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -22,21 +22,28 @@ package org.teiid.client; +import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.io.ObjectStreamConstants; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Time; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.TimeZone; import org.teiid.core.TeiidRuntimeException; +import org.teiid.core.types.BlobType; +import org.teiid.core.types.ClobType; import org.teiid.core.types.DataTypeManager; +import org.teiid.core.types.XMLType; import org.teiid.jdbc.JDBCPlugin; @@ -45,12 +52,12 @@ * @since 4.2 */ public class BatchSerializer { - + private BatchSerializer() {} // Uninstantiable private static ColumnSerializer defaultSerializer = new ColumnSerializer(); - private static final Map<String, ColumnSerializer> serializers = new HashMap<String, ColumnSerializer>(); + private static final Map<String, ColumnSerializer> serializers = new HashMap<String, ColumnSerializer>(128); static { serializers.put(DataTypeManager.DefaultDataTypes.BIG_DECIMAL, new BigDecimalColumnSerializer()); serializers.put(DataTypeManager.DefaultDataTypes.BIG_INTEGER, new BigIntegerColumnSerializer()); @@ -67,6 +74,130 @@ serializers.put(DataTypeManager.DefaultDataTypes.TIMESTAMP, new TimestampColumnSerializer()); } + private static final Map<String, ColumnSerializer> version1serializers = new HashMap<String, ColumnSerializer>(128); + static { + version1serializers.put(DataTypeManager.DefaultDataTypes.DATE, new DateColumnSerializer1()); + version1serializers.put(DataTypeManager.DefaultDataTypes.TIME, new TimeColumnSerializer1()); + version1serializers.put(DataTypeManager.DefaultDataTypes.STRING, new StringColumnSerializer1()); + version1serializers.put(DataTypeManager.DefaultDataTypes.CLOB, new ClobColumnSerializer1()); + version1serializers.put(DataTypeManager.DefaultDataTypes.BLOB, new BlobColumnSerializer1()); + version1serializers.put(DataTypeManager.DefaultDataTypes.XML, new XmlColumnSerializer1()); + version1serializers.put(DataTypeManager.DefaultDataTypes.NULL, new NullColumnSerializer1()); + version1serializers.put(DataTypeManager.DefaultDataTypes.OBJECT, new ObjectColumnSerializer1()); + } + + public static final class ObjectColumnSerializer1 extends ColumnSerializer { + + @Override + protected void writeObject(ObjectOutput out, Object obj) + throws IOException { + int code = DataTypeManager.getTypeCode(obj.getClass()); + out.writeByte((byte)code); + if (code == DataTypeManager.DefaultTypeCodes.BOOLEAN) { + if (Boolean.TRUE.equals(obj)) { + out.write((byte)1); + } else { + out.write((byte)0); + } + } else if (code != DataTypeManager.DefaultTypeCodes.OBJECT) { + ColumnSerializer s = getSerializer(DataTypeManager.getDataTypeName(obj.getClass()), (byte)1); + s.writeObject(out, obj); + } else { + super.writeObject(out, obj); + } + } + + @Override + protected Object readObject(ObjectInput in) throws IOException, + ClassNotFoundException { + int code = in.readByte(); + if (code == DataTypeManager.DefaultTypeCodes.BOOLEAN) { + if (in.readByte() == (byte)0) { + return Boolean.FALSE; + } + return Boolean.TRUE; + } + if (code != DataTypeManager.DefaultTypeCodes.OBJECT) { + ColumnSerializer s = getSerializer(DataTypeManager.getDataTypeName(DataTypeManager.getClass(code)), (byte)1); + return s.readObject(in); + } + return super.readObject(in); + } + + } + + private static final int MAX_UTF = 0xFFFF/3; //this is greater than the expected max length of Teiid Strings + + private static class StringColumnSerializer1 extends ColumnSerializer { + @Override + protected void writeObject(ObjectOutput out, Object obj) throws IOException { + String str = (String)obj; + if (str.length() <= MAX_UTF) { + //skip object serialization if we have a short string + out.writeByte(ObjectStreamConstants.TC_STRING); + out.writeUTF(str); + } else { + out.writeByte(ObjectStreamConstants.TC_LONGSTRING); + out.writeObject(obj); + } + } + + @Override + protected Object readObject(ObjectInput in) throws IOException, + ClassNotFoundException { + if (in.readByte() == ObjectStreamConstants.TC_STRING) { + return in.readUTF(); + } + return super.readObject(in); + } + } + + private static class NullColumnSerializer1 extends ColumnSerializer { + @Override + public void writeColumn(ObjectOutput out, int col, + List<? extends List<?>> batch) throws IOException { + } + + @Override + public void readColumn(ObjectInput in, int col, + List<List<Object>> batch, byte[] isNull) throws IOException, + ClassNotFoundException { + } + } + + private static class ClobColumnSerializer1 extends ColumnSerializer { + protected void writeObject(ObjectOutput out, Object obj) throws IOException { + ((Externalizable)obj).writeExternal(out); + } + protected Object readObject(ObjectInput in) throws IOException, ClassNotFoundException { + ClobType ct = new ClobType(); + ct.readExternal(in); + return ct; + } + } + + private static class BlobColumnSerializer1 extends ColumnSerializer { + protected void writeObject(ObjectOutput out, Object obj) throws IOException { + ((Externalizable)obj).writeExternal(out); + } + protected Object readObject(ObjectInput in) throws IOException, ClassNotFoundException { + BlobType bt = new BlobType(); + bt.readExternal(in); + return bt; + } + } + + private static class XmlColumnSerializer1 extends ColumnSerializer { + protected void writeObject(ObjectOutput out, Object obj) throws IOException { + ((Externalizable)obj).writeExternal(out); + } + protected Object readObject(ObjectInput in) throws IOException, ClassNotFoundException { + XMLType xt = new XMLType(); + xt.readExternal(in); + return xt; + } + } + /** * Packs the (boolean) information about whether data values in the column are null * into bytes so that we send ~n/8 instead of n bytes. @@ -338,6 +469,34 @@ } } + static int DATE_NORMALIZER = 0; + + static { + Calendar c = Calendar.getInstance(); + c.setTimeZone(TimeZone.getTimeZone("GMT")); //$NON-NLS-1$ + c.set(1900, 0, 1, 0, 0, 0); + c.set(Calendar.MILLISECOND, 0); + DATE_NORMALIZER = -(int)(c.getTime().getTime()/60000); //support a 32 bit range starting at this value + } + + private static class DateColumnSerializer1 extends ColumnSerializer { + protected void writeObject(ObjectOutput out, Object obj) throws IOException { + out.writeInt((int)(((java.sql.Date)obj).getTime()/60000) + DATE_NORMALIZER); + } + protected Object readObject(ObjectInput in) throws IOException { + return new java.sql.Date(((in.readInt()&0xffffffffL) - DATE_NORMALIZER)*60000); + } + } + + private static class TimeColumnSerializer1 extends ColumnSerializer { + protected void writeObject(ObjectOutput out, Object obj) throws IOException { + out.writeInt((int)(((Time)obj).getTime()/1000)); + } + protected Object readObject(ObjectInput in) throws IOException { + return new Time((in.readInt()&0xffffffffL)*1000); + } + } + private static class TimestampColumnSerializer extends ColumnSerializer { protected void writeObject(ObjectOutput out, Object obj) throws IOException { Timestamp ts = (Timestamp)obj; @@ -351,15 +510,25 @@ } } - private static ColumnSerializer getSerializer(String type) { - ColumnSerializer cs = serializers.get((type == null) ? DataTypeManager.DefaultDataTypes.OBJECT : type); + private static ColumnSerializer getSerializer(String type, byte version) { + ColumnSerializer cs = null; + if (version == 1) { + cs = version1serializers.get((type == null) ? DataTypeManager.DefaultDataTypes.OBJECT : type); + } + if (cs == null) { + cs = serializers.get((type == null) ? DataTypeManager.DefaultDataTypes.OBJECT : type); + } if (cs == null) { return defaultSerializer; } return cs; } + + public static void writeBatch(ObjectOutput out, String[] types, List<? extends List<?>> batch) throws IOException { + writeBatch(out, types, batch, (byte)1); + } - public static void writeBatch(ObjectOutput out, String[] types, List<? extends List<?>> batch) throws IOException { + public static void writeBatch(ObjectOutput out, String[] types, List<? extends List<?>> batch, byte version) throws IOException { if (batch == null) { out.writeInt(-1); } else { @@ -368,7 +537,7 @@ int columns = types.length; out.writeInt(columns); for(int i = 0; i < columns; i++) { - ColumnSerializer serializer = getSerializer(types[i]); + ColumnSerializer serializer = getSerializer(types[i], version); try { serializer.writeColumn(out, i, batch); } catch (ClassCastException e) { @@ -389,12 +558,16 @@ } public static List<List<Object>> readBatch(ObjectInput in, String[] types) throws IOException, ClassNotFoundException { + return readBatch(in, types, (byte)1); + } + + public static List<List<Object>> readBatch(ObjectInput in, String[] types, byte version) throws IOException, ClassNotFoundException { int rows = in.readInt(); if (rows == 0) { return new ArrayList<List<Object>>(0); } else if (rows > 0) { int columns = in.readInt(); - List<List<Object>> batch = new ArrayList<List<Object>>(rows); + List<List<Object>> batch = new ResizingArrayList<List<Object>>(rows); int numBytes = rows/8; int extraRows = rows % 8; for (int currentRow = 0; currentRow < rows; currentRow++) { @@ -402,7 +575,7 @@ } byte[] isNullBuffer = new byte[(extraRows > 0) ? numBytes + 1: numBytes]; for (int col = 0; col < columns; col++) { - getSerializer(types[col]).readColumn(in, col, batch, isNullBuffer); + getSerializer(types[col], version).readColumn(in, col, batch, isNullBuffer); } return batch; } Copied: branches/as7/client/src/main/java/org/teiid/client/ResizingArrayList.java (from rev 3597, trunk/client/src/main/java/org/teiid/client/ResizingArrayList.java) =================================================================== --- branches/as7/client/src/main/java/org/teiid/client/ResizingArrayList.java (rev 0) +++ branches/as7/client/src/main/java/org/teiid/client/ResizingArrayList.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,176 @@ +/* + * 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.client; + +import java.util.AbstractList; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.RandomAccess; + +/** + * Modified {@link ArrayList} that resizes up and down by powers of 2. + * + * @param <T> + */ +@SuppressWarnings("unchecked") +public class ResizingArrayList<T> extends AbstractList<T> implements RandomAccess { + + public static final int MIN_SHRINK_SIZE = 32; + + protected Object[] elementData; + protected int size; + + public ResizingArrayList() { + this(MIN_SHRINK_SIZE); + } + + public ResizingArrayList(int initialCapacity) { + this.elementData = new Object[initialCapacity]; + } + + public ResizingArrayList(Collection<? extends T> c) { + elementData = c.toArray(); + size = elementData.length; + // c.toArray might (incorrectly) not return Object[] (see 6260652) + if (elementData.getClass() != Object[].class) + elementData = Arrays.copyOf(elementData, size, Object[].class); + } + + @Override + public T get(int index) { + rangeCheck(index, false); + return (T) elementData[index]; + } + + public int getModCount() { + return modCount; + } + + public void add(int index, T element) { + rangeCheck(index, true); + modCount++; + ensureCapacity(size+1); + System.arraycopy(elementData, index, elementData, index + 1, + size - index); + elementData[index] = element; + size++; + } + + protected void ensureCapacity(int capacity) { + if (capacity <= elementData.length) { + return; + } + int newCapacity = 1 << (32 - Integer.numberOfLeadingZeros(capacity - 1)); + int lowerCapacity = newCapacity*70/99; //SQRT(2) + if (lowerCapacity > capacity) { + newCapacity = lowerCapacity; + } + elementData = Arrays.copyOf(elementData, newCapacity); + } + + public T set(int index, T element) { + rangeCheck(index, false); + T old = (T) elementData[index]; + elementData[index] = element; + return old; + } + + @Override + public boolean addAll(Collection<? extends T> c) { + return addAll(size, c); + } + + @Override + public boolean addAll(int index, Collection<? extends T> c) { + rangeCheck(index, true); + modCount++; + int numNew = c.size(); + ensureCapacity(size + numNew); + for (T t : c) { + elementData[index++] = t; + } + size += numNew; + return numNew != 0; + } + + @Override + public T remove(int index) { + T oldValue = get(index); + modCount++; + int numMoved = size - index - 1; + if (numMoved > 0) { + System.arraycopy(elementData, index+1, elementData, index, numMoved); + } + elementData[--size] = null; + int halfLength = elementData.length/2; + if (size <= halfLength && elementData.length > MIN_SHRINK_SIZE) { + int newSize = Math.max(halfLength*99/70, MIN_SHRINK_SIZE); + Object[] next = new Object[newSize]; + System.arraycopy(elementData, 0, next, 0, size); + elementData = next; + } + return oldValue; + } + + private void rangeCheck(int index, boolean inclusive) { + if (index > size || (!inclusive && index == size)) { + throw new IndexOutOfBoundsException("Index: "+index+", Size: "+size); //$NON-NLS-1$ //$NON-NLS-2$ + } + } + + @Override + public void clear() { + modCount++; + if (size <= MIN_SHRINK_SIZE) { + for (int i = 0; i < size; i++) { + elementData[i] = null; + } + } else { + elementData = new Object[MIN_SHRINK_SIZE]; + } + size = 0; + } + + @Override + public Object[] toArray() { + return Arrays.copyOf(elementData, size); + } + + public <U extends Object> U[] toArray(U[] a) { + if (a.length < size) { + return (U[]) Arrays.copyOf(elementData, size, a.getClass()); + } + System.arraycopy(elementData, 0, a, 0, size); + if (a.length > size) { + a[size] = null; + } + return a; + } + + @Override + public int size() { + return size; + } + +} Modified: branches/as7/client/src/main/java/org/teiid/client/ResultsMessage.java =================================================================== --- branches/as7/client/src/main/java/org/teiid/client/ResultsMessage.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/client/src/main/java/org/teiid/client/ResultsMessage.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -72,6 +72,8 @@ /** OPTION DEBUG log if OPTION DEBUG was used */ private String debugLog; + + private byte clientSerializationVersion; /** * Query plan annotations, if OPTION SHOWPLAN or OPTION PLANONLY was used: @@ -240,7 +242,7 @@ dataTypes = ExternalizeUtil.readStringArray(in); // Row data - results = BatchSerializer.readBatch(in, dataTypes); + results = BatchSerializer.readBatch(in, dataTypes, (byte)0); // Plan Descriptions planDescription = (PlanNode)in.readObject(); @@ -272,7 +274,7 @@ ExternalizeUtil.writeArray(out, dataTypes); // Results data - BatchSerializer.writeBatch(out, dataTypes, results); + BatchSerializer.writeBatch(out, dataTypes, results, (byte)0); // Plan descriptions out.writeObject(this.planDescription); @@ -347,5 +349,13 @@ public boolean isUpdateResult() { return isUpdateResult; } + + public byte getClientSerializationVersion() { + return clientSerializationVersion; + } + + public void setClientSerializationVersion(byte clientSerializationVersion) { + this.clientSerializationVersion = clientSerializationVersion; + } } Property changes on: branches/as7/client/src/main/java/org/teiid/client/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/client/util:3535-3555* /trunk/client/src/main/java/org/teiid/client/util:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/client/util/ExceptionHolder.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3535-3555 /trunk/client/src/main/java/org/teiid/client/util/ExceptionHolder.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/client/util/ExceptionUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3535-3555 /trunk/client/src/main/java/org/teiid/client/util/ExceptionUtil.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/client/util/ResultsFuture.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3535-3555 /trunk/client/src/main/java/org/teiid/client/util/ResultsFuture.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/client/util/ResultsReceiver.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3535-3555 /trunk/client/src/main/java/org/teiid/client/util/ResultsReceiver.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc:3535-3555* /trunk/client/src/main/java/org/teiid/jdbc:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/BaseDataSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/BaseDataSource.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/BatchResults.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/BatchResults.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/BatchResults.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/CallableStatementImpl.java:3507-3597 Deleted: branches/as7/client/src/main/java/org/teiid/jdbc/CancellationTimer.java =================================================================== --- branches/as7/client/src/main/java/org/teiid/jdbc/CancellationTimer.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/client/src/main/java/org/teiid/jdbc/CancellationTimer.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -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 org.teiid.jdbc; - -import java.util.TreeSet; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.logging.Level; -import java.util.logging.Logger; - - -/** - * Specialized timer that actively purges tasks in lg(n) time - */ -public class CancellationTimer { - private static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$ - private static AtomicInteger id = new AtomicInteger(); - - static abstract class CancelTask implements Runnable, Comparable<CancelTask> { - long endTime; - int seqId = id.get(); - - public CancelTask(long delay) { - this.endTime = System.currentTimeMillis() + delay; - } - - @Override - public int compareTo(CancelTask o) { - int result = Long.signum(this.endTime = o.endTime); - if (result == 0) { - return seqId = o.seqId; - } - return result; - } - @Override - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof CancelTask)) { - return false; - } - return this.compareTo((CancelTask)obj) == 0; - } - } - - private TreeSet<CancelTask> cancelQueue = new TreeSet<CancelTask>(); - private Thread thread; - - public CancellationTimer(String name) { - thread = new Thread(new Runnable() { - - @Override - public void run() { - while (true) { - try { - doCancellations(); - } catch (InterruptedException e) { - break; - } - } - } - }, name); - thread.setDaemon(true); - thread.start(); - } - - private void doCancellations() throws InterruptedException { - CancelTask task = null; - synchronized (this) { - if (cancelQueue.isEmpty()) { - this.wait(); - return; - } - task = cancelQueue.first(); - long toWait = task.endTime - System.currentTimeMillis(); - if (toWait > 0) { - this.wait(toWait); - return; - } - cancelQueue.pollFirst(); - } - try { - task.run(); - } catch (Throwable t) { - logger.log(Level.SEVERE, "Unexpected exception running task", t); //$NON-NLS-1$ - } - } - - public void add(CancelTask task) { - synchronized (this) { - this.cancelQueue.add(task); - this.notifyAll(); - } - } - - public void remove(CancelTask task) { - synchronized (this) { - this.cancelQueue.remove(task); - this.notifyAll(); - } - } - -} Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3149-3217 /trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3149-3217,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ConnectionImpl.java:3188-3450,3452-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/ConnectionListener.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ConnectionListener.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ConnectionProfile.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/DataTypeTransformer.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3281-3325 /trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3281-3325,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/DatabaseMetaDataImpl.java:3188-3450,3452-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/DeferredMetadataProvider.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217 /trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3149-3217,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/EmbeddedProfile.java:3188-3450,3452-3597 Copied: branches/as7/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java (from rev 3597, trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java) =================================================================== --- branches/as7/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java (rev 0) +++ branches/as7/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,180 @@ +/* + * 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.jdbc; + +import java.util.NoSuchElementException; +import java.util.concurrent.ConcurrentSkipListSet; +import java.util.concurrent.Executor; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.teiid.core.util.ExecutorUtils; + +/** + * Specialized timer that can purge tasks in lg(n) time + * Uses lock escalation to minimize contention for adding/removing tasks. + * Will only hold a thread while there are pending tasks. + */ +public class EnhancedTimer { + + private static final Logger LOGGER = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$ + private static AtomicLong id = new AtomicLong(); + + public class Task implements Comparable<Task>, Runnable { + final long endTime; + final long seqId = id.getAndIncrement(); + final Runnable task; + + public Task(Runnable task, long delay) { + this.endTime = System.currentTimeMillis() + delay; + this.task = task; + } + + @Override + public void run() { + this.task.run(); + } + + @Override + public int compareTo(Task o) { + int result = Long.signum(this.endTime - o.endTime); + if (result == 0) { + return Long.signum(seqId - o.seqId); + } + return result; + } + + public boolean cancel() { + lock.readLock().lock(); + try { + return queue.remove(this); + } finally { + lock.readLock().unlock(); + } + } + } + + private final ConcurrentSkipListSet<Task> queue = new ConcurrentSkipListSet<Task>(); + private final Executor taskExecutor; + private final Executor bossExecutor; + private boolean running; + private ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); + + /** + * Constructs a new Timer that directly executes tasks off of a single-thread thread pool. + * @param name + */ + public EnhancedTimer(final String name) { + this.taskExecutor = ExecutorUtils.getDirectExecutor(); + this.bossExecutor = ExecutorUtils.newFixedThreadPool(1, name); + } + + public EnhancedTimer(Executor bossExecutor, Executor taskExecutor) { + this.taskExecutor = taskExecutor; + this.bossExecutor = bossExecutor; + } + + private void start() { + bossExecutor.execute(new Runnable() { + + @Override + public void run() { + try { + while (doCancellations()) { + } + } catch (InterruptedException e) { + } + } + }); + running = true; + } + + private boolean doCancellations() throws InterruptedException { + Task task = null; + lock.writeLock().lock(); + try { + if (queue.isEmpty()) { + synchronized (this) { + lock.writeLock().unlock(); + running = false; + return false; + } + } + task = queue.first(); + long toWait = task.endTime - System.currentTimeMillis(); + if (toWait > 0) { + synchronized (this) { + lock.writeLock().unlock(); + this.wait(toWait); + return true; //try again (guards against spurious wake-ups) + } + } + queue.pollFirst(); + } finally { + if (lock.writeLock().isHeldByCurrentThread()) { + lock.writeLock().unlock(); + } + } + try { + taskExecutor.execute(task); + } catch (Throwable t) { + LOGGER.log(Level.SEVERE, "Unexpected exception running task", t); //$NON-NLS-1$ + } + return true; + } + + /** + * Add a delayed task + * @param task + * @param delay in ms + * @return a cancellable Task + */ + public Task add(Runnable task, long delay) { + Task result = new Task(task, delay); + lock.readLock().lock(); + try { + if (this.queue.add(result) + && this.queue.first() == result) { + //only need to synchronize when this is the first task + synchronized (this) { + if (!running) { + start(); + } + this.notifyAll(); + } + } + } catch (NoSuchElementException e) { + //shouldn't happen + } finally { + lock.readLock().unlock(); + } + return result; + } + + public int getQueueSize() { + return queue.size(); + } + +} Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/EnhancedTimer.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ExecutionProperties.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/FilteredResultsMetadata.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnNames.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/JDBCColumnPositions.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/JDBCPlugin.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/JDBCURL.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-3217,3281-3325 /trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3149-3217,3281-3325,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/JDBCURL.java:3188-3450,3452-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/MetadataProvider.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/MetadataProvider.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ParameterMetaDataImpl.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/PartialResultsWarning.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ResultSetImpl.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3281-3325 /trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3281-3325,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/ResultSetMetaDataImpl.java:3188-3450,3452-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/SQLStates.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3220-3275 /trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SQLStates.java:3220-3275,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/SQLStates.java:3188-3450,3452-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/SocketProfile.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/SocketProfile.java:3507-3597 Modified: branches/as7/client/src/main/java/org/teiid/jdbc/StatementImpl.java =================================================================== --- branches/as7/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/client/src/main/java/org/teiid/jdbc/StatementImpl.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -63,19 +63,18 @@ import org.teiid.core.types.SQLXMLImpl; import org.teiid.core.util.SqlUtil; import org.teiid.core.util.StringUtil; -import org.teiid.jdbc.CancellationTimer.CancelTask; +import org.teiid.jdbc.EnhancedTimer.Task; import org.teiid.net.TeiidURL; public class StatementImpl extends WrapperImpl implements TeiidStatement { private static Logger logger = Logger.getLogger("org.teiid.jdbc"); //$NON-NLS-1$ - static CancellationTimer cancellationTimer = new CancellationTimer("Teiid Statement Timeout"); //$NON-NLS-1$ + static EnhancedTimer cancellationTimer = new EnhancedTimer("Teiid Statement Timeout"); //$NON-NLS-1$ - private static final class QueryTimeoutCancelTask extends CancelTask { + private static final class QueryTimeoutCancelTask implements Runnable { private WeakReference<StatementImpl> ref; - private QueryTimeoutCancelTask(long delay, StatementImpl stmt) { - super(delay); + private QueryTimeoutCancelTask(StatementImpl stmt) { this.ref = new WeakReference<StatementImpl>(stmt); } @@ -98,6 +97,8 @@ // integer indicating no maximum limit - used in some metadata-ish methods. private static final int NO_LIMIT = 0; + + private QueryTimeoutCancelTask cancelTask = new QueryTimeoutCancelTask(this); //######## Configuration state ############# private ConnectionImpl driverConnection; @@ -571,12 +572,11 @@ ResultsFuture.CompletionListener<ResultsMessage> compeletionListener = null; if (queryTimeoutMS > 0) { - final CancelTask c = new QueryTimeoutCancelTask(queryTimeoutMS, this); - cancellationTimer.add(c); + final Task c = cancellationTimer.add(cancelTask, queryTimeoutMS); compeletionListener = new ResultsFuture.CompletionListener<ResultsMessage>() { @Override public void onCompletion(ResultsFuture<ResultsMessage> future) { - cancellationTimer.remove(c); + c.cancel(); } }; } Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/StatementImpl.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3149-3217,3220-3275,3281-3325,3355-3365 /trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3149-3217,3220-3275,3281-3325,3355-3365,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/StatementImpl.java:3188-3450,3452-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/TeiidConnection.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/TeiidConnection.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/TeiidDataSource.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/TeiidDriver.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/TeiidDriver.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3220-3275 /trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3220-3275,3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/TeiidSQLException.java:3188-3450,3452-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/TeiidStatement.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/TeiidStatement.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/WarningUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/WarningUtil.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/WrapperImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/WrapperImpl.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/jdbc/XAResourceImpl.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket:3535-3555* /trunk/client/src/main/java/org/teiid/net/socket:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/Handshake.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Handshake.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/Handshake.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/Message.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/Message.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/Message.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/ObjectChannel.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/ObjectChannel.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/ObjectChannelFactory.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/OioOjbectChannelFactory.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/ServerDiscovery.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/ServiceInvocationStruct.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SingleInstanceCommunicationException.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnection.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3149-3217 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3149-3217,3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerConnectionFactory.java:3188-3450,3452-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstance.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceFactory.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/SocketUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/SocketUtil.java:3507-3597 Property changes on: branches/as7/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3535-3555 /trunk/client/src/main/java/org/teiid/net/socket/UrlServerDiscovery.java:3507-3597 Property changes on: branches/as7/client/src/main/resources/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/resources/org:3535-3555* /trunk/client/src/main/resources/org:3507-3597 Property changes on: branches/as7/client/src/main/resources/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/resources/org/teiid:3535-3555* /trunk/client/src/main/resources/org/teiid:3507-3597 Property changes on: branches/as7/client/src/main/resources/org/teiid/jdbc ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/resources/org/teiid/jdbc:3535-3555 /trunk/client/src/main/resources/org/teiid/jdbc:3507-3597 Property changes on: branches/as7/client/src/main/resources/org/teiid/net ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/main/resources/org/teiid/net:3535-3555* /trunk/client/src/main/resources/org/teiid/net:3507-3597 Modified: branches/as7/client/src/test/java/org/teiid/client/TestBatchSerializer.java =================================================================== --- branches/as7/client/src/test/java/org/teiid/client/TestBatchSerializer.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/client/src/test/java/org/teiid/client/TestBatchSerializer.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -29,15 +29,13 @@ import java.io.ObjectOutputStream; import java.math.BigDecimal; import java.math.BigInteger; -import java.sql.Date; -import java.sql.Time; -import java.sql.Timestamp; import java.util.Arrays; import java.util.List; import junit.framework.TestCase; import org.teiid.core.types.DataTypeManager; +import org.teiid.core.util.TimestampWithTimezone; @@ -47,22 +45,6 @@ */ public class TestBatchSerializer extends TestCase { - private static void assertEqual(List[] expectedBatch, List[] batch) { - if (expectedBatch == null) { - assertNull(batch); - return; - } - assertEquals(expectedBatch.length, batch.length); - if (expectedBatch.length > 0) { - int columns = expectedBatch[0].size(); - for (int row = 0; row < expectedBatch.length; row++) { - for (int col = 0; col < columns; col++) { - assertEquals(expectedBatch[row].get(col), batch[row].get(col)); - } - } - } - } - private static void helpTestSerialization(String[] types, List<?>[] batch) throws IOException, ClassNotFoundException { ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); ObjectOutputStream out = new ObjectOutputStream(byteStream); @@ -94,7 +76,8 @@ DataTypeManager.DefaultDataTypes.SHORT, DataTypeManager.DefaultDataTypes.STRING, DataTypeManager.DefaultDataTypes.TIME, - DataTypeManager.DefaultDataTypes.TIMESTAMP + DataTypeManager.DefaultDataTypes.TIMESTAMP, + DataTypeManager.DefaultDataTypes.OBJECT, }; private static String sampleString(int length) { char[] chars = new char[length]; @@ -104,51 +87,27 @@ return new String(chars); } - private static List[] sampleBatch(int rows) { - List[] batch = new List[rows]; + private static List<?>[] sampleBatchWithNulls(int rows) { + List<?>[] batch = new List[rows]; for (int i = 0; i < rows; i++) { - long currentTime = System.currentTimeMillis(); - Object[] data = { new BigDecimal("" + i), //$NON-NLS-1$ - new BigInteger(Integer.toString(i)), - (i%2 == 0) ? Boolean.FALSE: Boolean.TRUE, - new Byte((byte)i), - new Character((char)i), - new Date(currentTime), - new Double(i), - new Float(i), - new Integer(i), - new Long(i), - new Short((short)i), - sampleString(i), - new Time(currentTime), - new Timestamp(currentTime) - }; - batch[i] = Arrays.asList(data); - } - return batch; - } - - private static List[] sampleBatchWithNulls(int rows) { - List[] batch = new List[rows]; - - for (int i = 0; i < rows; i++) { - long currentTime = System.currentTimeMillis(); + java.util.Date d = new java.util.Date(); int mod = i%14; Object[] data = { (mod == 0) ? null : new BigDecimal("" + i), //$NON-NLS-1$ (mod == 1) ? null : new BigInteger(Integer.toString(i)), (mod == 2) ? null : ((i%2 == 0) ? Boolean.FALSE: Boolean.TRUE), (mod == 3) ? null : new Byte((byte)i), (mod == 4) ? null : new Character((char)i), - (mod == 5) ? null : new Date(currentTime), + (mod == 5) ? null : TimestampWithTimezone.createDate(d), (mod == 6) ? null : new Double(i), (mod == 7) ? null : new Float(i), (mod == 8) ? null : new Integer(i), (mod == 9) ? null : new Long(i), (mod == 10) ? null : new Short((short)i), (mod == 11) ? null : sampleString(i), - (mod == 12) ? null : new Time(currentTime), - (mod == 13) ? null : new Timestamp(currentTime) + (mod == 12) ? null : TimestampWithTimezone.createTime(d), + (mod == 13) ? null : TimestampWithTimezone.createTimestamp(d), + (mod == 14) ? null : TimestampWithTimezone.createTimestamp(d), }; batch[i] = Arrays.asList(data); } @@ -158,23 +117,16 @@ public void testSerializeBasicTypes() throws Exception { // The number 8 is important here because boolean isNull information is packed into bytes, // so we want to make sure the boundary cases are handled correctly - helpTestSerialization(sampleBatchTypes, sampleBatch(1)); // Less than 8 rows - helpTestSerialization(sampleBatchTypes, sampleBatch(8)); // Exactly 8 rows - helpTestSerialization(sampleBatchTypes, sampleBatch(17)); // More than 8 rows, but not a multiple of 8 - helpTestSerialization(sampleBatchTypes, sampleBatch(120)); // A multiple of 8 rows - helpTestSerialization(sampleBatchTypes, sampleBatch(833)); // A bunch of rows. This should also test large strings + helpTestSerialization(sampleBatchTypes, sampleBatchWithNulls(1)); // Less than 8 rows + helpTestSerialization(sampleBatchTypes, sampleBatchWithNulls(8)); // Exactly 8 rows + helpTestSerialization(sampleBatchTypes, sampleBatchWithNulls(17)); // More than 8 rows, but not a multiple of 8 + helpTestSerialization(sampleBatchTypes, sampleBatchWithNulls(120)); // A multiple of 8 rows + helpTestSerialization(sampleBatchTypes, sampleBatchWithNulls(833)); // A bunch of rows. This should also test large strings + helpTestSerialization(sampleBatchTypes, sampleBatchWithNulls(4096)); // A bunch of rows. This should also test large strings } - public void testSerializeBasicTypesWithNulls() throws Exception { - helpTestSerialization(sampleBatchTypes, sampleBatchWithNulls(1)); - helpTestSerialization(sampleBatchTypes, sampleBatchWithNulls(8)); - helpTestSerialization(sampleBatchTypes, sampleBatchWithNulls(17)); - helpTestSerialization(sampleBatchTypes, sampleBatchWithNulls(120)); - helpTestSerialization(sampleBatchTypes, sampleBatchWithNulls(833)); - } - public void testSerializeLargeStrings() throws Exception { - List row = Arrays.asList(new Object[] {sampleString(66666)}); + List<?> row = Arrays.asList(new Object[] {sampleString(66666)}); helpTestSerialization(new String[] {DataTypeManager.DefaultDataTypes.STRING}, new List[] {row}); } Property changes on: branches/as7/client/src/test/java/org/teiid/client/plan ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/client/plan:3535-3555* /trunk/client/src/test/java/org/teiid/client/plan:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/client/plan/TestPlanNode.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3535-3555 /trunk/client/src/test/java/org/teiid/client/plan/TestPlanNode.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/client/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/client/util:3535-3555* /trunk/client/src/test/java/org/teiid/client/util:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3535-3555 /trunk/client/src/test/java/org/teiid/client/util/TestExceptionHolder.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/client/util/TestResultsFuture.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3535-3555 /trunk/client/src/test/java/org/teiid/client/util/TestResultsFuture.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc:3535-3555* /trunk/client/src/test/java/org/teiid/jdbc:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestAllResultsImpl.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestBatchResults.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestBatchResults.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestCallableStatement.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestConnection.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3281-3325 /trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestConnection.java:3281-3325,3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestConnection.java:3188-3450,3452-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestDataTypeTransformer.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestEmbeddedProfile.java:3507-3597 Copied: branches/as7/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java (from rev 3597, trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java) =================================================================== --- branches/as7/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java (rev 0) +++ branches/as7/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,53 @@ +/* + * 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.jdbc; + +import static org.junit.Assert.*; + +import org.junit.Test; +import org.teiid.jdbc.EnhancedTimer.Task; + +@SuppressWarnings("nls") +public class TestEnhancedTimer { + + private final class SimpleCancelTask implements Runnable { + @Override + public void run() { + } + } + + @Test public void testRemove() { + EnhancedTimer ct = new EnhancedTimer("foo"); + SimpleCancelTask sct = new SimpleCancelTask(); + Task tt = ct.add(sct, 20000); + Task tt1 = ct.add(sct, 20000); + assertTrue(tt.compareTo(tt1) < 0); + Task tt2 = ct.add(sct, 10000); + assertEquals(3, ct.getQueueSize()); + tt.cancel(); + tt1.cancel(); + tt2.cancel(); + assertEquals(0, ct.getQueueSize()); + } + +} Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestEnhancedTimer.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestJDBCURL.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestPreparedStatement.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestResultSet.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestResultSet.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestSQLException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3220-3275 /trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3220-3275,3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestSQLException.java:3188-3450,3452-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestSocketProfile.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestStatement.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3149-3217,3220-3275 /trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestStatement.java:3149-3217,3220-3275,3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestStatement.java:3188-3450,3452-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3149-3217,3281-3325 /trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3188-3450,3452-3506 + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3149-3217,3281-3325,3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestTeiidDriver.java:3188-3450,3452-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestWrapperImpl.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/TestXAConnection.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/TestXAConnection.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/jdbc/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/jdbc/util:3535-3555 /trunk/client/src/test/java/org/teiid/jdbc/util:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/net ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/net:3535-3555* /trunk/client/src/test/java/org/teiid/net:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/net/TestTeiidURL.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/net/TestTeiidURL.java:3535-3555 /trunk/client/src/test/java/org/teiid/net/TestTeiidURL.java:3507-3597 Property changes on: branches/as7/client/src/test/java/org/teiid/net/socket ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/client/src/test/java/org/teiid/net/socket:3535-3555 /trunk/client/src/test/java/org/teiid/net/socket:3507-3597 Modified: branches/as7/client-jdk15/pom.xml =================================================================== --- branches/as7/client-jdk15/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/client-jdk15/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-client-jdk15</artifactId> Modified: branches/as7/common-core/pom.xml =================================================================== --- branches/as7/common-core/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/common-core/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>teiid-common-core</artifactId> Property changes on: branches/as7/common-core/src/main/java/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org:3535-3555* /trunk/common-core/src/main/java/org:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid:3535-3555* /trunk/common-core/src/main/java/org/teiid:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core:3535-3555* /trunk/common-core/src/main/java/org/teiid/core:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/BundleUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/BundleUtil.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/BundleUtil.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/ComponentNotFoundException.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/CoreConstants.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/CoreConstants.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/CoreConstants.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/CorePlugin.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/CorePlugin.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/CorePlugin.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/TeiidComponentException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/TeiidComponentException.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/TeiidException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3220-3275 /trunk/common-core/src/main/java/org/teiid/core/TeiidException.java:3188-3450,3452-3506 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidException.java:3220-3275,3535-3555 /trunk/common-core/src/main/java/org/teiid/core/TeiidException.java:3188-3450,3452-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/TeiidProcessingException.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3220-3275 /trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3188-3450,3452-3506 + /branches/7.4.x/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3220-3275,3535-3555 /trunk/common-core/src/main/java/org/teiid/core/TeiidRuntimeException.java:3188-3450,3452-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/crypto ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/crypto:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/crypto:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types:3535-3555* /trunk/common-core/src/main/java/org/teiid/core/types:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/BaseLob.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/BaseLob.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/BlobImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/BlobImpl.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/BlobType.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/BlobType.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/BlobType.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/ClobImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/ClobImpl.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/ClobType.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/ClobType.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/ClobType.java:3507-3597 Modified: branches/as7/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java =================================================================== --- branches/as7/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -75,6 +75,8 @@ * need to load the Class object, which may not be in the classpath. The * advantage of the Class option is speed. * </p> + * + * TODO: refactor the string/class/code into an enum */ public class DataTypeManager { @@ -224,6 +226,62 @@ public static final Class<ClobType> CLOB = ClobType.class; public static final Class<XMLType> XML = XMLType.class; } + + public static final class DefaultTypeCodes { + public static final int STRING = 0; + public static final int CHAR = 1; + public static final int BOOLEAN = 2; + public static final int BYTE = 3; + public static final int SHORT = 4; + public static final int INTEGER = 5; + public static final int LONG = 6; + public static final int BIGINTEGER = 7; + public static final int FLOAT = 8; + public static final int DOUBLE = 9; + public static final int BIGDECIMAL = 10; + public static final int DATE = 11; + public static final int TIME = 12; + public static final int TIMESTAMP = 13; + public static final int OBJECT = 14; + public static final int BLOB = 15; + public static final int CLOB = 16; + public static final int XML = 17; + public static final int NULL = 18; + } + + private static final Map<Class<?>, Integer> typeMap = new LinkedHashMap<Class<?>, Integer>(64); + private static final List<Class<?>> typeList; + + static { + typeMap.put(DataTypeManager.DefaultDataClasses.STRING, DefaultTypeCodes.STRING); + typeMap.put(DataTypeManager.DefaultDataClasses.CHAR, DefaultTypeCodes.CHAR); + typeMap.put(DataTypeManager.DefaultDataClasses.BOOLEAN, DefaultTypeCodes.BOOLEAN); + typeMap.put(DataTypeManager.DefaultDataClasses.BYTE, DefaultTypeCodes.BYTE); + typeMap.put(DataTypeManager.DefaultDataClasses.SHORT, DefaultTypeCodes.SHORT); + typeMap.put(DataTypeManager.DefaultDataClasses.INTEGER, DefaultTypeCodes.INTEGER); + typeMap.put(DataTypeManager.DefaultDataClasses.LONG, DefaultTypeCodes.LONG); + typeMap.put(DataTypeManager.DefaultDataClasses.BIG_INTEGER, DefaultTypeCodes.BIGINTEGER); + typeMap.put(DataTypeManager.DefaultDataClasses.FLOAT, DefaultTypeCodes.FLOAT); + typeMap.put(DataTypeManager.DefaultDataClasses.DOUBLE, DefaultTypeCodes.DOUBLE); + typeMap.put(DataTypeManager.DefaultDataClasses.BIG_DECIMAL, DefaultTypeCodes.BIGDECIMAL); + typeMap.put(DataTypeManager.DefaultDataClasses.DATE, DefaultTypeCodes.DATE); + typeMap.put(DataTypeManager.DefaultDataClasses.TIME, DefaultTypeCodes.TIME); + typeMap.put(DataTypeManager.DefaultDataClasses.TIMESTAMP, DefaultTypeCodes.TIMESTAMP); + typeMap.put(DataTypeManager.DefaultDataClasses.OBJECT, DefaultTypeCodes.OBJECT); + typeMap.put(DataTypeManager.DefaultDataClasses.BLOB, DefaultTypeCodes.BLOB); + typeMap.put(DataTypeManager.DefaultDataClasses.CLOB, DefaultTypeCodes.CLOB); + typeMap.put(DataTypeManager.DefaultDataClasses.XML, DefaultTypeCodes.XML); + typeMap.put(DataTypeManager.DefaultDataClasses.NULL, DefaultTypeCodes.NULL); + typeList = new ArrayList<Class<?>>(typeMap.keySet()); + } + + public static int getTypeCode(Class<?> source) { + return typeMap.get(source).intValue(); + } + + public static Class<?> getClass(int code) { + return typeList.get(code); + } /** * Doubly-nested map of String srcType --> Map of String targetType --> @@ -340,14 +398,20 @@ * this is simply the class of the object. Some special cases are when the * value is of type Object or Null. */ - public static Class determineDataTypeClass(Object value) { + public static Class<?> determineDataTypeClass(Object value) { // Handle null case if (value == null) { return DefaultDataClasses.NULL; } - - return getDataTypeClass(getDataTypeName(convertToRuntimeType(value) - .getClass())); + Class<?> clazz = value.getClass(); + if (DATA_TYPE_CLASSES.contains(clazz)) { + return clazz; + } + clazz = convertToRuntimeType(value).getClass(); + if (DATA_TYPE_CLASSES.contains(clazz)) { + return clazz; + } + return DefaultDataClasses.OBJECT; } /** @@ -748,7 +812,7 @@ return null; } Class<?> c = value.getClass(); - if (getAllDataTypeClasses().contains(c)) { + if (DATA_TYPE_CLASSES.contains(c)) { return value; } SourceTransform t = sourceConverters.get(c); Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/InputStreamFactory.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/JDBCSQLTypeInfo.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/LobSearchUtil.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/NullType.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/NullType.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/NullType.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/SQLXMLImpl.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/Sequencable.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/Sequencable.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/SourceTransform.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/SourceTransform.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/StandardXMLTranslator.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/Streamable.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Streamable.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/Streamable.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/Transform.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/Transform.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/Transform.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/TransformationException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/TransformationException.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/XMLTranslator.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/XMLType.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/XMLType.java:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/XMLType.java:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/types/basic ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/types/basic:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/types/basic:3507-3597 Property changes on: branches/as7/common-core/src/main/java/org/teiid/core/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/main/java/org/teiid/core/util:3535-3555 /trunk/common-core/src/main/java/org/teiid/core/util:3507-3597 Copied: branches/as7/common-core/src/main/java/org/teiid/core/util/ExecutorUtils.java (from rev 3597, trunk/common-core/src/main/java/org/teiid/core/util/ExecutorUtils.java) =================================================================== --- branches/as7/common-core/src/main/java/org/teiid/core/util/ExecutorUtils.java (rev 0) +++ branches/as7/common-core/src/main/java/org/teiid/core/util/ExecutorUtils.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +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 org.teiid.core.util; + +import java.util.concurrent.Executor; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +public class ExecutorUtils { + + /** + * Creates a fixed thread pool with named daemon threads that will expire after 60 seconds of + * inactivity. + * @param nThreads + * @param name + * @return + */ + public static ExecutorService newFixedThreadPool(int nThreads, String name) { + return newFixedThreadPool(nThreads, Integer.MAX_VALUE, name); + } + + public static ExecutorService newFixedThreadPool(int nThreads, int maxQueue, String name) { + ThreadPoolExecutor tpe = new ThreadPoolExecutor(nThreads, nThreads, + 60L, TimeUnit.SECONDS, + maxQueue==0?new SynchronousQueue<Runnable>():new LinkedBlockingQueue<Runnable>(maxQueue), new NamedThreadFactory(name)); + tpe.allowCoreThreadTimeOut(true); + return tpe; + } + + private static Executor direct = new Executor() { + + @Override + public void execute(Runnable command) { + command.run(); + } + }; + + public static Executor getDirectExecutor() { + return direct; + } +} Property changes on: branches/as7/common-core/src/test/java/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org:3535-3555* /trunk/common-core/src/test/java/org:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid:3535-3555* /trunk/common-core/src/test/java/org/teiid:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core:3535-3555* /trunk/common-core/src/test/java/org/teiid/core:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixException.java:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java ___________________________________________________________________ Modified: svn:mergeinfo - /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3220-3275 /trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3188-3450,3452-3506 + /branches/7.4.x/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3220-3275,3535-3555 /trunk/common-core/src/test/java/org/teiid/core/TestMetaMatrixRuntimeException.java:3188-3450,3452-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core/crypto ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/crypto:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/crypto:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core/types ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types:3535-3555* /trunk/common-core/src/test/java/org/teiid/core/types:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/TestBlobValue.java:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core/types/TestClobValue.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/TestClobValue.java:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/TestSQLXMLImpl.java:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/TestXMLStreamSourceTranslator.java:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/TestXMLValue.java:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core/types/basic ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/types/basic:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/types/basic:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/core/util ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/core/util:3535-3555 /trunk/common-core/src/test/java/org/teiid/core/util:3507-3597 Modified: branches/as7/common-core/src/test/java/org/teiid/core/util/UnitTestUtil.java =================================================================== --- branches/as7/common-core/src/test/java/org/teiid/core/util/UnitTestUtil.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/common-core/src/test/java/org/teiid/core/util/UnitTestUtil.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -50,6 +50,45 @@ */ public class UnitTestUtil { + public static final class LogFormatter extends Formatter { + @Override + public String format(LogRecord record) { + final StringBuilder result = new StringBuilder(); + result.append(new Timestamp(record.getMillis())); + result.append(" "); //$NON-NLS-1$ + result.append(record.getLoggerName()); + result.append(" "); //$NON-NLS-1$ + result.append(record.getLevel()); + result.append(" "); //$NON-NLS-1$ + result.append(Thread.currentThread().getName()); + result.append(" "); //$NON-NLS-1$ + result.append(record.getMessage()); + result.append('\n'); + if (record.getThrown() != null) { + record.getThrown().printStackTrace(new PrintWriter(new Writer() { + + @Override + public void close() throws IOException { + + } + + @Override + public void flush() throws IOException { + + } + + @Override + public void write(char[] cbuf, int off, int len) + throws IOException { + result.append(new String(cbuf, off, len)); + } + })); + result.append('\n'); + } + return result.toString(); + } + } + public static final String PATH_SEPARATOR = "/"; //$NON-NLS-1$ private static final String DEFAULT_TESTDATA_PATH = "src/test/resources"; //$NON-NLS-1$ @@ -419,45 +458,7 @@ } else { logger.setUseParentHandlers(false); ConsoleHandler ch = new ConsoleHandler(); - ch.setFormatter(new Formatter() { - - @Override - public String format(LogRecord record) { - final StringBuilder result = new StringBuilder(); - result.append(new Timestamp(record.getMillis())); - result.append(" "); //$NON-NLS-1$ - result.append(record.getLoggerName()); - result.append(" "); //$NON-NLS-1$ - result.append(record.getLevel()); - result.append(" "); //$NON-NLS-1$ - result.append(record.getThreadID()); - result.append(" "); //$NON-NLS-1$ - result.append(record.getMessage()); - result.append('\n'); - if (record.getThrown() != null) { - record.getThrown().printStackTrace(new PrintWriter(new Writer() { - - @Override - public void close() throws IOException { - - } - - @Override - public void flush() throws IOException { - - } - - @Override - public void write(char[] cbuf, int off, int len) - throws IOException { - result.append(new String(cbuf, off, len)); - } - })); - result.append('\n'); - } - return result.toString(); - } - }); + ch.setFormatter(new LogFormatter()); ch.setLevel(Level.FINEST); logger.addHandler(ch); } Property changes on: branches/as7/common-core/src/test/java/org/teiid/query ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/query:3535-3555* /trunk/common-core/src/test/java/org/teiid/query:3507-3597 Property changes on: branches/as7/common-core/src/test/java/org/teiid/query/unittest ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/common-core/src/test/java/org/teiid/query/unittest:3535-3555 /trunk/common-core/src/test/java/org/teiid/query/unittest:3507-3597 Modified: branches/as7/connectors/connector-file/pom.xml =================================================================== --- branches/as7/connectors/connector-file/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/connector-file/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-file</artifactId> Property changes on: branches/as7/connectors/connector-file/src/main/java/org/teiid/resource/adapter ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3535-3555* /trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3535-3555 /trunk/connectors/connector-file/src/main/java/org/teiid/resource/adapter/file:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/main/resources/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/resources/org:3535-3555* /trunk/connectors/connector-file/src/main/resources/org:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/main/resources/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid:3535-3555* /trunk/connectors/connector-file/src/main/resources/org/teiid:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/main/resources/org/teiid/resource ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource:3535-3555* /trunk/connectors/connector-file/src/main/resources/org/teiid/resource:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/main/resources/org/teiid/resource/adapter ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3535-3555* /trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3535-3555* /trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3535-3555 /trunk/connectors/connector-file/src/main/resources/org/teiid/resource/adapter/file/i18n.properties:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/test/java/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/test/java/org:3535-3555* /trunk/connectors/connector-file/src/test/java/org:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/test/java/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid:3535-3555* /trunk/connectors/connector-file/src/test/java/org/teiid:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/test/java/org/teiid/resource ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource:3535-3555* /trunk/connectors/connector-file/src/test/java/org/teiid/resource:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/test/java/org/teiid/resource/adapter ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3535-3555* /trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3535-3555* /trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file:3507-3597 Property changes on: branches/as7/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3535-3555 /trunk/connectors/connector-file/src/test/java/org/teiid/resource/adapter/file/TestFileConnection.java:3507-3597 Modified: branches/as7/connectors/connector-ldap/pom.xml =================================================================== --- branches/as7/connectors/connector-ldap/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/connector-ldap/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ldap</artifactId> Property changes on: branches/as7/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3535-3555* /trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter:3507-3597 Property changes on: branches/as7/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3535-3555 /trunk/connectors/connector-ldap/src/main/java/org/teiid/resource/adapter/ldap:3507-3597 Modified: branches/as7/connectors/connector-ldap/src/test/java/org/teiid/resource/adapter/ldap/TestLDAPConnection.java =================================================================== --- branches/as7/connectors/connector-ldap/src/test/java/org/teiid/resource/adapter/ldap/TestLDAPConnection.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/connector-ldap/src/test/java/org/teiid/resource/adapter/ldap/TestLDAPConnection.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -30,10 +30,8 @@ import org.junit.Test; import org.mockito.Mockito; -import org.teiid.resource.adapter.ldap.LDAPConnectionImpl; -import org.teiid.resource.adapter.ldap.LDAPManagedConnectionFactory; - +@SuppressWarnings("nls") public class TestLDAPConnection { public static class FakeFactory implements InitialContextFactory { Modified: branches/as7/connectors/connector-salesforce/pom.xml =================================================================== --- branches/as7/connectors/connector-salesforce/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/connector-salesforce/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-salesforce</artifactId> Modified: branches/as7/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java =================================================================== --- branches/as7/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -29,6 +29,9 @@ import javax.resource.ResourceException; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.ws.BindingProvider; +import javax.xml.ws.handler.Handler; +import javax.xml.ws.handler.HandlerResolver; +import javax.xml.ws.handler.PortInfo; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; @@ -82,7 +85,7 @@ String getUserName() throws ResourceException { try { - return sfSoap.getUserInfo(sh).getUserName(); + return sfSoap.getUserInfo().getUserName(); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { throw new ResourceException(e); } @@ -110,9 +113,17 @@ BusFactory.setThreadDefaultBus(mcf.getBus()); try { sfService = new SforceService(); + sh = new SessionHeader(); + + // Session Id must be passed in soapHeader - add the handler + sfService.setHandlerResolver(new SalesforceHandlerResolver(sh)); + sfSoap = sfService.getSoap(); ((BindingProvider)sfSoap).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, url.toExternalForm()); loginResult = sfSoap.login(username, password); + + // Set the SessionId after login, for subsequent calls + sh.setSessionId(loginResult.getSessionId()); } catch (LoginFault e) { throw new ResourceException(e); } catch (InvalidIdFault e) { @@ -123,9 +134,7 @@ BusFactory.setThreadDefaultBus(bus); } LogManager.logTrace(LogConstants.CTX_CONNECTOR, "Login was successful for username " + username); //$NON-NLS-1$ - - sh = new SessionHeader(); - sh.setSessionId(loginResult.getSessionId()); + // Reset the SOAP endpoint to the returned server URL ((BindingProvider)sfSoap).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,loginResult.getServerUrl()); // or maybe org.apache.cxf.message.Message.ENDPOINT_ADDRESS @@ -136,7 +145,7 @@ // Test the connection. try { - sfSoap.getUserInfo(sh); + sfSoap.getUserInfo(); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { throw new ResourceException(e); } @@ -150,7 +159,7 @@ result = false; } else { try { - sfSoap.getServerTimestamp(sh); + sfSoap.getServerTimestamp(); } catch (Throwable t) { LogManager.logTrace(LogConstants.CTX_CONNECTOR, "Caught Throwable in isAlive", t); //$NON-NLS-1$ result = false; @@ -171,12 +180,12 @@ qo.setBatchSize(batchSize); try { if(queryAll != null && queryAll) { - qr = sfSoap.queryAll(queryString, sh); + qr = sfSoap.queryAll(queryString); } else { MruHeader mruHeader = partnerFactory.createMruHeader(); mruHeader.setUpdateMru(false); - qr = sfSoap.query(queryString, sh); + qr = sfSoap.query(queryString); } } catch (InvalidFieldFault e) { throw new ResourceException(e); @@ -198,7 +207,7 @@ QueryOptions qo = partnerFactory.createQueryOptions(); qo.setBatchSize(batchSize); try { - return sfSoap.queryMore(queryLocator, sh); + return sfSoap.queryMore(queryLocator); } catch (InvalidFieldFault e) { throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { @@ -212,7 +221,7 @@ public int delete(String[] ids) throws ResourceException { List<DeleteResult> results = null; try { - results = sfSoap.delete(Arrays.asList(ids), sh); + results = sfSoap.delete(Arrays.asList(ids)); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { throw new ResourceException(e); } @@ -250,7 +259,7 @@ objects.add(toCreate); List<SaveResult> result; try { - result = sfSoap.create(objects, sh); + result = sfSoap.create(objects); } catch (InvalidFieldFault e) { throw new ResourceException(e); } catch (com.sforce.soap.partner.InvalidSObjectFault e) { @@ -275,7 +284,7 @@ } List<SaveResult> result; try { - result = sfSoap.update(params, sh); + result = sfSoap.update(params); } catch (InvalidFieldFault e) { throw new ResourceException(e); } catch (com.sforce.soap.partner.InvalidSObjectFault e) { @@ -300,7 +309,7 @@ public UpdatedResult getUpdated(String objectType, XMLGregorianCalendar startDate, XMLGregorianCalendar endDate) throws ResourceException { GetUpdatedResult updated; try { - updated = sfSoap.getUpdated(objectType, startDate, endDate, sh); + updated = sfSoap.getUpdated(objectType, startDate, endDate); } catch (com.sforce.soap.partner.InvalidSObjectFault e) { throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { @@ -316,7 +325,7 @@ XMLGregorianCalendar endCalendar) throws ResourceException { GetDeletedResult deleted; try { - deleted = sfSoap.getDeleted(objectName, startCalendar, endCalendar, sh); + deleted = sfSoap.getDeleted(objectName, startCalendar, endCalendar); } catch (com.sforce.soap.partner.InvalidSObjectFault e) { throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { @@ -342,7 +351,7 @@ public QueryResult retrieve(String fieldList, String sObjectType, List<String> ids) throws ResourceException { try { - List<SObject> objects = sfSoap.retrieve(fieldList, sObjectType, ids, sh); + List<SObject> objects = sfSoap.retrieve(fieldList, sObjectType, ids); QueryResult result = new QueryResult(); for (SObject sObject : objects) { if (sObject != null) { @@ -368,7 +377,7 @@ public DescribeGlobalResult getObjects() throws ResourceException { try { - return sfSoap.describeGlobal(sh); + return sfSoap.describeGlobal(); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { throw new ResourceException(e); } @@ -376,7 +385,7 @@ public DescribeSObjectResult getObjectMetaData(String objectName) throws ResourceException { try { - return sfSoap.describeSObject(objectName, sh); + return sfSoap.describeSObject(objectName); } catch (com.sforce.soap.partner.InvalidSObjectFault e) { throw new ResourceException(e); } catch (com.sforce.soap.partner.UnexpectedErrorFault e) { @@ -392,6 +401,5 @@ @Override public boolean isAlive() { return isValid(); - } - + } } Copied: branches/as7/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceHandlerResolver.java (from rev 3597, trunk/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceHandlerResolver.java) =================================================================== --- branches/as7/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceHandlerResolver.java (rev 0) +++ branches/as7/connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceHandlerResolver.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,85 @@ +package org.teiid.resource.adapter.salesforce; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPHeader; +import javax.xml.soap.SOAPHeaderElement; +import javax.xml.soap.SOAPMessage; +import javax.xml.soap.SOAPPart; +import javax.xml.ws.handler.Handler; +import javax.xml.ws.handler.HandlerResolver; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.PortInfo; +import javax.xml.ws.handler.soap.SOAPHandler; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import com.sforce.soap.partner.SessionHeader; + +/* Handler which adds the SessionId info to the SOAP Header + * + */ +class SalesforceHandlerResolver implements HandlerResolver { + + private SalesforceHeaderHandler headerHandler = null; + + public SalesforceHandlerResolver(SessionHeader sh) { + this.headerHandler = new SalesforceHeaderHandler(sh); + } + + public List<Handler> getHandlerChain(PortInfo portInfo) { + List<Handler> handlerChain = new ArrayList<Handler>(); + + handlerChain.add(this.headerHandler); + + return handlerChain; + } + + class SalesforceHeaderHandler implements SOAPHandler<SOAPMessageContext> { + + SessionHeader sh = null; + + public SalesforceHeaderHandler(SessionHeader sh) { + this.sh = sh; + } + + public boolean handleMessage(SOAPMessageContext smc) { + QName sessionHeader = new QName("urn:partner.soap.sforce.com", "SessionHeader"); //$NON-NLS-1$ //$NON-NLS-2$ + QName sessionId = new QName("urn:partner.soap.sforce.com", "sessionId"); + try { + // If the SessionHeader is null, or the session id is null - do nothing. + if (sh!=null && sh.getSessionId()!=null) { + SOAPMessage message = smc.getMessage(); + SOAPPart part = message.getSOAPPart(); + SOAPEnvelope envelope = part.getEnvelope(); + SOAPHeader header = envelope.getHeader(); + if (header == null) header = envelope.addHeader(); + SOAPHeaderElement sessionHeaderElement = header.addHeaderElement(sessionHeader); + SOAPElement sessionIdElement = sessionHeaderElement.addChildElement(sessionId); + sessionIdElement.addTextNode(sh.getSessionId()); + } + + } catch (SOAPException e) { + e.printStackTrace(); + return false; + } + return true; + } + + public Set getHeaders() { + return null; + } + + public boolean handleFault(SOAPMessageContext context) { + return true; + } + + public void close(MessageContext context) { + } + } +} Modified: branches/as7/connectors/connector-ws/pom.xml =================================================================== --- branches/as7/connectors/connector-ws/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/connector-ws/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>connector-ws</artifactId> Property changes on: branches/as7/connectors/connector-ws/src/main/resources/org ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ws/src/main/resources/org:3535-3555* /trunk/connectors/connector-ws/src/main/resources/org:3507-3597 Property changes on: branches/as7/connectors/connector-ws/src/main/resources/org/teiid ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid:3535-3555* /trunk/connectors/connector-ws/src/main/resources/org/teiid:3507-3597 Property changes on: branches/as7/connectors/connector-ws/src/main/resources/org/teiid/resource ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource:3535-3555* /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource:3507-3597 Property changes on: branches/as7/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3535-3555* /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter:3507-3597 Property changes on: branches/as7/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3535-3555* /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws:3507-3597 Property changes on: branches/as7/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3535-3555 /trunk/connectors/connector-ws/src/main/resources/org/teiid/resource/adapter/ws/i18n.properties:3507-3597 Modified: branches/as7/connectors/pom.xml =================================================================== --- branches/as7/connectors/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/as7/connectors/salesforce-api/pom.xml =================================================================== --- branches/as7/connectors/salesforce-api/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>salesforce-api</artifactId> Copied: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/AllOrNoneHeader.java (from rev 3597, trunk/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/AllOrNoneHeader.java) =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/AllOrNoneHeader.java (rev 0) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/AllOrNoneHeader.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,54 @@ + +package com.sforce.soap.partner; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="allOrNone" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "allOrNone" +}) +@XmlRootElement(name = "AllOrNoneHeader") +public class AllOrNoneHeader { + + protected boolean allOrNone; + + /** + * Gets the value of the allOrNone property. + * + */ + public boolean isAllOrNone() { + return allOrNone; + } + + /** + * Sets the value of the allOrNone property. + * + */ + public void setAllOrNone(boolean value) { + this.allOrNone = value; + } + +} Copied: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DataCategory.java (from rev 3597, trunk/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DataCategory.java) =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DataCategory.java (rev 0) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DataCategory.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,124 @@ + +package com.sforce.soap.partner; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for DataCategory complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="DataCategory"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="childCategories" type="{urn:partner.soap.sforce.com}DataCategory" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="label" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "DataCategory", propOrder = { + "childCategories", + "label", + "name" +}) +public class DataCategory { + + protected List<DataCategory> childCategories; + @XmlElement(required = true) + protected String label; + @XmlElement(required = true) + protected String name; + + /** + * Gets the value of the childCategories property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the childCategories property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getChildCategories().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DataCategory } + * + * + */ + public List<DataCategory> getChildCategories() { + if (childCategories == null) { + childCategories = new ArrayList<DataCategory>(); + } + return this.childCategories; + } + + /** + * Gets the value of the label property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLabel() { + return label; + } + + /** + * Sets the value of the label property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLabel(String value) { + this.label = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} Copied: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DataCategoryGroupSobjectTypePair.java (from rev 3597, trunk/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DataCategoryGroupSobjectTypePair.java) =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DataCategoryGroupSobjectTypePair.java (rev 0) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DataCategoryGroupSobjectTypePair.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,90 @@ + +package com.sforce.soap.partner; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for DataCategoryGroupSobjectTypePair complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="DataCategoryGroupSobjectTypePair"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="dataCategoryGroupName" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="sobject" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "DataCategoryGroupSobjectTypePair", propOrder = { + "dataCategoryGroupName", + "sobject" +}) +public class DataCategoryGroupSobjectTypePair { + + @XmlElement(required = true) + protected String dataCategoryGroupName; + @XmlElement(required = true) + protected String sobject; + + /** + * Gets the value of the dataCategoryGroupName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDataCategoryGroupName() { + return dataCategoryGroupName; + } + + /** + * Sets the value of the dataCategoryGroupName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDataCategoryGroupName(String value) { + this.dataCategoryGroupName = value; + } + + /** + * Gets the value of the sobject property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSobject() { + return sobject; + } + + /** + * Sets the value of the sobject property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSobject(String value) { + this.sobject = value; + } + +} Copied: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupResult.java (from rev 3597, trunk/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupResult.java) =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupResult.java (rev 0) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupResult.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,165 @@ + +package com.sforce.soap.partner; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for DescribeDataCategoryGroupResult complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="DescribeDataCategoryGroupResult"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="categoryCount" type="{http://www.w3.org/2001/XMLSchema}int"/> + * &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="label" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="sobject" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "DescribeDataCategoryGroupResult", propOrder = { + "categoryCount", + "description", + "label", + "name", + "sobject" +}) +public class DescribeDataCategoryGroupResult { + + protected int categoryCount; + @XmlElement(required = true) + protected String description; + @XmlElement(required = true) + protected String label; + @XmlElement(required = true) + protected String name; + @XmlElement(required = true) + protected String sobject; + + /** + * Gets the value of the categoryCount property. + * + */ + public int getCategoryCount() { + return categoryCount; + } + + /** + * Sets the value of the categoryCount property. + * + */ + public void setCategoryCount(int value) { + this.categoryCount = value; + } + + /** + * Gets the value of the description property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescription() { + return description; + } + + /** + * Sets the value of the description property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescription(String value) { + this.description = value; + } + + /** + * Gets the value of the label property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLabel() { + return label; + } + + /** + * Sets the value of the label property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLabel(String value) { + this.label = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the sobject property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSobject() { + return sobject; + } + + /** + * Sets the value of the sobject property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSobject(String value) { + this.sobject = value; + } + +} Copied: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructureResult.java (from rev 3597, trunk/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructureResult.java) =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructureResult.java (rev 0) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructureResult.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,180 @@ + +package com.sforce.soap.partner; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for DescribeDataCategoryGroupStructureResult complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="DescribeDataCategoryGroupStructureResult"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="description" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="label" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="sobject" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="topCategories" type="{urn:partner.soap.sforce.com}DataCategory" maxOccurs="unbounded" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "DescribeDataCategoryGroupStructureResult", propOrder = { + "description", + "label", + "name", + "sobject", + "topCategories" +}) +public class DescribeDataCategoryGroupStructureResult { + + @XmlElement(required = true) + protected String description; + @XmlElement(required = true) + protected String label; + @XmlElement(required = true) + protected String name; + @XmlElement(required = true) + protected String sobject; + protected List<DataCategory> topCategories; + + /** + * Gets the value of the description property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescription() { + return description; + } + + /** + * Sets the value of the description property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescription(String value) { + this.description = value; + } + + /** + * Gets the value of the label property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLabel() { + return label; + } + + /** + * Sets the value of the label property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLabel(String value) { + this.label = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the sobject property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSobject() { + return sobject; + } + + /** + * Sets the value of the sobject property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSobject(String value) { + this.sobject = value; + } + + /** + * Gets the value of the topCategories property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the topCategories property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getTopCategories().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DataCategory } + * + * + */ + public List<DataCategory> getTopCategories() { + if (topCategories == null) { + topCategories = new ArrayList<DataCategory>(); + } + return this.topCategories; + } + +} Copied: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructures.java (from rev 3597, trunk/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructures.java) =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructures.java (rev 0) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructures.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,88 @@ + +package com.sforce.soap.partner; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="pairs" type="{urn:partner.soap.sforce.com}DataCategoryGroupSobjectTypePair" maxOccurs="100" minOccurs="0"/> + * &lt;element name="topCategoriesOnly" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "pairs", + "topCategoriesOnly" +}) +@XmlRootElement(name = "describeDataCategoryGroupStructures") +public class DescribeDataCategoryGroupStructures { + + protected List<DataCategoryGroupSobjectTypePair> pairs; + protected boolean topCategoriesOnly; + + /** + * Gets the value of the pairs property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the pairs property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getPairs().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DataCategoryGroupSobjectTypePair } + * + * + */ + public List<DataCategoryGroupSobjectTypePair> getPairs() { + if (pairs == null) { + pairs = new ArrayList<DataCategoryGroupSobjectTypePair>(); + } + return this.pairs; + } + + /** + * Gets the value of the topCategoriesOnly property. + * + */ + public boolean isTopCategoriesOnly() { + return topCategoriesOnly; + } + + /** + * Sets the value of the topCategoriesOnly property. + * + */ + public void setTopCategoriesOnly(boolean value) { + this.topCategoriesOnly = value; + } + +} Copied: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructuresResponse.java (from rev 3597, trunk/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructuresResponse.java) =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructuresResponse.java (rev 0) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupStructuresResponse.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,69 @@ + +package com.sforce.soap.partner; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="result" type="{urn:partner.soap.sforce.com}DescribeDataCategoryGroupStructureResult" maxOccurs="100" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "result" +}) +@XmlRootElement(name = "describeDataCategoryGroupStructuresResponse") +public class DescribeDataCategoryGroupStructuresResponse { + + protected List<DescribeDataCategoryGroupStructureResult> result; + + /** + * Gets the value of the result property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the result property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getResult().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DescribeDataCategoryGroupStructureResult } + * + * + */ + public List<DescribeDataCategoryGroupStructureResult> getResult() { + if (result == null) { + result = new ArrayList<DescribeDataCategoryGroupStructureResult>(); + } + return this.result; + } + +} Copied: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroups.java (from rev 3597, trunk/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroups.java) =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroups.java (rev 0) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroups.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,69 @@ + +package com.sforce.soap.partner; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="sObjectType" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="10" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "sObjectType" +}) +@XmlRootElement(name = "describeDataCategoryGroups") +public class DescribeDataCategoryGroups { + + protected List<String> sObjectType; + + /** + * Gets the value of the sObjectType property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the sObjectType property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getSObjectType().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link String } + * + * + */ + public List<String> getSObjectType() { + if (sObjectType == null) { + sObjectType = new ArrayList<String>(); + } + return this.sObjectType; + } + +} Copied: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupsResponse.java (from rev 3597, trunk/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupsResponse.java) =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupsResponse.java (rev 0) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeDataCategoryGroupsResponse.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,69 @@ + +package com.sforce.soap.partner; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="result" type="{urn:partner.soap.sforce.com}DescribeDataCategoryGroupResult" maxOccurs="100" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "result" +}) +@XmlRootElement(name = "describeDataCategoryGroupsResponse") +public class DescribeDataCategoryGroupsResponse { + + protected List<DescribeDataCategoryGroupResult> result; + + /** + * Gets the value of the result property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the result property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getResult().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DescribeDataCategoryGroupResult } + * + * + */ + public List<DescribeDataCategoryGroupResult> getResult() { + if (result == null) { + result = new ArrayList<DescribeDataCategoryGroupResult>(); + } + return this.result; + } + +} Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeGlobalSObjectResult.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeGlobalSObjectResult.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeGlobalSObjectResult.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -23,6 +23,7 @@ * &lt;element name="customSetting" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * &lt;element name="deletable" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * &lt;element name="deprecatedAndHidden" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * &lt;element name="feedEnabled" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * &lt;element name="keyPrefix" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="label" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="labelPlural" type="{http://www.w3.org/2001/XMLSchema}string"/> @@ -52,6 +53,7 @@ "customSetting", "deletable", "deprecatedAndHidden", + "feedEnabled", "keyPrefix", "label", "labelPlural", @@ -74,6 +76,7 @@ protected boolean customSetting; protected boolean deletable; protected boolean deprecatedAndHidden; + protected boolean feedEnabled; @XmlElement(required = true, nillable = true) protected String keyPrefix; @XmlElement(required = true) @@ -189,6 +192,22 @@ } /** + * Gets the value of the feedEnabled property. + * + */ + public boolean isFeedEnabled() { + return feedEnabled; + } + + /** + * Sets the value of the feedEnabled property. + * + */ + public void setFeedEnabled(boolean value) { + this.feedEnabled = value; + } + + /** * Gets the value of the keyPrefix property. * * @return Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeLayout.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeLayout.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeLayout.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -6,24 +6,22 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; /** - * <p>Java class for DescribeLayout complex type. + * <p>Java class for anonymous complex type. * * <p>The following schema fragment specifies the expected content contained within this class. * * <pre> - * &lt;complexType name="DescribeLayout"> + * &lt;complexType> * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * &lt;sequence> - * &lt;element name="buttonLayoutSection" type="{urn:partner.soap.sforce.com}DescribeLayoutButtonSection" minOccurs="0"/> - * &lt;element name="detailLayoutSections" type="{urn:partner.soap.sforce.com}DescribeLayoutSection" maxOccurs="unbounded" minOccurs="0"/> - * &lt;element name="editLayoutSections" type="{urn:partner.soap.sforce.com}DescribeLayoutSection" maxOccurs="unbounded" minOccurs="0"/> - * &lt;element name="id" type="{urn:partner.soap.sforce.com}ID"/> - * &lt;element name="relatedLists" type="{urn:partner.soap.sforce.com}RelatedList" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="sObjectType" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="recordTypeIds" type="{urn:partner.soap.sforce.com}ID" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> * &lt;/complexContent> @@ -33,155 +31,68 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DescribeLayout", propOrder = { - "buttonLayoutSection", - "detailLayoutSections", - "editLayoutSections", - "id", - "relatedLists" +@XmlType(name = "", propOrder = { + "sObjectType", + "recordTypeIds" }) +@XmlRootElement(name = "describeLayout") public class DescribeLayout { - protected DescribeLayoutButtonSection buttonLayoutSection; - protected List<DescribeLayoutSection> detailLayoutSections; - protected List<DescribeLayoutSection> editLayoutSections; @XmlElement(required = true) - protected String id; - protected List<RelatedList> relatedLists; + protected String sObjectType; + protected List<String> recordTypeIds; /** - * Gets the value of the buttonLayoutSection property. + * Gets the value of the sObjectType property. * * @return * possible object is - * {@link DescribeLayoutButtonSection } - * - */ - public DescribeLayoutButtonSection getButtonLayoutSection() { - return buttonLayoutSection; - } - - /** - * Sets the value of the buttonLayoutSection property. - * - * @param value - * allowed object is - * {@link DescribeLayoutButtonSection } - * - */ - public void setButtonLayoutSection(DescribeLayoutButtonSection value) { - this.buttonLayoutSection = value; - } - - /** - * Gets the value of the detailLayoutSections property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the detailLayoutSections property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getDetailLayoutSections().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link DescribeLayoutSection } - * - * - */ - public List<DescribeLayoutSection> getDetailLayoutSections() { - if (detailLayoutSections == null) { - detailLayoutSections = new ArrayList<DescribeLayoutSection>(); - } - return this.detailLayoutSections; - } - - /** - * Gets the value of the editLayoutSections property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the editLayoutSections property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getEditLayoutSections().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link DescribeLayoutSection } - * - * - */ - public List<DescribeLayoutSection> getEditLayoutSections() { - if (editLayoutSections == null) { - editLayoutSections = new ArrayList<DescribeLayoutSection>(); - } - return this.editLayoutSections; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is * {@link String } * */ - public String getId() { - return id; + public String getSObjectType() { + return sObjectType; } /** - * Sets the value of the id property. + * Sets the value of the sObjectType property. * * @param value * allowed object is * {@link String } * */ - public void setId(String value) { - this.id = value; + public void setSObjectType(String value) { + this.sObjectType = value; } /** - * Gets the value of the relatedLists property. + * Gets the value of the recordTypeIds property. * * <p> * This accessor method returns a reference to the live list, * not a snapshot. Therefore any modification you make to the * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the relatedLists property. + * This is why there is not a <CODE>set</CODE> method for the recordTypeIds property. * * <p> * For example, to add a new item, do as follows: * <pre> - * getRelatedLists().add(newItem); + * getRecordTypeIds().add(newItem); * </pre> * * * <p> * Objects of the following type(s) are allowed in the list - * {@link RelatedList } + * {@link String } * * */ - public List<RelatedList> getRelatedLists() { - if (relatedLists == null) { - relatedLists = new ArrayList<RelatedList>(); + public List<String> getRecordTypeIds() { + if (recordTypeIds == null) { + recordTypeIds = new ArrayList<String>(); } - return this.relatedLists; + return this.recordTypeIds; } } Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeLayoutResult.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeLayoutResult.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeLayoutResult.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -39,7 +39,7 @@ public class DescribeLayoutResult { @XmlElement(required = true) - protected List<DescribeLayout> layouts; + protected List<DescribeLayout2> layouts; protected List<RecordTypeMapping> recordTypeMappings; protected boolean recordTypeSelectorRequired; @@ -61,13 +61,13 @@ * * <p> * Objects of the following type(s) are allowed in the list - * {@link DescribeLayout } + * {@link DescribeLayout2 } * * */ - public List<DescribeLayout> getLayouts() { + public List<DescribeLayout2> getLayouts() { if (layouts == null) { - layouts = new ArrayList<DescribeLayout>(); + layouts = new ArrayList<DescribeLayout2>(); } return this.layouts; } Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSObjectResult.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSObjectResult.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSObjectResult.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -26,6 +26,7 @@ * &lt;element name="customSetting" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * &lt;element name="deletable" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * &lt;element name="deprecatedAndHidden" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * &lt;element name="feedEnabled" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * &lt;element name="fields" type="{urn:partner.soap.sforce.com}Field" maxOccurs="unbounded" minOccurs="0"/> * &lt;element name="keyPrefix" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="label" type="{http://www.w3.org/2001/XMLSchema}string"/> @@ -61,6 +62,7 @@ "customSetting", "deletable", "deprecatedAndHidden", + "feedEnabled", "fields", "keyPrefix", "label", @@ -89,6 +91,7 @@ protected boolean customSetting; protected boolean deletable; protected boolean deprecatedAndHidden; + protected boolean feedEnabled; @XmlElement(nillable = true) protected List<Field> fields; @XmlElement(required = true, nillable = true) @@ -242,6 +245,22 @@ } /** + * Gets the value of the feedEnabled property. + * + */ + public boolean isFeedEnabled() { + return feedEnabled; + } + + /** + * Sets the value of the feedEnabled property. + * + */ + public void setFeedEnabled(boolean value) { + this.feedEnabled = value; + } + + /** * Gets the value of the fields property. * * <p> Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSoftphoneLayoutCallType.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSoftphoneLayoutCallType.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSoftphoneLayoutCallType.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -21,6 +21,8 @@ * &lt;sequence> * &lt;element name="infoFields" type="{urn:partner.soap.sforce.com}DescribeSoftphoneLayoutInfoField" maxOccurs="unbounded"/> * &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="screenPopOptions" type="{urn:partner.soap.sforce.com}DescribeSoftphoneScreenPopOption" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="screenPopsOpenWithin" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * &lt;element name="sections" type="{urn:partner.soap.sforce.com}DescribeSoftphoneLayoutSection" maxOccurs="unbounded" minOccurs="0"/> * &lt;/sequence> * &lt;/restriction> @@ -34,6 +36,8 @@ @XmlType(name = "DescribeSoftphoneLayoutCallType", propOrder = { "infoFields", "name", + "screenPopOptions", + "screenPopsOpenWithin", "sections" }) public class DescribeSoftphoneLayoutCallType { @@ -42,6 +46,8 @@ protected List<DescribeSoftphoneLayoutInfoField> infoFields; @XmlElement(required = true) protected String name; + protected List<DescribeSoftphoneScreenPopOption> screenPopOptions; + protected String screenPopsOpenWithin; protected List<DescribeSoftphoneLayoutSection> sections; /** @@ -98,6 +104,59 @@ } /** + * Gets the value of the screenPopOptions property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the screenPopOptions property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getScreenPopOptions().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link DescribeSoftphoneScreenPopOption } + * + * + */ + public List<DescribeSoftphoneScreenPopOption> getScreenPopOptions() { + if (screenPopOptions == null) { + screenPopOptions = new ArrayList<DescribeSoftphoneScreenPopOption>(); + } + return this.screenPopOptions; + } + + /** + * Gets the value of the screenPopsOpenWithin property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScreenPopsOpenWithin() { + return screenPopsOpenWithin; + } + + /** + * Sets the value of the screenPopsOpenWithin property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScreenPopsOpenWithin(String value) { + this.screenPopsOpenWithin = value; + } + + /** * Gets the value of the sections property. * * <p> Copied: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSoftphoneScreenPopOption.java (from rev 3597, trunk/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSoftphoneScreenPopOption.java) =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSoftphoneScreenPopOption.java (rev 0) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DescribeSoftphoneScreenPopOption.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,118 @@ + +package com.sforce.soap.partner; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for DescribeSoftphoneScreenPopOption complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="DescribeSoftphoneScreenPopOption"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="matchType" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="screenPopData" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="screenPopType" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "DescribeSoftphoneScreenPopOption", propOrder = { + "matchType", + "screenPopData", + "screenPopType" +}) +public class DescribeSoftphoneScreenPopOption { + + @XmlElement(required = true) + protected String matchType; + @XmlElement(required = true) + protected String screenPopData; + @XmlElement(required = true) + protected String screenPopType; + + /** + * Gets the value of the matchType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMatchType() { + return matchType; + } + + /** + * Sets the value of the matchType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMatchType(String value) { + this.matchType = value; + } + + /** + * Gets the value of the screenPopData property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScreenPopData() { + return screenPopData; + } + + /** + * Sets the value of the screenPopData property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScreenPopData(String value) { + this.screenPopData = value; + } + + /** + * Gets the value of the screenPopType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getScreenPopType() { + return screenPopType; + } + + /** + * Sets the value of the screenPopType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setScreenPopType(String value) { + this.screenPopType = value; + } + +} Copied: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DisableFeedTrackingHeader.java (from rev 3597, trunk/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DisableFeedTrackingHeader.java) =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DisableFeedTrackingHeader.java (rev 0) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/DisableFeedTrackingHeader.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,54 @@ + +package com.sforce.soap.partner; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for anonymous complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="disableFeedTracking" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "disableFeedTracking" +}) +@XmlRootElement(name = "DisableFeedTrackingHeader") +public class DisableFeedTrackingHeader { + + protected boolean disableFeedTracking; + + /** + * Gets the value of the disableFeedTracking property. + * + */ + public boolean isDisableFeedTracking() { + return disableFeedTracking; + } + + /** + * Sets the value of the disableFeedTracking property. + * + */ + public void setDisableFeedTracking(boolean value) { + this.disableFeedTracking = value; + } + +} Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/Field.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/Field.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/Field.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -34,6 +34,7 @@ * &lt;element name="digits" type="{http://www.w3.org/2001/XMLSchema}int"/> * &lt;element name="externalId" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * &lt;element name="filterable" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * &lt;element name="groupable" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * &lt;element name="htmlFormatted" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * &lt;element name="idLookup" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * &lt;element name="inlineHelpText" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> @@ -81,6 +82,7 @@ "digits", "externalId", "filterable", + "groupable", "htmlFormatted", "idLookup", "inlineHelpText", @@ -121,6 +123,7 @@ protected int digits; protected Boolean externalId; protected boolean filterable; + protected boolean groupable; protected Boolean htmlFormatted; protected boolean idLookup; protected String inlineHelpText; @@ -431,6 +434,22 @@ } /** + * Gets the value of the groupable property. + * + */ + public boolean isGroupable() { + return groupable; + } + + /** + * Sets the value of the groupable property. + * + */ + public void setGroupable(boolean value) { + this.groupable = value; + } + + /** * Gets the value of the htmlFormatted property. * * @return Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/FieldType.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/FieldType.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/FieldType.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -34,6 +34,7 @@ * &lt;enumeration value="url"/> * &lt;enumeration value="email"/> * &lt;enumeration value="encryptedstring"/> + * &lt;enumeration value="datacategorygroupreference"/> * &lt;enumeration value="anyType"/> * &lt;/restriction> * &lt;/simpleType> @@ -84,6 +85,8 @@ EMAIL("email"), @XmlEnumValue("encryptedstring") ENCRYPTEDSTRING("encryptedstring"), + @XmlEnumValue("datacategorygroupreference") + DATACATEGORYGROUPREFERENCE("datacategorygroupreference"), @XmlEnumValue("anyType") ANY_TYPE("anyType"); private final String value; Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/GetUserInfoResult.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/GetUserInfoResult.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/GetUserInfoResult.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -19,6 +19,7 @@ * &lt;sequence> * &lt;element name="accessibilityMode" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * &lt;element name="currencySymbol" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="orgAttachmentFileSizeLimit" type="{http://www.w3.org/2001/XMLSchema}int"/> * &lt;element name="orgDefaultCurrencyIsoCode" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="orgDisallowHtmlAttachments" type="{http://www.w3.org/2001/XMLSchema}boolean"/> * &lt;element name="orgHasPersonAccounts" type="{http://www.w3.org/2001/XMLSchema}boolean"/> @@ -27,6 +28,7 @@ * &lt;element name="organizationName" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="profileId" type="{urn:partner.soap.sforce.com}ID"/> * &lt;element name="roleId" type="{urn:partner.soap.sforce.com}ID"/> + * &lt;element name="sessionSecondsValid" type="{http://www.w3.org/2001/XMLSchema}int"/> * &lt;element name="userDefaultCurrencyIsoCode" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="userEmail" type="{http://www.w3.org/2001/XMLSchema}string"/> * &lt;element name="userFullName" type="{http://www.w3.org/2001/XMLSchema}string"/> @@ -49,6 +51,7 @@ @XmlType(name = "GetUserInfoResult", propOrder = { "accessibilityMode", "currencySymbol", + "orgAttachmentFileSizeLimit", "orgDefaultCurrencyIsoCode", "orgDisallowHtmlAttachments", "orgHasPersonAccounts", @@ -57,6 +60,7 @@ "organizationName", "profileId", "roleId", + "sessionSecondsValid", "userDefaultCurrencyIsoCode", "userEmail", "userFullName", @@ -73,6 +77,7 @@ protected boolean accessibilityMode; @XmlElement(required = true, nillable = true) protected String currencySymbol; + protected int orgAttachmentFileSizeLimit; @XmlElement(required = true, nillable = true) protected String orgDefaultCurrencyIsoCode; protected boolean orgDisallowHtmlAttachments; @@ -86,6 +91,7 @@ protected String profileId; @XmlElement(required = true, nillable = true) protected String roleId; + protected int sessionSecondsValid; @XmlElement(required = true, nillable = true) protected String userDefaultCurrencyIsoCode; @XmlElement(required = true) @@ -148,6 +154,22 @@ } /** + * Gets the value of the orgAttachmentFileSizeLimit property. + * + */ + public int getOrgAttachmentFileSizeLimit() { + return orgAttachmentFileSizeLimit; + } + + /** + * Sets the value of the orgAttachmentFileSizeLimit property. + * + */ + public void setOrgAttachmentFileSizeLimit(int value) { + this.orgAttachmentFileSizeLimit = value; + } + + /** * Gets the value of the orgDefaultCurrencyIsoCode property. * * @return @@ -316,6 +338,22 @@ } /** + * Gets the value of the sessionSecondsValid property. + * + */ + public int getSessionSecondsValid() { + return sessionSecondsValid; + } + + /** + * Sets the value of the sessionSecondsValid property. + * + */ + public void setSessionSecondsValid(int value) { + this.sessionSecondsValid = value; + } + + /** * Gets the value of the userDefaultCurrencyIsoCode property. * * @return Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidFieldFault.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidFieldFault.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidFieldFault.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -5,15 +5,15 @@ /** - * This class was generated by Apache CXF 2.2.5 - * Thu Apr 01 14:35:01 EDT 2010 - * Generated source version: 2.2.5 + * This class was generated by Apache CXF 2.2.12 + * Thu Sep 01 08:54:15 CDT 2011 + * Generated source version: 2.2.12 * */ @WebFault(name = "InvalidFieldFault", targetNamespace = "urn:fault.partner.soap.sforce.com") public class InvalidFieldFault extends Exception { - public static final long serialVersionUID = 20100401143501L; + public static final long serialVersionUID = 20110901085415L; private com.sforce.soap.partner.fault.InvalidFieldFault invalidFieldFault; Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidIdFault.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidIdFault.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidIdFault.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -5,15 +5,15 @@ /** - * This class was generated by Apache CXF 2.2.5 - * Thu Apr 01 14:35:01 EDT 2010 - * Generated source version: 2.2.5 + * This class was generated by Apache CXF 2.2.12 + * Thu Sep 01 08:54:15 CDT 2011 + * Generated source version: 2.2.12 * */ @WebFault(name = "InvalidIdFault", targetNamespace = "urn:fault.partner.soap.sforce.com") public class InvalidIdFault extends Exception { - public static final long serialVersionUID = 20100401143501L; + public static final long serialVersionUID = 20110901085415L; private com.sforce.soap.partner.fault.InvalidIdFault invalidIdFault; Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidNewPasswordFault.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidNewPasswordFault.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidNewPasswordFault.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -5,15 +5,15 @@ /** - * This class was generated by Apache CXF 2.2.5 - * Thu Apr 01 14:35:01 EDT 2010 - * Generated source version: 2.2.5 + * This class was generated by Apache CXF 2.2.12 + * Thu Sep 01 08:54:15 CDT 2011 + * Generated source version: 2.2.12 * */ @WebFault(name = "InvalidNewPasswordFault", targetNamespace = "urn:fault.partner.soap.sforce.com") public class InvalidNewPasswordFault extends Exception { - public static final long serialVersionUID = 20100401143501L; + public static final long serialVersionUID = 20110901085415L; private com.sforce.soap.partner.fault.InvalidNewPasswordFault invalidNewPasswordFault; Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidQueryLocatorFault.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidQueryLocatorFault.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidQueryLocatorFault.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -5,15 +5,15 @@ /** - * This class was generated by Apache CXF 2.2.5 - * Thu Apr 01 14:35:01 EDT 2010 - * Generated source version: 2.2.5 + * This class was generated by Apache CXF 2.2.12 + * Thu Sep 01 08:54:15 CDT 2011 + * Generated source version: 2.2.12 * */ @WebFault(name = "InvalidQueryLocatorFault", targetNamespace = "urn:fault.partner.soap.sforce.com") public class InvalidQueryLocatorFault extends Exception { - public static final long serialVersionUID = 20100401143501L; + public static final long serialVersionUID = 20110901085415L; private com.sforce.soap.partner.fault.InvalidQueryLocatorFault invalidQueryLocatorFault; Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidSObjectFault.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidSObjectFault.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/InvalidSObjectFault.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -5,15 +5,15 @@ /** - * This class was generated by Apache CXF 2.2.5 - * Thu Apr 01 14:35:01 EDT 2010 - * Generated source version: 2.2.5 + * This class was generated by Apache CXF 2.2.12 + * Thu Sep 01 08:54:15 CDT 2011 + * Generated source version: 2.2.12 * */ @WebFault(name = "InvalidSObjectFault", targetNamespace = "urn:fault.partner.soap.sforce.com") public class InvalidSObjectFault extends Exception { - public static final long serialVersionUID = 20100401143501L; + public static final long serialVersionUID = 20110901085415L; private com.sforce.soap.partner.fault.InvalidSObjectFault invalidSObjectFault; Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/LoginFault.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/LoginFault.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/LoginFault.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -5,15 +5,15 @@ /** - * This class was generated by Apache CXF 2.2.5 - * Thu Apr 01 14:35:01 EDT 2010 - * Generated source version: 2.2.5 + * This class was generated by Apache CXF 2.2.12 + * Thu Sep 01 08:54:15 CDT 2011 + * Generated source version: 2.2.12 * */ @WebFault(name = "LoginFault", targetNamespace = "urn:fault.partner.soap.sforce.com") public class LoginFault extends Exception { - public static final long serialVersionUID = 20100401143501L; + public static final long serialVersionUID = 20110901085415L; private com.sforce.soap.partner.fault.LoginFault loginFault; Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/MalformedQueryFault.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/MalformedQueryFault.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/MalformedQueryFault.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -5,15 +5,15 @@ /** - * This class was generated by Apache CXF 2.2.5 - * Thu Apr 01 14:35:01 EDT 2010 - * Generated source version: 2.2.5 + * This class was generated by Apache CXF 2.2.12 + * Thu Sep 01 08:54:15 CDT 2011 + * Generated source version: 2.2.12 * */ @WebFault(name = "MalformedQueryFault", targetNamespace = "urn:fault.partner.soap.sforce.com") public class MalformedQueryFault extends Exception { - public static final long serialVersionUID = 20100401143501L; + public static final long serialVersionUID = 20110901085415L; private com.sforce.soap.partner.fault.MalformedQueryFault malformedQueryFault; Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/MalformedSearchFault.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/MalformedSearchFault.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/MalformedSearchFault.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -5,15 +5,15 @@ /** - * This class was generated by Apache CXF 2.2.5 - * Thu Apr 01 14:35:01 EDT 2010 - * Generated source version: 2.2.5 + * This class was generated by Apache CXF 2.2.12 + * Thu Sep 01 08:54:15 CDT 2011 + * Generated source version: 2.2.12 * */ @WebFault(name = "MalformedSearchFault", targetNamespace = "urn:fault.partner.soap.sforce.com") public class MalformedSearchFault extends Exception { - public static final long serialVersionUID = 20100401143501L; + public static final long serialVersionUID = 20110901085415L; private com.sforce.soap.partner.fault.MalformedSearchFault malformedSearchFault; Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/ObjectFactory.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/ObjectFactory.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/ObjectFactory.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -24,11 +24,11 @@ @XmlRegistry public class ObjectFactory { + private final static QName _EmailFileAttachmentContentType_QNAME = new QName("urn:partner.soap.sforce.com", "contentType"); + private final static QName _EmailFileAttachmentBody_QNAME = new QName("urn:partner.soap.sforce.com", "body"); private final static QName _SingleEmailMessageOrgWideEmailAddressId_QNAME = new QName("urn:partner.soap.sforce.com", "orgWideEmailAddressId"); private final static QName _SingleEmailMessageInReplyTo_QNAME = new QName("urn:partner.soap.sforce.com", "inReplyTo"); private final static QName _SingleEmailMessageReferences_QNAME = new QName("urn:partner.soap.sforce.com", "references"); - private final static QName _EmailFileAttachmentContentType_QNAME = new QName("urn:partner.soap.sforce.com", "contentType"); - private final static QName _EmailFileAttachmentBody_QNAME = new QName("urn:partner.soap.sforce.com", "body"); /** * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.sforce.soap.partner @@ -38,158 +38,166 @@ } /** - * Create an instance of {@link Merge } + * Create an instance of {@link GetUserInfoResponse } * */ - public Merge createMerge() { - return new Merge(); + public GetUserInfoResponse createGetUserInfoResponse() { + return new GetUserInfoResponse(); } /** - * Create an instance of {@link CallOptions } + * Create an instance of {@link Retrieve } * */ - public CallOptions createCallOptions() { - return new CallOptions(); + public Retrieve createRetrieve() { + return new Retrieve(); } /** - * Create an instance of {@link LeadConvertResult } + * Create an instance of {@link SearchResult } * */ - public LeadConvertResult createLeadConvertResult() { - return new LeadConvertResult(); + public SearchResult createSearchResult() { + return new SearchResult(); } /** - * Create an instance of {@link SearchResult } + * Create an instance of {@link PackageVersionHeader } * */ - public SearchResult createSearchResult() { - return new SearchResult(); + public PackageVersionHeader createPackageVersionHeader() { + return new PackageVersionHeader(); } /** - * Create an instance of {@link ProcessRequest } + * Create an instance of {@link ProcessWorkitemRequest } * */ - public ProcessRequest createProcessRequest() { - return new ProcessRequest(); + public ProcessWorkitemRequest createProcessWorkitemRequest() { + return new ProcessWorkitemRequest(); } /** - * Create an instance of {@link DeleteResult } + * Create an instance of {@link SingleEmailMessage } * */ - public DeleteResult createDeleteResult() { - return new DeleteResult(); + public SingleEmailMessage createSingleEmailMessage() { + return new SingleEmailMessage(); } /** - * Create an instance of {@link DescribeTab } + * Create an instance of {@link Field } * */ - public DescribeTab createDescribeTab() { - return new DescribeTab(); + public Field createField() { + return new Field(); } /** - * Create an instance of {@link DescribeLayoutResult } + * Create an instance of {@link ChildRelationship } * */ - public DescribeLayoutResult createDescribeLayoutResult() { - return new DescribeLayoutResult(); + public ChildRelationship createChildRelationship() { + return new ChildRelationship(); } /** - * Create an instance of {@link Retrieve } + * Create an instance of {@link DescribeTab } * */ - public Retrieve createRetrieve() { - return new Retrieve(); + public DescribeTab createDescribeTab() { + return new DescribeTab(); } /** - * Create an instance of {@link Delete } + * Create an instance of {@link ProcessSubmitRequest } * */ - public Delete createDelete() { - return new Delete(); + public ProcessSubmitRequest createProcessSubmitRequest() { + return new ProcessSubmitRequest(); } /** - * Create an instance of {@link DescribeTabSetResult } + * Create an instance of {@link RecordTypeMapping } * */ - public DescribeTabSetResult createDescribeTabSetResult() { - return new DescribeTabSetResult(); + public RecordTypeMapping createRecordTypeMapping() { + return new RecordTypeMapping(); } /** - * Create an instance of {@link Update } + * Create an instance of {@link DescribeDataCategoryGroupStructures } * */ - public Update createUpdate() { - return new Update(); + public DescribeDataCategoryGroupStructures createDescribeDataCategoryGroupStructures() { + return new DescribeDataCategoryGroupStructures(); } /** - * Create an instance of {@link Login } + * Create an instance of {@link SetPassword } * */ - public Login createLogin() { - return new Login(); + public SetPassword createSetPassword() { + return new SetPassword(); } /** - * Create an instance of {@link DescribeSObjectResponse } + * Create an instance of {@link DescribeSoftphoneLayoutItem } * */ - public DescribeSObjectResponse createDescribeSObjectResponse() { - return new DescribeSObjectResponse(); + public DescribeSoftphoneLayoutItem createDescribeSoftphoneLayoutItem() { + return new DescribeSoftphoneLayoutItem(); } /** - * Create an instance of {@link QueryAll } + * Create an instance of {@link QueryOptions } * */ - public QueryAll createQueryAll() { - return new QueryAll(); + public QueryOptions createQueryOptions() { + return new QueryOptions(); } /** - * Create an instance of {@link Error } + * Create an instance of {@link DescribeLayoutButtonSection } * */ - public Error createError() { - return new Error(); + public DescribeLayoutButtonSection createDescribeLayoutButtonSection() { + return new DescribeLayoutButtonSection(); } /** - * Create an instance of {@link LogoutResponse } + * Create an instance of {@link GetServerTimestampResult } * */ - public LogoutResponse createLogoutResponse() { - return new LogoutResponse(); + public GetServerTimestampResult createGetServerTimestampResult() { + return new GetServerTimestampResult(); } /** - * Create an instance of {@link SingleEmailMessage } + * Create an instance of {@link LoginResult } * */ - public SingleEmailMessage createSingleEmailMessage() { - return new SingleEmailMessage(); + public LoginResult createLoginResult() { + return new LoginResult(); } /** - * Create an instance of {@link UserTerritoryDeleteHeader } + * Create an instance of {@link DescribeSoftphoneLayout } * */ - public UserTerritoryDeleteHeader createUserTerritoryDeleteHeader() { - return new UserTerritoryDeleteHeader(); + public DescribeSoftphoneLayout createDescribeSoftphoneLayout() { + return new DescribeSoftphoneLayout(); } /** + * Create an instance of {@link InvalidateSessions } + * + */ + public InvalidateSessions createInvalidateSessions() { + return new InvalidateSessions(); + } + + /** * Create an instance of {@link DescribeLayoutRow } * */ @@ -198,307 +206,307 @@ } /** - * Create an instance of {@link GetServerTimestampResult } + * Create an instance of {@link MassEmailMessage } * */ - public GetServerTimestampResult createGetServerTimestampResult() { - return new GetServerTimestampResult(); + public MassEmailMessage createMassEmailMessage() { + return new MassEmailMessage(); } /** - * Create an instance of {@link DebuggingInfo } + * Create an instance of {@link Query } * */ - public DebuggingInfo createDebuggingInfo() { - return new DebuggingInfo(); + public Query createQuery() { + return new Query(); } /** - * Create an instance of {@link PicklistEntry } + * Create an instance of {@link DataCategoryGroupSobjectTypePair } * */ - public PicklistEntry createPicklistEntry() { - return new PicklistEntry(); + public DataCategoryGroupSobjectTypePair createDataCategoryGroupSobjectTypePair() { + return new DataCategoryGroupSobjectTypePair(); } /** - * Create an instance of {@link DescribeSObjectsResponse } + * Create an instance of {@link CreateResponse } * */ - public DescribeSObjectsResponse createDescribeSObjectsResponse() { - return new DescribeSObjectsResponse(); + public CreateResponse createCreateResponse() { + return new CreateResponse(); } /** - * Create an instance of {@link DescribeSoftphoneLayoutItem } + * Create an instance of {@link LogoutResponse } * */ - public DescribeSoftphoneLayoutItem createDescribeSoftphoneLayoutItem() { - return new DescribeSoftphoneLayoutItem(); + public LogoutResponse createLogoutResponse() { + return new LogoutResponse(); } /** - * Create an instance of {@link RecordTypeMapping } + * Create an instance of {@link DescribeDataCategoryGroupResult } * */ - public RecordTypeMapping createRecordTypeMapping() { - return new RecordTypeMapping(); + public DescribeDataCategoryGroupResult createDescribeDataCategoryGroupResult() { + return new DescribeDataCategoryGroupResult(); } /** - * Create an instance of {@link DescribeGlobalSObjectResult } + * Create an instance of {@link SaveResult } * */ - public DescribeGlobalSObjectResult createDescribeGlobalSObjectResult() { - return new DescribeGlobalSObjectResult(); + public SaveResult createSaveResult() { + return new SaveResult(); } /** - * Create an instance of {@link LoginResult } + * Create an instance of {@link Create } * */ - public LoginResult createLoginResult() { - return new LoginResult(); + public Create createCreate() { + return new Create(); } /** - * Create an instance of {@link GetUserInfoResponse } + * Create an instance of {@link SendEmail } * */ - public GetUserInfoResponse createGetUserInfoResponse() { - return new GetUserInfoResponse(); + public SendEmail createSendEmail() { + return new SendEmail(); } /** - * Create an instance of {@link Undelete } + * Create an instance of {@link MergeResponse } * */ - public Undelete createUndelete() { - return new Undelete(); + public MergeResponse createMergeResponse() { + return new MergeResponse(); } /** - * Create an instance of {@link Logout } + * Create an instance of {@link DescribeTabSetResult } * */ - public Logout createLogout() { - return new Logout(); + public DescribeTabSetResult createDescribeTabSetResult() { + return new DescribeTabSetResult(); } /** - * Create an instance of {@link UpsertResponse } + * Create an instance of {@link DescribeSoftphoneLayoutSection } * */ - public UpsertResponse createUpsertResponse() { - return new UpsertResponse(); + public DescribeSoftphoneLayoutSection createDescribeSoftphoneLayoutSection() { + return new DescribeSoftphoneLayoutSection(); } /** - * Create an instance of {@link RecordTypeInfo } + * Create an instance of {@link DescribeGlobalResult } * */ - public RecordTypeInfo createRecordTypeInfo() { - return new RecordTypeInfo(); + public DescribeGlobalResult createDescribeGlobalResult() { + return new DescribeGlobalResult(); } /** - * Create an instance of {@link LeadConvert } + * Create an instance of {@link DescribeGlobalResponse } * */ - public LeadConvert createLeadConvert() { - return new LeadConvert(); + public DescribeGlobalResponse createDescribeGlobalResponse() { + return new DescribeGlobalResponse(); } /** - * Create an instance of {@link ResetPasswordResult } + * Create an instance of {@link RecordTypeInfo } * */ - public ResetPasswordResult createResetPasswordResult() { - return new ResetPasswordResult(); + public RecordTypeInfo createRecordTypeInfo() { + return new RecordTypeInfo(); } /** - * Create an instance of {@link ProcessSubmitRequest } + * Create an instance of {@link MergeResult } * */ - public ProcessSubmitRequest createProcessSubmitRequest() { - return new ProcessSubmitRequest(); + public MergeResult createMergeResult() { + return new MergeResult(); } /** - * Create an instance of {@link MruHeader } + * Create an instance of {@link QueryAll } * */ - public MruHeader createMruHeader() { - return new MruHeader(); + public QueryAll createQueryAll() { + return new QueryAll(); } /** - * Create an instance of {@link EmptyRecycleBin } + * Create an instance of {@link DebuggingInfo } * */ - public EmptyRecycleBin createEmptyRecycleBin() { - return new EmptyRecycleBin(); + public DebuggingInfo createDebuggingInfo() { + return new DebuggingInfo(); } /** - * Create an instance of {@link MergeResponse } + * Create an instance of {@link ProcessResponse } * */ - public MergeResponse createMergeResponse() { - return new MergeResponse(); + public ProcessResponse createProcessResponse() { + return new ProcessResponse(); } /** - * Create an instance of {@link ResetPassword } + * Create an instance of {@link UserTerritoryDeleteHeader } * */ - public ResetPassword createResetPassword() { - return new ResetPassword(); + public UserTerritoryDeleteHeader createUserTerritoryDeleteHeader() { + return new UserTerritoryDeleteHeader(); } /** - * Create an instance of {@link DeleteResponse } + * Create an instance of {@link Upsert } * */ - public DeleteResponse createDeleteResponse() { - return new DeleteResponse(); + public Upsert createUpsert() { + return new Upsert(); } /** - * Create an instance of {@link DescribeLayoutButton } + * Create an instance of {@link Search } * */ - public DescribeLayoutButton createDescribeLayoutButton() { - return new DescribeLayoutButton(); + public Search createSearch() { + return new Search(); } /** - * Create an instance of {@link SetPasswordResult } + * Create an instance of {@link QueryMore } * */ - public SetPasswordResult createSetPasswordResult() { - return new SetPasswordResult(); + public QueryMore createQueryMore() { + return new QueryMore(); } /** - * Create an instance of {@link ProcessResponse } + * Create an instance of {@link GetUpdatedResponse } * */ - public ProcessResponse createProcessResponse() { - return new ProcessResponse(); + public GetUpdatedResponse createGetUpdatedResponse() { + return new GetUpdatedResponse(); } /** - * Create an instance of {@link DebuggingHeader } + * Create an instance of {@link Merge } * */ - public DebuggingHeader createDebuggingHeader() { - return new DebuggingHeader(); + public Merge createMerge() { + return new Merge(); } /** - * Create an instance of {@link Upsert } + * Create an instance of {@link Delete } * */ - public Upsert createUpsert() { - return new Upsert(); + public Delete createDelete() { + return new Delete(); } /** - * Create an instance of {@link GetDeletedResult } + * Create an instance of {@link SetPasswordResponse } * */ - public GetDeletedResult createGetDeletedResult() { - return new GetDeletedResult(); + public SetPasswordResponse createSetPasswordResponse() { + return new SetPasswordResponse(); } /** - * Create an instance of {@link DescribeLayoutComponent } + * Create an instance of {@link QueryResult } * */ - public DescribeLayoutComponent createDescribeLayoutComponent() { - return new DescribeLayoutComponent(); + public QueryResult createQueryResult() { + return new QueryResult(); } /** - * Create an instance of {@link SearchResponse } + * Create an instance of {@link EmailFileAttachment } * */ - public SearchResponse createSearchResponse() { - return new SearchResponse(); + public EmailFileAttachment createEmailFileAttachment() { + return new EmailFileAttachment(); } /** - * Create an instance of {@link RelatedListSort } + * Create an instance of {@link DescribeLayoutSection } * */ - public RelatedListSort createRelatedListSort() { - return new RelatedListSort(); + public DescribeLayoutSection createDescribeLayoutSection() { + return new DescribeLayoutSection(); } /** - * Create an instance of {@link SearchRecord } + * Create an instance of {@link ConvertLeadResponse } * */ - public SearchRecord createSearchRecord() { - return new SearchRecord(); + public ConvertLeadResponse createConvertLeadResponse() { + return new ConvertLeadResponse(); } /** - * Create an instance of {@link MassEmailMessage } + * Create an instance of {@link QueryResponse } * */ - public MassEmailMessage createMassEmailMessage() { - return new MassEmailMessage(); + public QueryResponse createQueryResponse() { + return new QueryResponse(); } /** - * Create an instance of {@link DescribeLayoutButtonSection } + * Create an instance of {@link EmptyRecycleBin } * */ - public DescribeLayoutButtonSection createDescribeLayoutButtonSection() { - return new DescribeLayoutButtonSection(); + public EmptyRecycleBin createEmptyRecycleBin() { + return new EmptyRecycleBin(); } /** - * Create an instance of {@link DescribeLayout } + * Create an instance of {@link LeadConvertResult } * */ - public DescribeLayout createDescribeLayout() { - return new DescribeLayout(); + public LeadConvertResult createLeadConvertResult() { + return new LeadConvertResult(); } /** - * Create an instance of {@link GetUpdatedResponse } + * Create an instance of {@link EmptyRecycleBinResponse } * */ - public GetUpdatedResponse createGetUpdatedResponse() { - return new GetUpdatedResponse(); + public EmptyRecycleBinResponse createEmptyRecycleBinResponse() { + return new EmptyRecycleBinResponse(); } /** - * Create an instance of {@link SendEmailResult } + * Create an instance of {@link GetUserInfo } * */ - public SendEmailResult createSendEmailResult() { - return new SendEmailResult(); + public GetUserInfo createGetUserInfo() { + return new GetUserInfo(); } /** - * Create an instance of {@link DescribeGlobalResponse } + * Create an instance of {@link UpsertResult } * */ - public DescribeGlobalResponse createDescribeGlobalResponse() { - return new DescribeGlobalResponse(); + public UpsertResult createUpsertResult() { + return new UpsertResult(); } /** - * Create an instance of {@link InvalidateSessionsResult } + * Create an instance of {@link InvalidateSessionsResponse } * */ - public InvalidateSessionsResult createInvalidateSessionsResult() { - return new InvalidateSessionsResult(); + public InvalidateSessionsResponse createInvalidateSessionsResponse() { + return new InvalidateSessionsResponse(); } /** @@ -510,35 +518,35 @@ } /** - * Create an instance of {@link QueryMore } + * Create an instance of {@link MergeRequest } * */ - public QueryMore createQueryMore() { - return new QueryMore(); + public MergeRequest createMergeRequest() { + return new MergeRequest(); } /** - * Create an instance of {@link InvalidateSessionsResponse } + * Create an instance of {@link DescribeSoftphoneLayoutCallType } * */ - public InvalidateSessionsResponse createInvalidateSessionsResponse() { - return new InvalidateSessionsResponse(); + public DescribeSoftphoneLayoutCallType createDescribeSoftphoneLayoutCallType() { + return new DescribeSoftphoneLayoutCallType(); } /** - * Create an instance of {@link DescribeSoftphoneLayoutResponse } + * Create an instance of {@link LoginResponse } * */ - public DescribeSoftphoneLayoutResponse createDescribeSoftphoneLayoutResponse() { - return new DescribeSoftphoneLayoutResponse(); + public LoginResponse createLoginResponse() { + return new LoginResponse(); } /** - * Create an instance of {@link SetPassword } + * Create an instance of {@link DescribeLayoutComponent } * */ - public SetPassword createSetPassword() { - return new SetPassword(); + public DescribeLayoutComponent createDescribeLayoutComponent() { + return new DescribeLayoutComponent(); } /** @@ -550,182 +558,254 @@ } /** - * Create an instance of {@link QueryOptions } + * Create an instance of {@link LeadConvert } * */ - public QueryOptions createQueryOptions() { - return new QueryOptions(); + public LeadConvert createLeadConvert() { + return new LeadConvert(); } /** - * Create an instance of {@link DescribeGlobal } + * Create an instance of {@link DeleteResult } * */ - public DescribeGlobal createDescribeGlobal() { - return new DescribeGlobal(); + public DeleteResult createDeleteResult() { + return new DeleteResult(); } /** - * Create an instance of {@link SendEmail } + * Create an instance of {@link DeletedRecord } * */ - public SendEmail createSendEmail() { - return new SendEmail(); + public DeletedRecord createDeletedRecord() { + return new DeletedRecord(); } /** - * Create an instance of {@link DescribeSoftphoneLayoutResult } + * Create an instance of {@link ConvertLead } * */ - public DescribeSoftphoneLayoutResult createDescribeSoftphoneLayoutResult() { - return new DescribeSoftphoneLayoutResult(); + public ConvertLead createConvertLead() { + return new ConvertLead(); } /** - * Create an instance of {@link Search } + * Create an instance of {@link SetPasswordResult } * */ - public Search createSearch() { - return new Search(); + public SetPasswordResult createSetPasswordResult() { + return new SetPasswordResult(); } /** - * Create an instance of {@link DescribeLayoutItem } + * Create an instance of {@link GetServerTimestamp } * */ - public DescribeLayoutItem createDescribeLayoutItem() { - return new DescribeLayoutItem(); + public GetServerTimestamp createGetServerTimestamp() { + return new GetServerTimestamp(); } /** - * Create an instance of {@link DescribeSObjectResult } + * Create an instance of {@link SendEmailResult } * */ - public DescribeSObjectResult createDescribeSObjectResult() { - return new DescribeSObjectResult(); + public SendEmailResult createSendEmailResult() { + return new SendEmailResult(); } /** - * Create an instance of {@link ProcessResult } + * Create an instance of {@link DescribeSObjectResponse } * */ - public ProcessResult createProcessResult() { - return new ProcessResult(); + public DescribeSObjectResponse createDescribeSObjectResponse() { + return new DescribeSObjectResponse(); } /** - * Create an instance of {@link InvalidateSessions } + * Create an instance of {@link EmptyRecycleBinResult } * */ - public InvalidateSessions createInvalidateSessions() { - return new InvalidateSessions(); + public EmptyRecycleBinResult createEmptyRecycleBinResult() { + return new EmptyRecycleBinResult(); } /** - * Create an instance of {@link PackageVersionHeader } + * Create an instance of {@link DescribeDataCategoryGroupStructuresResponse } * */ - public PackageVersionHeader createPackageVersionHeader() { - return new PackageVersionHeader(); + public DescribeDataCategoryGroupStructuresResponse createDescribeDataCategoryGroupStructuresResponse() { + return new DescribeDataCategoryGroupStructuresResponse(); } /** - * Create an instance of {@link DescribeTabsResponse } + * Create an instance of {@link DisableFeedTrackingHeader } * */ - public DescribeTabsResponse createDescribeTabsResponse() { - return new DescribeTabsResponse(); + public DisableFeedTrackingHeader createDisableFeedTrackingHeader() { + return new DisableFeedTrackingHeader(); } /** - * Create an instance of {@link SendEmailResponse } + * Create an instance of {@link DescribeLayout2 } * */ - public SendEmailResponse createSendEmailResponse() { - return new SendEmailResponse(); + public DescribeLayout2 createDescribeLayout2() { + return new DescribeLayout2(); } /** - * Create an instance of {@link PicklistForRecordType } + * Create an instance of {@link GetUpdatedResult } * */ - public PicklistForRecordType createPicklistForRecordType() { - return new PicklistForRecordType(); + public GetUpdatedResult createGetUpdatedResult() { + return new GetUpdatedResult(); } /** - * Create an instance of {@link AllowFieldTruncationHeader } + * Create an instance of {@link Update } * */ - public AllowFieldTruncationHeader createAllowFieldTruncationHeader() { - return new AllowFieldTruncationHeader(); + public Update createUpdate() { + return new Update(); } /** - * Create an instance of {@link UpdateResponse } + * Create an instance of {@link RetrieveResponse } * */ - public UpdateResponse createUpdateResponse() { - return new UpdateResponse(); + public RetrieveResponse createRetrieveResponse() { + return new RetrieveResponse(); } /** - * Create an instance of {@link QueryResponse } + * Create an instance of {@link RelatedList } * */ - public QueryResponse createQueryResponse() { - return new QueryResponse(); + public RelatedList createRelatedList() { + return new RelatedList(); } /** - * Create an instance of {@link DescribeSoftphoneLayoutSection } + * Create an instance of {@link GetDeleted } * */ - public DescribeSoftphoneLayoutSection createDescribeSoftphoneLayoutSection() { - return new DescribeSoftphoneLayoutSection(); + public GetDeleted createGetDeleted() { + return new GetDeleted(); } /** - * Create an instance of {@link CreateResponse } + * Create an instance of {@link UndeleteResult } * */ - public CreateResponse createCreateResponse() { - return new CreateResponse(); + public UndeleteResult createUndeleteResult() { + return new UndeleteResult(); } /** - * Create an instance of {@link QueryResult } + * Create an instance of {@link Error } * */ - public QueryResult createQueryResult() { - return new QueryResult(); + public Error createError() { + return new Error(); } /** - * Create an instance of {@link SaveResult } + * Create an instance of {@link DebuggingHeader } * */ - public SaveResult createSaveResult() { - return new SaveResult(); + public DebuggingHeader createDebuggingHeader() { + return new DebuggingHeader(); } /** - * Create an instance of {@link DescribeSObject } + * Create an instance of {@link DescribeDataCategoryGroupStructureResult } * */ - public DescribeSObject createDescribeSObject() { - return new DescribeSObject(); + public DescribeDataCategoryGroupStructureResult createDescribeDataCategoryGroupStructureResult() { + return new DescribeDataCategoryGroupStructureResult(); } /** - * Create an instance of {@link Process } + * Create an instance of {@link UndeleteResponse } * */ - public Process createProcess() { - return new Process(); + public UndeleteResponse createUndeleteResponse() { + return new UndeleteResponse(); } /** + * Create an instance of {@link PicklistForRecordType } + * + */ + public PicklistForRecordType createPicklistForRecordType() { + return new PicklistForRecordType(); + } + + /** + * Create an instance of {@link DescribeSoftphoneLayoutInfoField } + * + */ + public DescribeSoftphoneLayoutInfoField createDescribeSoftphoneLayoutInfoField() { + return new DescribeSoftphoneLayoutInfoField(); + } + + /** + * Create an instance of {@link DescribeLayoutResult } + * + */ + public DescribeLayoutResult createDescribeLayoutResult() { + return new DescribeLayoutResult(); + } + + /** + * Create an instance of {@link DescribeSoftphoneLayoutResult } + * + */ + public DescribeSoftphoneLayoutResult createDescribeSoftphoneLayoutResult() { + return new DescribeSoftphoneLayoutResult(); + } + + /** + * Create an instance of {@link DescribeLayoutButton } + * + */ + public DescribeLayoutButton createDescribeLayoutButton() { + return new DescribeLayoutButton(); + } + + /** + * Create an instance of {@link DeleteResponse } + * + */ + public DeleteResponse createDeleteResponse() { + return new DeleteResponse(); + } + + /** + * Create an instance of {@link MruHeader } + * + */ + public MruHeader createMruHeader() { + return new MruHeader(); + } + + /** + * Create an instance of {@link SendEmailResponse } + * + */ + public SendEmailResponse createSendEmailResponse() { + return new SendEmailResponse(); + } + + /** + * Create an instance of {@link GetUpdated } + * + */ + public GetUpdated createGetUpdated() { + return new GetUpdated(); + } + + /** * Create an instance of {@link AssignmentRuleHeader } * */ @@ -734,179 +814,179 @@ } /** - * Create an instance of {@link GetServerTimestamp } + * Create an instance of {@link GetUserInfoResult } * */ - public GetServerTimestamp createGetServerTimestamp() { - return new GetServerTimestamp(); + public GetUserInfoResult createGetUserInfoResult() { + return new GetUserInfoResult(); } /** - * Create an instance of {@link ConvertLeadResponse } + * Create an instance of {@link ResetPasswordResult } * */ - public ConvertLeadResponse createConvertLeadResponse() { - return new ConvertLeadResponse(); + public ResetPasswordResult createResetPasswordResult() { + return new ResetPasswordResult(); } /** - * Create an instance of {@link Query } + * Create an instance of {@link ProcessResult } * */ - public Query createQuery() { - return new Query(); + public ProcessResult createProcessResult() { + return new ProcessResult(); } /** - * Create an instance of {@link GetUserInfo } + * Create an instance of {@link InvalidateSessionsResult } * */ - public GetUserInfo createGetUserInfo() { - return new GetUserInfo(); + public InvalidateSessionsResult createInvalidateSessionsResult() { + return new InvalidateSessionsResult(); } /** - * Create an instance of {@link GetDeletedResponse } + * Create an instance of {@link SessionHeader } * */ - public GetDeletedResponse createGetDeletedResponse() { - return new GetDeletedResponse(); + public SessionHeader createSessionHeader() { + return new SessionHeader(); } /** - * Create an instance of {@link Create } + * Create an instance of {@link RelatedListColumn } * */ - public Create createCreate() { - return new Create(); + public RelatedListColumn createRelatedListColumn() { + return new RelatedListColumn(); } /** - * Create an instance of {@link MergeResult } + * Create an instance of {@link Login } * */ - public MergeResult createMergeResult() { - return new MergeResult(); + public Login createLogin() { + return new Login(); } /** - * Create an instance of {@link DescribeSoftphoneLayoutCallType } + * Create an instance of {@link SendEmailError } * */ - public DescribeSoftphoneLayoutCallType createDescribeSoftphoneLayoutCallType() { - return new DescribeSoftphoneLayoutCallType(); + public SendEmailError createSendEmailError() { + return new SendEmailError(); } /** - * Create an instance of {@link DeletedRecord } + * Create an instance of {@link GetServerTimestampResponse } * */ - public DeletedRecord createDeletedRecord() { - return new DeletedRecord(); + public GetServerTimestampResponse createGetServerTimestampResponse() { + return new GetServerTimestampResponse(); } /** - * Create an instance of {@link GetUpdated } + * Create an instance of {@link CallOptions } * */ - public GetUpdated createGetUpdated() { - return new GetUpdated(); + public CallOptions createCallOptions() { + return new CallOptions(); } /** - * Create an instance of {@link GetDeleted } + * Create an instance of {@link DataCategory } * */ - public GetDeleted createGetDeleted() { - return new GetDeleted(); + public DataCategory createDataCategory() { + return new DataCategory(); } /** - * Create an instance of {@link DescribeSoftphoneLayout } + * Create an instance of {@link QueryAllResponse } * */ - public DescribeSoftphoneLayout createDescribeSoftphoneLayout() { - return new DescribeSoftphoneLayout(); + public QueryAllResponse createQueryAllResponse() { + return new QueryAllResponse(); } /** - * Create an instance of {@link EmptyRecycleBinResponse } + * Create an instance of {@link DescribeGlobalSObjectResult } * */ - public EmptyRecycleBinResponse createEmptyRecycleBinResponse() { - return new EmptyRecycleBinResponse(); + public DescribeGlobalSObjectResult createDescribeGlobalSObjectResult() { + return new DescribeGlobalSObjectResult(); } /** - * Create an instance of {@link ConvertLead } + * Create an instance of {@link PicklistEntry } * */ - public ConvertLead createConvertLead() { - return new ConvertLead(); + public PicklistEntry createPicklistEntry() { + return new PicklistEntry(); } /** - * Create an instance of {@link SessionHeader } + * Create an instance of {@link DescribeSObjects } * */ - public SessionHeader createSessionHeader() { - return new SessionHeader(); + public DescribeSObjects createDescribeSObjects() { + return new DescribeSObjects(); } /** - * Create an instance of {@link LoginResponse } + * Create an instance of {@link Email } * */ - public LoginResponse createLoginResponse() { - return new LoginResponse(); + public Email createEmail() { + return new Email(); } /** - * Create an instance of {@link DescribeGlobalResult } + * Create an instance of {@link DescribeTabsResponse } * */ - public DescribeGlobalResult createDescribeGlobalResult() { - return new DescribeGlobalResult(); + public DescribeTabsResponse createDescribeTabsResponse() { + return new DescribeTabsResponse(); } /** - * Create an instance of {@link MergeRequest } + * Create an instance of {@link Process } * */ - public MergeRequest createMergeRequest() { - return new MergeRequest(); + public Process createProcess() { + return new Process(); } /** - * Create an instance of {@link GetUserInfoResult } + * Create an instance of {@link DescribeLayoutItem } * */ - public GetUserInfoResult createGetUserInfoResult() { - return new GetUserInfoResult(); + public DescribeLayoutItem createDescribeLayoutItem() { + return new DescribeLayoutItem(); } /** - * Create an instance of {@link ProcessWorkitemRequest } + * Create an instance of {@link ProcessRequest } * */ - public ProcessWorkitemRequest createProcessWorkitemRequest() { - return new ProcessWorkitemRequest(); + public ProcessRequest createProcessRequest() { + return new ProcessRequest(); } /** - * Create an instance of {@link SetPasswordResponse } + * Create an instance of {@link Logout } * */ - public SetPasswordResponse createSetPasswordResponse() { - return new SetPasswordResponse(); + public Logout createLogout() { + return new Logout(); } /** - * Create an instance of {@link ResetPasswordResponse } + * Create an instance of {@link RelatedListSort } * */ - public ResetPasswordResponse createResetPasswordResponse() { - return new ResetPasswordResponse(); + public RelatedListSort createRelatedListSort() { + return new RelatedListSort(); } /** @@ -918,38 +998,46 @@ } /** - * Create an instance of {@link DescribeSoftphoneLayoutInfoField } + * Create an instance of {@link Undelete } * */ - public DescribeSoftphoneLayoutInfoField createDescribeSoftphoneLayoutInfoField() { - return new DescribeSoftphoneLayoutInfoField(); + public Undelete createUndelete() { + return new Undelete(); } /** - * Create an instance of {@link MydescribeLayout } + * Create an instance of {@link DescribeSObjectsResponse } * */ - public MydescribeLayout createMydescribeLayout() { - return new MydescribeLayout(); + public DescribeSObjectsResponse createDescribeSObjectsResponse() { + return new DescribeSObjectsResponse(); } /** - * Create an instance of {@link RelatedList } + * Create an instance of {@link GetDeletedResult } * */ - public RelatedList createRelatedList() { - return new RelatedList(); + public GetDeletedResult createGetDeletedResult() { + return new GetDeletedResult(); } /** - * Create an instance of {@link RelatedListColumn } + * Create an instance of {@link SearchRecord } * */ - public RelatedListColumn createRelatedListColumn() { - return new RelatedListColumn(); + public SearchRecord createSearchRecord() { + return new SearchRecord(); } /** + * Create an instance of {@link GetDeletedResponse } + * + */ + public GetDeletedResponse createGetDeletedResponse() { + return new GetDeletedResponse(); + } + + /** * Create an instance of {@link PackageVersion } * */ @@ -958,192 +1046,192 @@ } /** - * Create an instance of {@link UndeleteResponse } + * Create an instance of {@link DescribeLayoutResponse } * */ - public UndeleteResponse createUndeleteResponse() { - return new UndeleteResponse(); + public DescribeLayoutResponse createDescribeLayoutResponse() { + return new DescribeLayoutResponse(); } /** - * Create an instance of {@link EmailFileAttachment } + * Create an instance of {@link ResetPassword } * */ - public EmailFileAttachment createEmailFileAttachment() { - return new EmailFileAttachment(); + public ResetPassword createResetPassword() { + return new ResetPassword(); } /** - * Create an instance of {@link DescribeSObjects } + * Create an instance of {@link AllowFieldTruncationHeader } * */ - public DescribeSObjects createDescribeSObjects() { - return new DescribeSObjects(); + public AllowFieldTruncationHeader createAllowFieldTruncationHeader() { + return new AllowFieldTruncationHeader(); } /** - * Create an instance of {@link QueryAllResponse } + * Create an instance of {@link DescribeGlobal } * */ - public QueryAllResponse createQueryAllResponse() { - return new QueryAllResponse(); + public DescribeGlobal createDescribeGlobal() { + return new DescribeGlobal(); } /** - * Create an instance of {@link DescribeLayoutResponse } + * Create an instance of {@link DescribeDataCategoryGroups } * */ - public DescribeLayoutResponse createDescribeLayoutResponse() { - return new DescribeLayoutResponse(); + public DescribeDataCategoryGroups createDescribeDataCategoryGroups() { + return new DescribeDataCategoryGroups(); } /** - * Create an instance of {@link EmptyRecycleBinResult } + * Create an instance of {@link SearchResponse } * */ - public EmptyRecycleBinResult createEmptyRecycleBinResult() { - return new EmptyRecycleBinResult(); + public SearchResponse createSearchResponse() { + return new SearchResponse(); } /** - * Create an instance of {@link QueryMoreResponse } + * Create an instance of {@link DescribeSObject } * */ - public QueryMoreResponse createQueryMoreResponse() { - return new QueryMoreResponse(); + public DescribeSObject createDescribeSObject() { + return new DescribeSObject(); } /** - * Create an instance of {@link UpsertResult } + * Create an instance of {@link AllOrNoneHeader } * */ - public UpsertResult createUpsertResult() { - return new UpsertResult(); + public AllOrNoneHeader createAllOrNoneHeader() { + return new AllOrNoneHeader(); } /** - * Create an instance of {@link RetrieveResponse } + * Create an instance of {@link UpdateResponse } * */ - public RetrieveResponse createRetrieveResponse() { - return new RetrieveResponse(); + public UpdateResponse createUpdateResponse() { + return new UpdateResponse(); } /** - * Create an instance of {@link GetServerTimestampResponse } + * Create an instance of {@link UpsertResponse } * */ - public GetServerTimestampResponse createGetServerTimestampResponse() { - return new GetServerTimestampResponse(); + public UpsertResponse createUpsertResponse() { + return new UpsertResponse(); } /** - * Create an instance of {@link DescribeLayoutSection } + * Create an instance of {@link DescribeSObjectResult } * */ - public DescribeLayoutSection createDescribeLayoutSection() { - return new DescribeLayoutSection(); + public DescribeSObjectResult createDescribeSObjectResult() { + return new DescribeSObjectResult(); } /** - * Create an instance of {@link ChildRelationship } + * Create an instance of {@link DescribeSoftphoneLayoutResponse } * */ - public ChildRelationship createChildRelationship() { - return new ChildRelationship(); + public DescribeSoftphoneLayoutResponse createDescribeSoftphoneLayoutResponse() { + return new DescribeSoftphoneLayoutResponse(); } /** - * Create an instance of {@link Field } + * Create an instance of {@link QueryMoreResponse } * */ - public Field createField() { - return new Field(); + public QueryMoreResponse createQueryMoreResponse() { + return new QueryMoreResponse(); } /** - * Create an instance of {@link Email } + * Create an instance of {@link DescribeTabs } * */ - public Email createEmail() { - return new Email(); + public DescribeTabs createDescribeTabs() { + return new DescribeTabs(); } /** - * Create an instance of {@link SendEmailError } + * Create an instance of {@link DescribeSoftphoneScreenPopOption } * */ - public SendEmailError createSendEmailError() { - return new SendEmailError(); + public DescribeSoftphoneScreenPopOption createDescribeSoftphoneScreenPopOption() { + return new DescribeSoftphoneScreenPopOption(); } /** - * Create an instance of {@link DescribeTabs } + * Create an instance of {@link DescribeLayout } * */ - public DescribeTabs createDescribeTabs() { - return new DescribeTabs(); + public DescribeLayout createDescribeLayout() { + return new DescribeLayout(); } /** - * Create an instance of {@link GetUpdatedResult } + * Create an instance of {@link DescribeDataCategoryGroupsResponse } * */ - public GetUpdatedResult createGetUpdatedResult() { - return new GetUpdatedResult(); + public DescribeDataCategoryGroupsResponse createDescribeDataCategoryGroupsResponse() { + return new DescribeDataCategoryGroupsResponse(); } /** - * Create an instance of {@link UndeleteResult } + * Create an instance of {@link ResetPasswordResponse } * */ - public UndeleteResult createUndeleteResult() { - return new UndeleteResult(); + public ResetPasswordResponse createResetPasswordResponse() { + return new ResetPasswordResponse(); } /** * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "urn:partner.soap.sforce.com", name = "orgWideEmailAddressId", scope = SingleEmailMessage.class) - public JAXBElement<String> createSingleEmailMessageOrgWideEmailAddressId(String value) { - return new JAXBElement<String>(_SingleEmailMessageOrgWideEmailAddressId_QNAME, String.class, SingleEmailMessage.class, value); + @XmlElementDecl(namespace = "urn:partner.soap.sforce.com", name = "contentType", scope = EmailFileAttachment.class) + public JAXBElement<String> createEmailFileAttachmentContentType(String value) { + return new JAXBElement<String>(_EmailFileAttachmentContentType_QNAME, String.class, EmailFileAttachment.class, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} * */ - @XmlElementDecl(namespace = "urn:partner.soap.sforce.com", name = "inReplyTo", scope = SingleEmailMessage.class) - public JAXBElement<String> createSingleEmailMessageInReplyTo(String value) { - return new JAXBElement<String>(_SingleEmailMessageInReplyTo_QNAME, String.class, SingleEmailMessage.class, value); + @XmlElementDecl(namespace = "urn:partner.soap.sforce.com", name = "body", scope = EmailFileAttachment.class) + public JAXBElement<byte[]> createEmailFileAttachmentBody(byte[] value) { + return new JAXBElement<byte[]>(_EmailFileAttachmentBody_QNAME, byte[].class, EmailFileAttachment.class, ((byte[]) value)); } /** * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "urn:partner.soap.sforce.com", name = "references", scope = SingleEmailMessage.class) - public JAXBElement<String> createSingleEmailMessageReferences(String value) { - return new JAXBElement<String>(_SingleEmailMessageReferences_QNAME, String.class, SingleEmailMessage.class, value); + @XmlElementDecl(namespace = "urn:partner.soap.sforce.com", name = "orgWideEmailAddressId", scope = SingleEmailMessage.class) + public JAXBElement<String> createSingleEmailMessageOrgWideEmailAddressId(String value) { + return new JAXBElement<String>(_SingleEmailMessageOrgWideEmailAddressId_QNAME, String.class, SingleEmailMessage.class, value); } /** * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "urn:partner.soap.sforce.com", name = "contentType", scope = EmailFileAttachment.class) - public JAXBElement<String> createEmailFileAttachmentContentType(String value) { - return new JAXBElement<String>(_EmailFileAttachmentContentType_QNAME, String.class, EmailFileAttachment.class, value); + @XmlElementDecl(namespace = "urn:partner.soap.sforce.com", name = "inReplyTo", scope = SingleEmailMessage.class) + public JAXBElement<String> createSingleEmailMessageInReplyTo(String value) { + return new JAXBElement<String>(_SingleEmailMessageInReplyTo_QNAME, String.class, SingleEmailMessage.class, value); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}} + * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} * */ - @XmlElementDecl(namespace = "urn:partner.soap.sforce.com", name = "body", scope = EmailFileAttachment.class) - public JAXBElement<byte[]> createEmailFileAttachmentBody(byte[] value) { - return new JAXBElement<byte[]>(_EmailFileAttachmentBody_QNAME, byte[].class, EmailFileAttachment.class, ((byte[]) value)); + @XmlElementDecl(namespace = "urn:partner.soap.sforce.com", name = "references", scope = SingleEmailMessage.class) + public JAXBElement<String> createSingleEmailMessageReferences(String value) { + return new JAXBElement<String>(_SingleEmailMessageReferences_QNAME, String.class, SingleEmailMessage.class, value); } } Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/SforceService.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/SforceService.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/SforceService.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -5,18 +5,18 @@ package com.sforce.soap.partner; +import java.net.MalformedURLException; import java.net.URL; - import javax.xml.namespace.QName; -import javax.xml.ws.Service; import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; import javax.xml.ws.WebServiceFeature; +import javax.xml.ws.Service; /** - * This class was generated by Apache CXF 2.2.5 - * Thu Apr 01 14:35:01 EDT 2010 - * Generated source version: 2.2.5 + * This class was generated by Apache CXF 2.2.12 + * Thu Sep 01 08:54:15 CDT 2011 + * Generated source version: 2.2.12 * */ @@ -24,7 +24,7 @@ @WebServiceClient(name = "SforceService", wsdlLocation = SforceService.PARTNER_WSDL,targetNamespace = "urn:partner.soap.sforce.com") public class SforceService extends Service { - public static final String PARTNER_WSDL = "partner_v17.wsdl"; //$NON-NLS-1$ + public static final String PARTNER_WSDL = "partner_v22.wsdl"; //$NON-NLS-1$ public final static URL WSDL_LOCATION; public final static QName SERVICE = new QName("urn:partner.soap.sforce.com", "SforceService"); //$NON-NLS-1$ //$NON-NLS-2$ public final static QName Soap = new QName("urn:partner.soap.sforce.com", "Soap");//$NON-NLS-1$ //$NON-NLS-2$ @@ -47,6 +47,7 @@ public SforceService() { super(WSDL_LOCATION, SERVICE); } + /** * Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/Soap.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/Soap.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/Soap.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -9,57 +9,50 @@ import javax.xml.ws.ResponseWrapper; /** - * This class was generated by Apache CXF 2.2.5 - * Thu Apr 01 14:35:01 EDT 2010 - * Generated source version: 2.2.5 + * This class was generated by Apache CXF 2.2.12 + * Thu Sep 01 08:54:15 CDT 2011 + * Generated source version: 2.2.12 * */ @WebService(targetNamespace = "urn:partner.soap.sforce.com", name = "Soap") -(a)XmlSeeAlso({ObjectFactory.class,com.sforce.soap.partner.fault.ObjectFactory.class,com.sforce.soap.partner.sobject.ObjectFactory.class}) +(a)XmlSeeAlso({ObjectFactory.class, com.sforce.soap.partner.fault.ObjectFactory.class, com.sforce.soap.partner.sobject.ObjectFactory.class}) public interface Soap { @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "merge", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.Merge") - @ResponseWrapper(localName = "mergeResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.MergeResponse") @WebMethod + @ResponseWrapper(localName = "mergeResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.MergeResponse") public java.util.List<com.sforce.soap.partner.MergeResult> merge( @WebParam(name = "request", targetNamespace = "urn:partner.soap.sforce.com") - java.util.List<com.sforce.soap.partner.MergeRequest> request, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + java.util.List<com.sforce.soap.partner.MergeRequest> request ) throws InvalidFieldFault, InvalidSObjectFault, InvalidIdFault, UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "getUserInfo", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.GetUserInfo") - @ResponseWrapper(localName = "getUserInfoResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.GetUserInfoResponse") @WebMethod - public com.sforce.soap.partner.GetUserInfoResult getUserInfo( - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader - ) throws UnexpectedErrorFault; + @ResponseWrapper(localName = "getUserInfoResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.GetUserInfoResponse") + public com.sforce.soap.partner.GetUserInfoResult getUserInfo() throws UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "describeSoftphoneLayout", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeSoftphoneLayout") - @ResponseWrapper(localName = "describeSoftphoneLayoutResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeSoftphoneLayoutResponse") @WebMethod + @ResponseWrapper(localName = "describeSoftphoneLayoutResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeSoftphoneLayoutResponse") public com.sforce.soap.partner.DescribeSoftphoneLayoutResult describeSoftphoneLayout() throws UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "update", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.Update") - @ResponseWrapper(localName = "updateResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.UpdateResponse") @WebMethod + @ResponseWrapper(localName = "updateResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.UpdateResponse") public java.util.List<com.sforce.soap.partner.SaveResult> update( @WebParam(name = "sObjects", targetNamespace = "urn:partner.soap.sforce.com") - java.util.List<com.sforce.soap.partner.sobject.SObject> sObjects, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + java.util.List<com.sforce.soap.partner.sobject.SObject> sObjects ) throws InvalidFieldFault, InvalidSObjectFault, InvalidIdFault, UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "setPassword", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.SetPassword") - @ResponseWrapper(localName = "setPasswordResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.SetPasswordResponse") @WebMethod + @ResponseWrapper(localName = "setPasswordResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.SetPasswordResponse") public com.sforce.soap.partner.SetPasswordResult setPassword( @WebParam(name = "userId", targetNamespace = "urn:partner.soap.sforce.com") java.lang.String userId, @@ -68,57 +61,49 @@ ) throws InvalidNewPasswordFault, InvalidIdFault, UnexpectedErrorFault; @RequestWrapper(localName = "logout", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.Logout") - @ResponseWrapper(localName = "logoutResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.LogoutResponse") @WebMethod - public void logout( - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader) throws UnexpectedErrorFault; + @ResponseWrapper(localName = "logoutResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.LogoutResponse") + public void logout() throws UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "retrieve", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.Retrieve") - @ResponseWrapper(localName = "retrieveResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.RetrieveResponse") @WebMethod + @ResponseWrapper(localName = "retrieveResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.RetrieveResponse") public java.util.List<com.sforce.soap.partner.sobject.SObject> retrieve( @WebParam(name = "fieldList", targetNamespace = "urn:partner.soap.sforce.com") java.lang.String fieldList, @WebParam(name = "sObjectType", targetNamespace = "urn:partner.soap.sforce.com") java.lang.String sObjectType, @WebParam(name = "ids", targetNamespace = "urn:partner.soap.sforce.com") - java.util.List<java.lang.String> ids, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + java.util.List<java.lang.String> ids ) throws InvalidFieldFault, MalformedQueryFault, InvalidSObjectFault, InvalidIdFault, UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "queryAll", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.QueryAll") - @ResponseWrapper(localName = "queryAllResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.QueryAllResponse") @WebMethod + @ResponseWrapper(localName = "queryAllResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.QueryAllResponse") public com.sforce.soap.partner.QueryResult queryAll( @WebParam(name = "queryString", targetNamespace = "urn:partner.soap.sforce.com") - java.lang.String queryString, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + java.lang.String queryString ) throws InvalidFieldFault, MalformedQueryFault, InvalidSObjectFault, InvalidIdFault, UnexpectedErrorFault, InvalidQueryLocatorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "getUpdated", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.GetUpdated") - @ResponseWrapper(localName = "getUpdatedResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.GetUpdatedResponse") @WebMethod + @ResponseWrapper(localName = "getUpdatedResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.GetUpdatedResponse") public com.sforce.soap.partner.GetUpdatedResult getUpdated( @WebParam(name = "sObjectType", targetNamespace = "urn:partner.soap.sforce.com") java.lang.String sObjectType, @WebParam(name = "startDate", targetNamespace = "urn:partner.soap.sforce.com") javax.xml.datatype.XMLGregorianCalendar startDate, @WebParam(name = "endDate", targetNamespace = "urn:partner.soap.sforce.com") - javax.xml.datatype.XMLGregorianCalendar endDate, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + javax.xml.datatype.XMLGregorianCalendar endDate ) throws InvalidSObjectFault, UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "undelete", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.Undelete") - @ResponseWrapper(localName = "undeleteResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.UndeleteResponse") @WebMethod + @ResponseWrapper(localName = "undeleteResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.UndeleteResponse") public java.util.List<com.sforce.soap.partner.UndeleteResult> undelete( @WebParam(name = "ids", targetNamespace = "urn:partner.soap.sforce.com") java.util.List<java.lang.String> ids @@ -126,19 +111,17 @@ @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "create", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.Create") - @ResponseWrapper(localName = "createResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.CreateResponse") @WebMethod + @ResponseWrapper(localName = "createResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.CreateResponse") public java.util.List<com.sforce.soap.partner.SaveResult> create( @WebParam(name = "sObjects", targetNamespace = "urn:partner.soap.sforce.com") - java.util.List<com.sforce.soap.partner.sobject.SObject> sObjects, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + java.util.List<com.sforce.soap.partner.sobject.SObject> sObjects ) throws InvalidFieldFault, InvalidSObjectFault, InvalidIdFault, UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "sendEmail", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.SendEmail") - @ResponseWrapper(localName = "sendEmailResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.SendEmailResponse") @WebMethod + @ResponseWrapper(localName = "sendEmailResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.SendEmailResponse") public java.util.List<com.sforce.soap.partner.SendEmailResult> sendEmail( @WebParam(name = "messages", targetNamespace = "urn:partner.soap.sforce.com") java.util.List<com.sforce.soap.partner.Email> messages @@ -146,8 +129,8 @@ @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "search", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.Search") - @ResponseWrapper(localName = "searchResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.SearchResponse") @WebMethod + @ResponseWrapper(localName = "searchResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.SearchResponse") public com.sforce.soap.partner.SearchResult search( @WebParam(name = "searchString", targetNamespace = "urn:partner.soap.sforce.com") java.lang.String searchString @@ -155,43 +138,50 @@ @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "query", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.Query") - @ResponseWrapper(localName = "queryResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.QueryResponse") @WebMethod + @ResponseWrapper(localName = "queryResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.QueryResponse") public com.sforce.soap.partner.QueryResult query( @WebParam(name = "queryString", targetNamespace = "urn:partner.soap.sforce.com") - java.lang.String queryString, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + java.lang.String queryString ) throws InvalidFieldFault, MalformedQueryFault, InvalidSObjectFault, InvalidIdFault, UnexpectedErrorFault, InvalidQueryLocatorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "getDeleted", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.GetDeleted") - @ResponseWrapper(localName = "getDeletedResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.GetDeletedResponse") @WebMethod + @ResponseWrapper(localName = "getDeletedResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.GetDeletedResponse") public com.sforce.soap.partner.GetDeletedResult getDeleted( @WebParam(name = "sObjectType", targetNamespace = "urn:partner.soap.sforce.com") java.lang.String sObjectType, @WebParam(name = "startDate", targetNamespace = "urn:partner.soap.sforce.com") javax.xml.datatype.XMLGregorianCalendar startDate, @WebParam(name = "endDate", targetNamespace = "urn:partner.soap.sforce.com") - javax.xml.datatype.XMLGregorianCalendar endDate, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + javax.xml.datatype.XMLGregorianCalendar endDate ) throws InvalidSObjectFault, UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "process", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.Process") - @ResponseWrapper(localName = "processResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.ProcessResponse") @WebMethod + @ResponseWrapper(localName = "processResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.ProcessResponse") public java.util.List<com.sforce.soap.partner.ProcessResult> process( @WebParam(name = "actions", targetNamespace = "urn:partner.soap.sforce.com") java.util.List<com.sforce.soap.partner.ProcessRequest> actions ) throws InvalidIdFault, UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") + @RequestWrapper(localName = "describeDataCategoryGroupStructures", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeDataCategoryGroupStructures") + @WebMethod + @ResponseWrapper(localName = "describeDataCategoryGroupStructuresResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeDataCategoryGroupStructuresResponse") + public java.util.List<com.sforce.soap.partner.DescribeDataCategoryGroupStructureResult> describeDataCategoryGroupStructures( + @WebParam(name = "pairs", targetNamespace = "urn:partner.soap.sforce.com") + java.util.List<com.sforce.soap.partner.DataCategoryGroupSobjectTypePair> pairs, + @WebParam(name = "topCategoriesOnly", targetNamespace = "urn:partner.soap.sforce.com") + boolean topCategoriesOnly + ) throws InvalidSObjectFault, UnexpectedErrorFault; + + @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "resetPassword", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.ResetPassword") - @ResponseWrapper(localName = "resetPasswordResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.ResetPasswordResponse") @WebMethod + @ResponseWrapper(localName = "resetPasswordResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.ResetPasswordResponse") public com.sforce.soap.partner.ResetPasswordResult resetPassword( @WebParam(name = "userId", targetNamespace = "urn:partner.soap.sforce.com") java.lang.String userId @@ -199,17 +189,14 @@ @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "describeGlobal", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeGlobal") - @ResponseWrapper(localName = "describeGlobalResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeGlobalResponse") @WebMethod - public com.sforce.soap.partner.DescribeGlobalResult describeGlobal( - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader - ) throws UnexpectedErrorFault; + @ResponseWrapper(localName = "describeGlobalResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeGlobalResponse") + public com.sforce.soap.partner.DescribeGlobalResult describeGlobal() throws UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") - @RequestWrapper(localName = "describeLayout", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.MydescribeLayout") - @ResponseWrapper(localName = "describeLayoutResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeLayoutResponse") + @RequestWrapper(localName = "describeLayout", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeLayout") @WebMethod + @ResponseWrapper(localName = "describeLayoutResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeLayoutResponse") public com.sforce.soap.partner.DescribeLayoutResult describeLayout( @WebParam(name = "sObjectType", targetNamespace = "urn:partner.soap.sforce.com") java.lang.String sObjectType, @@ -219,23 +206,29 @@ @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "describeTabs", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeTabs") - @ResponseWrapper(localName = "describeTabsResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeTabsResponse") @WebMethod + @ResponseWrapper(localName = "describeTabsResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeTabsResponse") public java.util.List<com.sforce.soap.partner.DescribeTabSetResult> describeTabs() throws UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") + @RequestWrapper(localName = "describeDataCategoryGroups", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeDataCategoryGroups") + @WebMethod + @ResponseWrapper(localName = "describeDataCategoryGroupsResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeDataCategoryGroupsResponse") + public java.util.List<com.sforce.soap.partner.DescribeDataCategoryGroupResult> describeDataCategoryGroups( + @WebParam(name = "sObjectType", targetNamespace = "urn:partner.soap.sforce.com") + java.util.List<java.lang.String> sObjectType + ) throws InvalidSObjectFault, UnexpectedErrorFault; + + @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "getServerTimestamp", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.GetServerTimestamp") - @ResponseWrapper(localName = "getServerTimestampResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.GetServerTimestampResponse") @WebMethod - public com.sforce.soap.partner.GetServerTimestampResult getServerTimestamp( - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader - ) throws UnexpectedErrorFault; + @ResponseWrapper(localName = "getServerTimestampResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.GetServerTimestampResponse") + public com.sforce.soap.partner.GetServerTimestampResult getServerTimestamp() throws UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "invalidateSessions", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.InvalidateSessions") - @ResponseWrapper(localName = "invalidateSessionsResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.InvalidateSessionsResponse") @WebMethod + @ResponseWrapper(localName = "invalidateSessionsResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.InvalidateSessionsResponse") public java.util.List<com.sforce.soap.partner.InvalidateSessionsResult> invalidateSessions( @WebParam(name = "sessionIds", targetNamespace = "urn:partner.soap.sforce.com") java.util.List<java.lang.String> sessionIds @@ -243,19 +236,17 @@ @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "describeSObject", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeSObject") - @ResponseWrapper(localName = "describeSObjectResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeSObjectResponse") @WebMethod + @ResponseWrapper(localName = "describeSObjectResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeSObjectResponse") public com.sforce.soap.partner.DescribeSObjectResult describeSObject( @WebParam(name = "sObjectType", targetNamespace = "urn:partner.soap.sforce.com") - java.lang.String sObjectType, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + java.lang.String sObjectType ) throws InvalidSObjectFault, UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "login", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.Login") - @ResponseWrapper(localName = "loginResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.LoginResponse") @WebMethod + @ResponseWrapper(localName = "loginResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.LoginResponse") public com.sforce.soap.partner.LoginResult login( @WebParam(name = "username", targetNamespace = "urn:partner.soap.sforce.com") java.lang.String username, @@ -265,30 +256,26 @@ @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "queryMore", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.QueryMore") - @ResponseWrapper(localName = "queryMoreResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.QueryMoreResponse") @WebMethod + @ResponseWrapper(localName = "queryMoreResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.QueryMoreResponse") public com.sforce.soap.partner.QueryResult queryMore( @WebParam(name = "queryLocator", targetNamespace = "urn:partner.soap.sforce.com") - java.lang.String queryLocator, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + java.lang.String queryLocator ) throws InvalidFieldFault, UnexpectedErrorFault, InvalidQueryLocatorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "describeSObjects", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeSObjects") - @ResponseWrapper(localName = "describeSObjectsResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeSObjectsResponse") @WebMethod + @ResponseWrapper(localName = "describeSObjectsResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DescribeSObjectsResponse") public java.util.List<com.sforce.soap.partner.DescribeSObjectResult> describeSObjects( @WebParam(name = "sObjectType", targetNamespace = "urn:partner.soap.sforce.com") - java.util.List<java.lang.String> sObjectType, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + java.util.List<java.lang.String> sObjectType ) throws InvalidSObjectFault, UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "emptyRecycleBin", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.EmptyRecycleBin") - @ResponseWrapper(localName = "emptyRecycleBinResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.EmptyRecycleBinResponse") @WebMethod + @ResponseWrapper(localName = "emptyRecycleBinResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.EmptyRecycleBinResponse") public java.util.List<com.sforce.soap.partner.EmptyRecycleBinResult> emptyRecycleBin( @WebParam(name = "ids", targetNamespace = "urn:partner.soap.sforce.com") java.util.List<java.lang.String> ids @@ -296,21 +283,19 @@ @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "upsert", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.Upsert") - @ResponseWrapper(localName = "upsertResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.UpsertResponse") @WebMethod + @ResponseWrapper(localName = "upsertResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.UpsertResponse") public java.util.List<com.sforce.soap.partner.UpsertResult> upsert( @WebParam(name = "externalIDFieldName", targetNamespace = "urn:partner.soap.sforce.com") java.lang.String externalIDFieldName, @WebParam(name = "sObjects", targetNamespace = "urn:partner.soap.sforce.com") - java.util.List<com.sforce.soap.partner.sobject.SObject> sObjects, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + java.util.List<com.sforce.soap.partner.sobject.SObject> sObjects ) throws InvalidFieldFault, InvalidSObjectFault, InvalidIdFault, UnexpectedErrorFault; @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "convertLead", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.ConvertLead") - @ResponseWrapper(localName = "convertLeadResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.ConvertLeadResponse") @WebMethod + @ResponseWrapper(localName = "convertLeadResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.ConvertLeadResponse") public java.util.List<com.sforce.soap.partner.LeadConvertResult> convertLead( @WebParam(name = "leadConverts", targetNamespace = "urn:partner.soap.sforce.com") java.util.List<com.sforce.soap.partner.LeadConvert> leadConverts @@ -318,12 +303,10 @@ @WebResult(name = "result", targetNamespace = "urn:partner.soap.sforce.com") @RequestWrapper(localName = "delete", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.Delete") - @ResponseWrapper(localName = "deleteResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DeleteResponse") @WebMethod + @ResponseWrapper(localName = "deleteResponse", targetNamespace = "urn:partner.soap.sforce.com", className = "com.sforce.soap.partner.DeleteResponse") public java.util.List<com.sforce.soap.partner.DeleteResult> delete( @WebParam(name = "ids", targetNamespace = "urn:partner.soap.sforce.com") - java.util.List<java.lang.String> ids, - @WebParam(name = "SessionHeader", targetNamespace = "urn:partner.soap.sforce.com", header = true) - SessionHeader sessionHeader + java.util.List<java.lang.String> ids ) throws UnexpectedErrorFault; } Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/StatusCode.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/StatusCode.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/StatusCode.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -13,6 +13,7 @@ * <pre> * &lt;simpleType name="StatusCode"> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string"> + * &lt;enumeration value="ALL_OR_NONE_OPERATION_ROLLED_BACK"/> * &lt;enumeration value="ALREADY_IN_PROCESS"/> * &lt;enumeration value="ASSIGNEE_TYPE_REQUIRED"/> * &lt;enumeration value="BAD_CUSTOM_ENTITY_PARENT_DOMAIN"/> @@ -64,6 +65,7 @@ * &lt;enumeration value="ERROR_IN_MAILER"/> * &lt;enumeration value="FAILED_ACTIVATION"/> * &lt;enumeration value="FIELD_CUSTOM_VALIDATION_EXCEPTION"/> + * &lt;enumeration value="FIELD_FILTER_VALIDATION_EXCEPTION"/> * &lt;enumeration value="FIELD_INTEGRITY_EXCEPTION"/> * &lt;enumeration value="FILTERED_LOOKUP_LIMIT_EXCEEDED"/> * &lt;enumeration value="HTML_FILE_UPLOAD_NOT_ALLOWED"/> @@ -83,6 +85,8 @@ * &lt;enumeration value="INVALID_CURRENCY_CONV_RATE"/> * &lt;enumeration value="INVALID_CURRENCY_CORP_RATE"/> * &lt;enumeration value="INVALID_CURRENCY_ISO"/> + * &lt;enumeration value="INVALID_DATA_CATEGORY_GROUP_REFERENCE"/> + * &lt;enumeration value="INVALID_DATA_URI"/> * &lt;enumeration value="INVALID_EMAIL_ADDRESS"/> * &lt;enumeration value="INVALID_EMPTY_KEY_OWNER"/> * &lt;enumeration value="INVALID_FIELD"/> @@ -100,6 +104,7 @@ * &lt;enumeration value="INVALID_OR_NULL_FOR_RESTRICTED_PICKLIST"/> * &lt;enumeration value="INVALID_PARTNER_NETWORK_STATUS"/> * &lt;enumeration value="INVALID_PERSON_ACCOUNT_OPERATION"/> + * &lt;enumeration value="INVALID_READ_ONLY_USER_DML"/> * &lt;enumeration value="INVALID_SAVE_AS_ACTIVITY_FLAG"/> * &lt;enumeration value="INVALID_SESSION_ID"/> * &lt;enumeration value="INVALID_SETUP_OWNER"/> @@ -140,14 +145,18 @@ * &lt;enumeration value="NUMBER_OUTSIDE_VALID_RANGE"/> * &lt;enumeration value="NUM_HISTORY_FIELDS_BY_SOBJECT_EXCEEDED"/> * &lt;enumeration value="OPTED_OUT_OF_MASS_MAIL"/> + * &lt;enumeration value="OP_WITH_INVALID_USER_TYPE_EXCEPTION"/> * &lt;enumeration value="PACKAGE_LICENSE_REQUIRED"/> + * &lt;enumeration value="PORTAL_NO_ACCESS"/> * &lt;enumeration value="PORTAL_USER_ALREADY_EXISTS_FOR_CONTACT"/> * &lt;enumeration value="PRIVATE_CONTACT_ON_ASSET"/> * &lt;enumeration value="RECORD_IN_USE_BY_WORKFLOW"/> * &lt;enumeration value="REQUEST_RUNNING_TOO_LONG"/> + * &lt;enumeration value="REQUIRED_FEATURE_MISSING"/> * &lt;enumeration value="REQUIRED_FIELD_MISSING"/> * &lt;enumeration value="SELF_REFERENCE_FROM_TRIGGER"/> * &lt;enumeration value="SHARE_NEEDED_FOR_CHILD_OWNER"/> + * &lt;enumeration value="SINGLE_EMAIL_LIMIT_EXCEEDED"/> * &lt;enumeration value="STANDARD_PRICE_NOT_DEFINED"/> * &lt;enumeration value="STORAGE_LIMIT_EXCEEDED"/> * &lt;enumeration value="STRING_TOO_LONG"/> @@ -165,6 +174,8 @@ * &lt;enumeration value="UNSPECIFIED_EMAIL_ADDRESS"/> * &lt;enumeration value="UNSUPPORTED_APEX_TRIGGER_OPERATON"/> * &lt;enumeration value="UNVERIFIED_SENDER_ADDRESS"/> + * &lt;enumeration value="USER_OWNS_PORTAL_ACCOUNT_EXCEPTION"/> + * &lt;enumeration value="USER_WITH_APEX_SHARES_EXCEPTION"/> * &lt;enumeration value="WEBLINK_SIZE_LIMIT_EXCEEDED"/> * &lt;enumeration value="WRONG_CONTROLLER_TYPE"/> * &lt;/restriction> @@ -176,6 +187,7 @@ @XmlEnum public enum StatusCode { + ALL_OR_NONE_OPERATION_ROLLED_BACK, ALREADY_IN_PROCESS, ASSIGNEE_TYPE_REQUIRED, BAD_CUSTOM_ENTITY_PARENT_DOMAIN, @@ -227,6 +239,7 @@ ERROR_IN_MAILER, FAILED_ACTIVATION, FIELD_CUSTOM_VALIDATION_EXCEPTION, + FIELD_FILTER_VALIDATION_EXCEPTION, FIELD_INTEGRITY_EXCEPTION, FILTERED_LOOKUP_LIMIT_EXCEEDED, HTML_FILE_UPLOAD_NOT_ALLOWED, @@ -246,6 +259,8 @@ INVALID_CURRENCY_CONV_RATE, INVALID_CURRENCY_CORP_RATE, INVALID_CURRENCY_ISO, + INVALID_DATA_CATEGORY_GROUP_REFERENCE, + INVALID_DATA_URI, INVALID_EMAIL_ADDRESS, INVALID_EMPTY_KEY_OWNER, INVALID_FIELD, @@ -263,6 +278,7 @@ INVALID_OR_NULL_FOR_RESTRICTED_PICKLIST, INVALID_PARTNER_NETWORK_STATUS, INVALID_PERSON_ACCOUNT_OPERATION, + INVALID_READ_ONLY_USER_DML, INVALID_SAVE_AS_ACTIVITY_FLAG, INVALID_SESSION_ID, INVALID_SETUP_OWNER, @@ -303,14 +319,18 @@ NUMBER_OUTSIDE_VALID_RANGE, NUM_HISTORY_FIELDS_BY_SOBJECT_EXCEEDED, OPTED_OUT_OF_MASS_MAIL, + OP_WITH_INVALID_USER_TYPE_EXCEPTION, PACKAGE_LICENSE_REQUIRED, + PORTAL_NO_ACCESS, PORTAL_USER_ALREADY_EXISTS_FOR_CONTACT, PRIVATE_CONTACT_ON_ASSET, RECORD_IN_USE_BY_WORKFLOW, REQUEST_RUNNING_TOO_LONG, + REQUIRED_FEATURE_MISSING, REQUIRED_FIELD_MISSING, SELF_REFERENCE_FROM_TRIGGER, SHARE_NEEDED_FOR_CHILD_OWNER, + SINGLE_EMAIL_LIMIT_EXCEEDED, STANDARD_PRICE_NOT_DEFINED, STORAGE_LIMIT_EXCEEDED, STRING_TOO_LONG, @@ -328,6 +348,8 @@ UNSPECIFIED_EMAIL_ADDRESS, UNSUPPORTED_APEX_TRIGGER_OPERATON, UNVERIFIED_SENDER_ADDRESS, + USER_OWNS_PORTAL_ACCOUNT_EXCEPTION, + USER_WITH_APEX_SHARES_EXCEPTION, WEBLINK_SIZE_LIMIT_EXCEEDED, WRONG_CONTROLLER_TYPE; Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/UnexpectedErrorFault.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/UnexpectedErrorFault.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/UnexpectedErrorFault.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -5,15 +5,15 @@ /** - * This class was generated by Apache CXF 2.2.5 - * Thu Apr 01 14:35:01 EDT 2010 - * Generated source version: 2.2.5 + * This class was generated by Apache CXF 2.2.12 + * Thu Sep 01 08:54:15 CDT 2011 + * Generated source version: 2.2.12 * */ @WebFault(name = "UnexpectedErrorFault", targetNamespace = "urn:fault.partner.soap.sforce.com") public class UnexpectedErrorFault extends Exception { - public static final long serialVersionUID = 20100401143501L; + public static final long serialVersionUID = 20110901085415L; private com.sforce.soap.partner.fault.UnexpectedErrorFault unexpectedErrorFault; Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/fault/ExceptionCode.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/fault/ExceptionCode.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/fault/ExceptionCode.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -21,6 +21,9 @@ * &lt;enumeration value="CLIENT_NOT_ACCESSIBLE_FOR_USER"/> * &lt;enumeration value="CLIENT_REQUIRE_UPDATE_FOR_USER"/> * &lt;enumeration value="CUSTOM_METADATA_LIMIT_EXCEEDED"/> + * &lt;enumeration value="DATACLOUD_API_CLIENT_EXCEPTION"/> + * &lt;enumeration value="DATACLOUD_API_SERVER_EXCEPTION"/> + * &lt;enumeration value="DATACLOUD_API_UNAVAILABLE"/> * &lt;enumeration value="DUPLICATE_VALUE"/> * &lt;enumeration value="EMAIL_BATCH_SIZE_LIMIT_EXCEEDED"/> * &lt;enumeration value="EMAIL_TO_CASE_INVALID_ROUTING"/> @@ -32,6 +35,7 @@ * &lt;enumeration value="EXCEEDED_MAX_TYPES_LIMIT"/> * &lt;enumeration value="EXCEEDED_QUOTA"/> * &lt;enumeration value="FUNCTIONALITY_NOT_ENABLED"/> + * &lt;enumeration value="FUNCTIONALITY_TEMPORARILY_UNAVAILABLE"/> * &lt;enumeration value="INACTIVE_OWNER_OR_USER"/> * &lt;enumeration value="INACTIVE_PORTAL"/> * &lt;enumeration value="INSUFFICIENT_ACCESS"/> @@ -60,6 +64,9 @@ * &lt;enumeration value="INVALID_SSO_GATEWAY_URL"/> * &lt;enumeration value="INVALID_TYPE"/> * &lt;enumeration value="INVALID_TYPE_FOR_OPERATION"/> + * &lt;enumeration value="JIGSAW_IMPORT_LIMIT_EXCEEDED"/> + * &lt;enumeration value="JIGSAW_REQUEST_NOT_SUPPORTED"/> + * &lt;enumeration value="JSON_PARSER_ERROR"/> * &lt;enumeration value="LIMIT_EXCEEDED"/> * &lt;enumeration value="LOGIN_CHALLENGE_ISSUED"/> * &lt;enumeration value="LOGIN_CHALLENGE_PENDING"/> @@ -74,6 +81,8 @@ * &lt;enumeration value="NO_SOFTPHONE_LAYOUT"/> * &lt;enumeration value="NUMBER_OUTSIDE_VALID_RANGE"/> * &lt;enumeration value="OPERATION_TOO_LARGE"/> + * &lt;enumeration value="ORG_IN_MAINTENANCE"/> + * &lt;enumeration value="ORG_IS_DOT_ORG"/> * &lt;enumeration value="ORG_LOCKED"/> * &lt;enumeration value="ORG_NOT_OWNED_BY_INSTANCE"/> * &lt;enumeration value="PASSWORD_LOCKOUT"/> @@ -83,12 +92,17 @@ * &lt;enumeration value="REQUEST_LIMIT_EXCEEDED"/> * &lt;enumeration value="REQUEST_RUNNING_TOO_LONG"/> * &lt;enumeration value="SERVER_UNAVAILABLE"/> + * &lt;enumeration value="SOCIALCRM_FEEDSERVICE_API_CLIENT_EXCEPTION"/> + * &lt;enumeration value="SOCIALCRM_FEEDSERVICE_API_SERVER_EXCEPTION"/> + * &lt;enumeration value="SOCIALCRM_FEEDSERVICE_API_UNAVAILABLE"/> * &lt;enumeration value="SSO_SERVICE_DOWN"/> * &lt;enumeration value="TOO_MANY_APEX_REQUESTS"/> * &lt;enumeration value="TRIAL_EXPIRED"/> * &lt;enumeration value="UNKNOWN_EXCEPTION"/> * &lt;enumeration value="UNSUPPORTED_API_VERSION"/> * &lt;enumeration value="UNSUPPORTED_CLIENT"/> + * &lt;enumeration value="UNSUPPORTED_MEDIA_TYPE"/> + * &lt;enumeration value="XML_PARSER_ERROR"/> * &lt;/restriction> * &lt;/simpleType> * </pre> @@ -106,6 +120,9 @@ CLIENT_NOT_ACCESSIBLE_FOR_USER, CLIENT_REQUIRE_UPDATE_FOR_USER, CUSTOM_METADATA_LIMIT_EXCEEDED, + DATACLOUD_API_CLIENT_EXCEPTION, + DATACLOUD_API_SERVER_EXCEPTION, + DATACLOUD_API_UNAVAILABLE, DUPLICATE_VALUE, EMAIL_BATCH_SIZE_LIMIT_EXCEEDED, EMAIL_TO_CASE_INVALID_ROUTING, @@ -117,6 +134,7 @@ EXCEEDED_MAX_TYPES_LIMIT, EXCEEDED_QUOTA, FUNCTIONALITY_NOT_ENABLED, + FUNCTIONALITY_TEMPORARILY_UNAVAILABLE, INACTIVE_OWNER_OR_USER, INACTIVE_PORTAL, INSUFFICIENT_ACCESS, @@ -145,6 +163,9 @@ INVALID_SSO_GATEWAY_URL, INVALID_TYPE, INVALID_TYPE_FOR_OPERATION, + JIGSAW_IMPORT_LIMIT_EXCEEDED, + JIGSAW_REQUEST_NOT_SUPPORTED, + JSON_PARSER_ERROR, LIMIT_EXCEEDED, LOGIN_CHALLENGE_ISSUED, LOGIN_CHALLENGE_PENDING, @@ -159,6 +180,8 @@ NO_SOFTPHONE_LAYOUT, NUMBER_OUTSIDE_VALID_RANGE, OPERATION_TOO_LARGE, + ORG_IN_MAINTENANCE, + ORG_IS_DOT_ORG, ORG_LOCKED, ORG_NOT_OWNED_BY_INSTANCE, PASSWORD_LOCKOUT, @@ -168,12 +191,17 @@ REQUEST_LIMIT_EXCEEDED, REQUEST_RUNNING_TOO_LONG, SERVER_UNAVAILABLE, + SOCIALCRM_FEEDSERVICE_API_CLIENT_EXCEPTION, + SOCIALCRM_FEEDSERVICE_API_SERVER_EXCEPTION, + SOCIALCRM_FEEDSERVICE_API_UNAVAILABLE, SSO_SERVICE_DOWN, TOO_MANY_APEX_REQUESTS, TRIAL_EXPIRED, UNKNOWN_EXCEPTION, UNSUPPORTED_API_VERSION, - UNSUPPORTED_CLIENT; + UNSUPPORTED_CLIENT, + UNSUPPORTED_MEDIA_TYPE, + XML_PARSER_ERROR; public String value() { return name(); Modified: branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/fault/ObjectFactory.java =================================================================== --- branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/fault/ObjectFactory.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/java/com/sforce/soap/partner/fault/ObjectFactory.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -43,27 +43,27 @@ } /** - * Create an instance of {@link ApiFault } + * Create an instance of {@link InvalidFieldFault } * */ - public ApiFault createApiFault() { - return new ApiFault(); + public InvalidFieldFault createInvalidFieldFault() { + return new InvalidFieldFault(); } /** - * Create an instance of {@link MalformedSearchFault } + * Create an instance of {@link InvalidIdFault } * */ - public MalformedSearchFault createMalformedSearchFault() { - return new MalformedSearchFault(); + public InvalidIdFault createInvalidIdFault() { + return new InvalidIdFault(); } /** - * Create an instance of {@link InvalidIdFault } + * Create an instance of {@link InvalidSObjectFault } * */ - public InvalidIdFault createInvalidIdFault() { - return new InvalidIdFault(); + public InvalidSObjectFault createInvalidSObjectFault() { + return new InvalidSObjectFault(); } /** @@ -75,59 +75,59 @@ } /** - * Create an instance of {@link InvalidSObjectFault } + * Create an instance of {@link InvalidNewPasswordFault } * */ - public InvalidSObjectFault createInvalidSObjectFault() { - return new InvalidSObjectFault(); + public InvalidNewPasswordFault createInvalidNewPasswordFault() { + return new InvalidNewPasswordFault(); } /** - * Create an instance of {@link InvalidFieldFault } + * Create an instance of {@link LoginFault } * */ - public InvalidFieldFault createInvalidFieldFault() { - return new InvalidFieldFault(); + public LoginFault createLoginFault() { + return new LoginFault(); } /** - * Create an instance of {@link UnexpectedErrorFault } + * Create an instance of {@link MalformedSearchFault } * */ - public UnexpectedErrorFault createUnexpectedErrorFault() { - return new UnexpectedErrorFault(); + public MalformedSearchFault createMalformedSearchFault() { + return new MalformedSearchFault(); } /** - * Create an instance of {@link InvalidQueryLocatorFault } + * Create an instance of {@link ApiFault } * */ - public InvalidQueryLocatorFault createInvalidQueryLocatorFault() { - return new InvalidQueryLocatorFault(); + public ApiFault createApiFault() { + return new ApiFault(); } /** - * Create an instance of {@link ApiQueryFault } + * Create an instance of {@link InvalidQueryLocatorFault } * */ - public ApiQueryFault createApiQueryFault() { - return new ApiQueryFault(); + public InvalidQueryLocatorFault createInvalidQueryLocatorFault() { + return new InvalidQueryLocatorFault(); } /** - * Create an instance of {@link LoginFault } + * Create an instance of {@link UnexpectedErrorFault } * */ - public LoginFault createLoginFault() { - return new LoginFault(); + public UnexpectedErrorFault createUnexpectedErrorFault() { + return new UnexpectedErrorFault(); } /** - * Create an instance of {@link InvalidNewPasswordFault } + * Create an instance of {@link ApiQueryFault } * */ - public InvalidNewPasswordFault createInvalidNewPasswordFault() { - return new InvalidNewPasswordFault(); + public ApiQueryFault createApiQueryFault() { + return new ApiQueryFault(); } /** Deleted: branches/as7/connectors/salesforce-api/src/main/resources/partner_v17.wsdl =================================================================== --- branches/as7/connectors/salesforce-api/src/main/resources/partner_v17.wsdl 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/salesforce-api/src/main/resources/partner_v17.wsdl 2011-11-02 15:15:47 UTC (rev 3601) @@ -1,2930 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Salesforce.com Partner Web Services API Version 17.0 -Generated on 2010-02-11 17:24:10 +0000. - -Copyright 1999-2010 salesforce.com, inc. -All Rights Reserved ---> -<definitions targetNamespace="urn:partner.soap.sforce.com" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:fns="urn:fault.partner.soap.sforce.com" xmlns:tns="urn:partner.soap.sforce.com" xmlns:ens="urn:sobject.partner.soap.sforce.com"> - <types> - - <schema elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:sobject.partner.soap.sforce.com"> - - <import namespace="urn:partner.soap.sforce.com"/> - - - <!-- Dynamic sObject --> - <complexType name="sObject"> - <sequence> - <element name="type" type="xsd:string"/> - <element name="fieldsToNull" type="xsd:string" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - <element name="Id" type="tns:ID" nillable="true"/> - <any namespace="##targetNamespace" minOccurs="0" maxOccurs="unbounded" processContents="lax"/> - </sequence> - </complexType> - - </schema> - - <schema elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:partner.soap.sforce.com"> - - <import namespace="urn:sobject.partner.soap.sforce.com"/> - - <!-- Our simple ID Type --> - <simpleType name="ID"> - <restriction base="xsd:string"> - <length value="18"/> - <pattern value="[a-zA-Z0-9]{18}"/> - </restriction> - </simpleType> - - <simpleType name="QueryLocator"> - <restriction base="xsd:string"/> - </simpleType> - - <!-- Shared Result Types --> - <complexType name="QueryResult"> - <sequence> - <element name="done" type="xsd:boolean"/> - <element name="queryLocator" type="tns:QueryLocator" nillable="true"/> - <element name="records" type="ens:sObject" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - <element name="size" type="xsd:int"/> - </sequence> - </complexType> - - - - <!-- Search Result --> - <complexType name="SearchResult"> - <sequence> - <element name="searchRecords" minOccurs="0" maxOccurs="unbounded" type="tns:SearchRecord"/> - <element name="sforceReserved" minOccurs="0" maxOccurs="1" type="xsd:string"/> - </sequence> - </complexType> - - <complexType name="SearchRecord"> - <sequence> - <element name="record" type="ens:sObject"/> - </sequence> - </complexType> - - <!-- GetUpdated Result --> - <complexType name="GetUpdatedResult"> - <sequence> - <element name="ids" minOccurs="0" maxOccurs="unbounded" type="tns:ID"/> - <element name="latestDateCovered" type="xsd:dateTime"/> - <element name="sforceReserved" minOccurs="0" maxOccurs="1" type="xsd:string"/> - </sequence> - </complexType> - - <!-- GetDeleted Result --> - <complexType name="GetDeletedResult"> - <sequence> - <element name="deletedRecords" minOccurs="0" maxOccurs="unbounded" type="tns:DeletedRecord"/> - <element name="earliestDateAvailable" type="xsd:dateTime"/> - <element name="latestDateCovered" type="xsd:dateTime"/> - <element name="sforceReserved" minOccurs="0" maxOccurs="1" type="xsd:string"/> - </sequence> - </complexType> - - <complexType name="DeletedRecord"> - <sequence> - <element name="deletedDate" type="xsd:dateTime"/> - <element name="id" type="tns:ID"/> - </sequence> - </complexType> - - - <complexType name="GetServerTimestampResult"> - <sequence> - <element name="timestamp" type="xsd:dateTime"/> - </sequence> - </complexType> - - - <!-- InvalidateSessions Result --> - <complexType name="InvalidateSessionsResult"> - <sequence> - <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> - <element name="success" type="xsd:boolean"/> - </sequence> - </complexType> - - <complexType name="SetPasswordResult"> - </complexType> - - <complexType name="ResetPasswordResult"> - <sequence> - <element name="password" type="xsd:string"/> - </sequence> - </complexType> - - <complexType name="GetUserInfoResult"> - <sequence> - <element name="accessibilityMode" type="xsd:boolean"/> - <element name="currencySymbol" type="xsd:string" nillable="true"/> - <element name="orgDefaultCurrencyIsoCode" type="xsd:string" nillable="true"/> - <element name="orgDisallowHtmlAttachments" type="xsd:boolean"/> - <element name="orgHasPersonAccounts" type="xsd:boolean"/> - <element name="organizationId" type="tns:ID"/> - <element name="organizationMultiCurrency" type="xsd:boolean"/> - <element name="organizationName" type="xsd:string"/> - <element name="profileId" type="tns:ID"/> - <element name="roleId" type="tns:ID" nillable="true"/> - <element name="userDefaultCurrencyIsoCode" type="xsd:string" nillable="true"/> - <element name="userEmail" type="xsd:string"/> - <element name="userFullName" type="xsd:string"/> - <element name="userId" type="tns:ID"/> - <element name="userLanguage" type="xsd:string"/> - <element name="userLocale" type="xsd:string"/> - <element name="userName" type="xsd:string"/> - <element name="userTimeZone" type="xsd:string"/> - <element name="userType" type="xsd:string"/> - <element name="userUiSkin" type="xsd:string"/> - </sequence> - </complexType> - - <complexType name="LoginResult"> - <sequence> - <element name="metadataServerUrl" type="xsd:string" nillable="true"/> - <element name="passwordExpired" type="xsd:boolean"/> - <element name="sandbox" type="xsd:boolean"/> - <element name="serverUrl" type="xsd:string" nillable="true"/> - <element name="sessionId" type="xsd:string" nillable="true"/> - - <element name="userId" type="tns:ID" nillable="true"/> - <element name="userInfo" type="tns:GetUserInfoResult" minOccurs="0"/> - </sequence> - </complexType> - - <simpleType name="StatusCode"> - <restriction base="xsd:string"> - <enumeration value="ALREADY_IN_PROCESS"/> - <enumeration value="ASSIGNEE_TYPE_REQUIRED"/> - <enumeration value="BAD_CUSTOM_ENTITY_PARENT_DOMAIN"/> - <enumeration value="BCC_NOT_ALLOWED_IF_BCC_COMPLIANCE_ENABLED"/> - <enumeration value="CANNOT_CASCADE_PRODUCT_ACTIVE"/> - <enumeration value="CANNOT_CHANGE_FIELD_TYPE_OF_APEX_REFERENCED_FIELD"/> - <enumeration value="CANNOT_CREATE_ANOTHER_MANAGED_PACKAGE"/> - <enumeration value="CANNOT_DEACTIVATE_DIVISION"/> - <enumeration value="CANNOT_DELETE_LAST_DATED_CONVERSION_RATE"/> - <enumeration value="CANNOT_DELETE_MANAGED_OBJECT"/> - <enumeration value="CANNOT_DISABLE_LAST_ADMIN"/> - <enumeration value="CANNOT_ENABLE_IP_RESTRICT_REQUESTS"/> - <enumeration value="CANNOT_INSERT_UPDATE_ACTIVATE_ENTITY"/> - <enumeration value="CANNOT_MODIFY_MANAGED_OBJECT"/> - <enumeration value="CANNOT_RENAME_APEX_REFERENCED_FIELD"/> - <enumeration value="CANNOT_RENAME_APEX_REFERENCED_OBJECT"/> - <enumeration value="CANNOT_REPARENT_RECORD"/> - <enumeration value="CANNOT_UPDATE_CONVERTED_LEAD"/> - <enumeration value="CANT_DISABLE_CORP_CURRENCY"/> - <enumeration value="CANT_UNSET_CORP_CURRENCY"/> - <enumeration value="CHILD_SHARE_FAILS_PARENT"/> - <enumeration value="CIRCULAR_DEPENDENCY"/> - <enumeration value="COMMUNITY_NOT_ACCESSIBLE"/> - <enumeration value="CUSTOM_CLOB_FIELD_LIMIT_EXCEEDED"/> - <enumeration value="CUSTOM_ENTITY_OR_FIELD_LIMIT"/> - <enumeration value="CUSTOM_FIELD_INDEX_LIMIT_EXCEEDED"/> - <enumeration value="CUSTOM_INDEX_EXISTS"/> - <enumeration value="CUSTOM_LINK_LIMIT_EXCEEDED"/> - <enumeration value="CUSTOM_TAB_LIMIT_EXCEEDED"/> - <enumeration value="DELETE_FAILED"/> - <enumeration value="DELETE_REQUIRED_ON_CASCADE"/> - <enumeration value="DEPENDENCY_EXISTS"/> - <enumeration value="DUPLICATE_CASE_SOLUTION"/> - <enumeration value="DUPLICATE_COMM_NICKNAME"/> - <enumeration value="DUPLICATE_CUSTOM_ENTITY_DEFINITION"/> - <enumeration value="DUPLICATE_CUSTOM_TAB_MOTIF"/> - <enumeration value="DUPLICATE_DEVELOPER_NAME"/> - <enumeration value="DUPLICATE_EXTERNAL_ID"/> - <enumeration value="DUPLICATE_MASTER_LABEL"/> - <enumeration value="DUPLICATE_SENDER_DISPLAY_NAME"/> - <enumeration value="DUPLICATE_USERNAME"/> - <enumeration value="DUPLICATE_VALUE"/> - <enumeration value="EMAIL_NOT_PROCESSED_DUE_TO_PRIOR_ERROR"/> - <enumeration value="EMPTY_SCONTROL_FILE_NAME"/> - <enumeration value="ENTITY_FAILED_IFLASTMODIFIED_ON_UPDATE"/> - <enumeration value="ENTITY_IS_ARCHIVED"/> - <enumeration value="ENTITY_IS_DELETED"/> - <enumeration value="ENTITY_IS_LOCKED"/> - <enumeration value="ERROR_IN_MAILER"/> - <enumeration value="FAILED_ACTIVATION"/> - <enumeration value="FIELD_CUSTOM_VALIDATION_EXCEPTION"/> - <enumeration value="FIELD_INTEGRITY_EXCEPTION"/> - <enumeration value="FILTERED_LOOKUP_LIMIT_EXCEEDED"/> - <enumeration value="HTML_FILE_UPLOAD_NOT_ALLOWED"/> - <enumeration value="IMAGE_TOO_LARGE"/> - <enumeration value="INACTIVE_OWNER_OR_USER"/> - <enumeration value="INSUFFICIENT_ACCESS_ON_CROSS_REFERENCE_ENTITY"/> - <enumeration value="INSUFFICIENT_ACCESS_OR_READONLY"/> - <enumeration value="INVALID_ACCESS_LEVEL"/> - <enumeration value="INVALID_ARGUMENT_TYPE"/> - <enumeration value="INVALID_ASSIGNEE_TYPE"/> - <enumeration value="INVALID_ASSIGNMENT_RULE"/> - <enumeration value="INVALID_BATCH_OPERATION"/> - <enumeration value="INVALID_CONTENT_TYPE"/> - <enumeration value="INVALID_CREDIT_CARD_INFO"/> - <enumeration value="INVALID_CROSS_REFERENCE_KEY"/> - <enumeration value="INVALID_CROSS_REFERENCE_TYPE_FOR_FIELD"/> - <enumeration value="INVALID_CURRENCY_CONV_RATE"/> - <enumeration value="INVALID_CURRENCY_CORP_RATE"/> - <enumeration value="INVALID_CURRENCY_ISO"/> - <enumeration value="INVALID_EMAIL_ADDRESS"/> - <enumeration value="INVALID_EMPTY_KEY_OWNER"/> - <enumeration value="INVALID_FIELD"/> - <enumeration value="INVALID_FIELD_FOR_INSERT_UPDATE"/> - <enumeration value="INVALID_FIELD_WHEN_USING_TEMPLATE"/> - <enumeration value="INVALID_FILTER_ACTION"/> - <enumeration value="INVALID_GOOGLE_DOCS_URL"/> - <enumeration value="INVALID_ID_FIELD"/> - <enumeration value="INVALID_INET_ADDRESS"/> - <enumeration value="INVALID_LINEITEM_CLONE_STATE"/> - <enumeration value="INVALID_MASTER_OR_TRANSLATED_SOLUTION"/> - <enumeration value="INVALID_MESSAGE_ID_REFERENCE"/> - <enumeration value="INVALID_OPERATION"/> - <enumeration value="INVALID_OPERATOR"/> - <enumeration value="INVALID_OR_NULL_FOR_RESTRICTED_PICKLIST"/> - <enumeration value="INVALID_PARTNER_NETWORK_STATUS"/> - <enumeration value="INVALID_PERSON_ACCOUNT_OPERATION"/> - <enumeration value="INVALID_SAVE_AS_ACTIVITY_FLAG"/> - <enumeration value="INVALID_SESSION_ID"/> - <enumeration value="INVALID_SETUP_OWNER"/> - <enumeration value="INVALID_STATUS"/> - <enumeration value="INVALID_TYPE"/> - <enumeration value="INVALID_TYPE_FOR_OPERATION"/> - <enumeration value="INVALID_TYPE_ON_FIELD_IN_RECORD"/> - <enumeration value="IP_RANGE_LIMIT_EXCEEDED"/> - <enumeration value="LICENSE_LIMIT_EXCEEDED"/> - <enumeration value="LIGHT_PORTAL_USER_EXCEPTION"/> - <enumeration value="LIMIT_EXCEEDED"/> - <enumeration value="MALFORMED_ID"/> - <enumeration value="MANAGER_NOT_DEFINED"/> - <enumeration value="MASSMAIL_RETRY_LIMIT_EXCEEDED"/> - <enumeration value="MASS_MAIL_LIMIT_EXCEEDED"/> - <enumeration value="MAXIMUM_CCEMAILS_EXCEEDED"/> - <enumeration value="MAXIMUM_DASHBOARD_COMPONENTS_EXCEEDED"/> - <enumeration value="MAXIMUM_HIERARCHY_LEVELS_REACHED"/> - <enumeration value="MAXIMUM_SIZE_OF_ATTACHMENT"/> - <enumeration value="MAXIMUM_SIZE_OF_DOCUMENT"/> - <enumeration value="MAX_ACTIONS_PER_RULE_EXCEEDED"/> - <enumeration value="MAX_ACTIVE_RULES_EXCEEDED"/> - <enumeration value="MAX_APPROVAL_STEPS_EXCEEDED"/> - <enumeration value="MAX_FORMULAS_PER_RULE_EXCEEDED"/> - <enumeration value="MAX_RULES_EXCEEDED"/> - <enumeration value="MAX_RULE_ENTRIES_EXCEEDED"/> - <enumeration value="MAX_TASK_DESCRIPTION_EXCEEEDED"/> - <enumeration value="MAX_TM_RULES_EXCEEDED"/> - <enumeration value="MAX_TM_RULE_ITEMS_EXCEEDED"/> - <enumeration value="MERGE_FAILED"/> - <enumeration value="MISSING_ARGUMENT"/> - <enumeration value="MIXED_DML_OPERATION"/> - <enumeration value="NONUNIQUE_SHIPPING_ADDRESS"/> - <enumeration value="NO_APPLICABLE_PROCESS"/> - <enumeration value="NO_ATTACHMENT_PERMISSION"/> - <enumeration value="NO_INACTIVE_DIVISION_MEMBERS"/> - <enumeration value="NO_MASS_MAIL_PERMISSION"/> - <enumeration value="NUMBER_OUTSIDE_VALID_RANGE"/> - <enumeration value="NUM_HISTORY_FIELDS_BY_SOBJECT_EXCEEDED"/> - <enumeration value="OPTED_OUT_OF_MASS_MAIL"/> - <enumeration value="PACKAGE_LICENSE_REQUIRED"/> - <enumeration value="PORTAL_USER_ALREADY_EXISTS_FOR_CONTACT"/> - <enumeration value="PRIVATE_CONTACT_ON_ASSET"/> - <enumeration value="RECORD_IN_USE_BY_WORKFLOW"/> - <enumeration value="REQUEST_RUNNING_TOO_LONG"/> - <enumeration value="REQUIRED_FIELD_MISSING"/> - <enumeration value="SELF_REFERENCE_FROM_TRIGGER"/> - <enumeration value="SHARE_NEEDED_FOR_CHILD_OWNER"/> - <enumeration value="STANDARD_PRICE_NOT_DEFINED"/> - <enumeration value="STORAGE_LIMIT_EXCEEDED"/> - <enumeration value="STRING_TOO_LONG"/> - <enumeration value="TABSET_LIMIT_EXCEEDED"/> - <enumeration value="TEMPLATE_NOT_ACTIVE"/> - <enumeration value="TERRITORY_REALIGN_IN_PROGRESS"/> - <enumeration value="TEXT_DATA_OUTSIDE_SUPPORTED_CHARSET"/> - <enumeration value="TOO_MANY_APEX_REQUESTS"/> - <enumeration value="TOO_MANY_ENUM_VALUE"/> - <enumeration value="TRANSFER_REQUIRES_READ"/> - <enumeration value="UNABLE_TO_LOCK_ROW"/> - <enumeration value="UNAVAILABLE_RECORDTYPE_EXCEPTION"/> - <enumeration value="UNDELETE_FAILED"/> - <enumeration value="UNKNOWN_EXCEPTION"/> - <enumeration value="UNSPECIFIED_EMAIL_ADDRESS"/> - <enumeration value="UNSUPPORTED_APEX_TRIGGER_OPERATON"/> - <enumeration value="UNVERIFIED_SENDER_ADDRESS"/> - <enumeration value="WEBLINK_SIZE_LIMIT_EXCEEDED"/> - <enumeration value="WRONG_CONTROLLER_TYPE"/> - </restriction> - </simpleType> - - - <complexType name="Error"> - <sequence> - <element name="fields" type="xsd:string" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - <element name="message" type="xsd:string"/> - <element name="statusCode" type="tns:StatusCode"/> - </sequence> - </complexType> - - <complexType name="SendEmailError"> - <sequence> - <element name="fields" type="xsd:string" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - <element name="message" type="xsd:string"/> - <element name="statusCode" type="tns:StatusCode"/> - <element name="targetObjectId" type="tns:ID" nillable="true"/> - </sequence> - </complexType> - - <complexType name="SaveResult"> - <sequence> - <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> - <element name="id" type="tns:ID" nillable="true"/> - <element name="success" type="xsd:boolean"/> - </sequence> - </complexType> - - <complexType name="UpsertResult"> - <sequence> - <element name="created" type="xsd:boolean"/> - <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> - <element name="id" type="tns:ID" nillable="true"/> - <element name="success" type="xsd:boolean"/> - </sequence> - </complexType> - - <complexType name="MergeRequest"> - <sequence> - <element name="masterRecord" type="ens:sObject"/> - <element name="recordToMergeIds" type="tns:ID" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <complexType name="MergeResult"> - <sequence> - <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> - <element name="id" type="tns:ID" nillable="true"/> - <element name="mergedRecordIds" type="tns:ID" minOccurs="0" maxOccurs="unbounded"/> - <element name="success" type="xsd:boolean"/> - <element name="updatedRelatedIds" type="tns:ID" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <complexType name="ProcessRequest"> - <sequence> - <element name="comments" type="xsd:string" nillable="true"/> - <element name="nextApproverIds" type="tns:ID" minOccurs="0" maxOccurs="unbounded" nillable="true"/> - </sequence> - </complexType> - - <complexType name="ProcessSubmitRequest"> - <complexContent> - <extension base="tns:ProcessRequest"> - <sequence> - <element name="objectId" type="tns:ID"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name="ProcessWorkitemRequest"> - <complexContent> - <extension base="tns:ProcessRequest"> - <sequence> - <element name="action" type="xsd:string"/> - <element name="workitemId" type="tns:ID"/> - </sequence> - </extension> - </complexContent> - </complexType> - - - - <complexType name="ProcessResult"> - <sequence> - <element name="actorIds" type="tns:ID" nillable="false" minOccurs="0" maxOccurs="unbounded"/> - <element name="entityId" type="tns:ID" nillable="true"/> - <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> - <element name="instanceId" type="tns:ID" nillable="true"/> - <element name="instanceStatus" type="xsd:string" nillable="true"/> - <element name="newWorkitemIds" type="tns:ID" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - <element name="success" type="xsd:boolean"/> - </sequence> - </complexType> - - - - - - <complexType name="DeleteResult"> - <sequence> - <element name="errors" type="tns:Error" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - <element name="id" type="tns:ID" nillable="true"/> - <element name="success" type="xsd:boolean"/> - </sequence> - </complexType> - - <complexType name="UndeleteResult"> - <sequence> - <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> - <element name="id" type="tns:ID" nillable="true"/> - <element name="success" type="xsd:boolean"/> - </sequence> - </complexType> - - <complexType name="EmptyRecycleBinResult"> - <sequence> - <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> - <element name="id" type="tns:ID" nillable="true"/> - <element name="success" type="xsd:boolean"/> - </sequence> - </complexType> - - <complexType name="LeadConvert"> - <sequence> - <element name="accountId" type="tns:ID" nillable="true"/> - <element name="contactId" type="tns:ID" nillable="true"/> - <element name="convertedStatus" type="xsd:string"/> - <element name="doNotCreateOpportunity" type="xsd:boolean"/> - <element name="leadId" type="tns:ID"/> - <element name="opportunityName" type="xsd:string" nillable="true"/> - <element name="overwriteLeadSource" type="xsd:boolean"/> - <element name="ownerId" type="tns:ID" nillable="true"/> - <element name="sendNotificationEmail" type="xsd:boolean"/> - </sequence> - </complexType> - - <complexType name="LeadConvertResult"> - <sequence> - <element name="accountId" type="tns:ID" nillable="true"/> - <element name="contactId" type="tns:ID" nillable="true"/> - <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> - <element name="leadId" type="tns:ID" nillable="true"/> - <element name="opportunityId" type="tns:ID" nillable="true"/> - <element name="success" type="xsd:boolean"/> - </sequence> - </complexType> - - <complexType name="DescribeSObjectResult"> - <sequence> - <element name="activateable" type="xsd:boolean"/> - <element name="childRelationships" type="tns:ChildRelationship" minOccurs="0" maxOccurs="unbounded"/> - <element name="createable" type="xsd:boolean"/> - <element name="custom" type="xsd:boolean"/> - <element name="customSetting" type="xsd:boolean"/> - <element name="deletable" type="xsd:boolean"/> - <element name="deprecatedAndHidden" type="xsd:boolean"/> - <element name="fields" type="tns:Field" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - <element name="keyPrefix" type="xsd:string" nillable="true"/> - <element name="label" type="xsd:string"/> - <element name="labelPlural" type="xsd:string"/> - <element name="layoutable" type="xsd:boolean"/> - <element name="mergeable" type="xsd:boolean"/> - <element name="name" type="xsd:string"/> - <element name="queryable" type="xsd:boolean"/> - <element name="recordTypeInfos" type="tns:RecordTypeInfo" minOccurs="0" maxOccurs="unbounded"/> - <element name="replicateable" type="xsd:boolean"/> - <element name="retrieveable" type="xsd:boolean"/> - <element name="searchable" type="xsd:boolean"/> - <element name="triggerable" type="xsd:boolean" minOccurs="0"/> - <element name="undeletable" type="xsd:boolean"/> - <element name="updateable" type="xsd:boolean"/> - <element name="urlDetail" type="xsd:string" nillable="true"/> - <element name="urlEdit" type="xsd:string" nillable="true"/> - <element name="urlNew" type="xsd:string" nillable="true"/> - </sequence> - </complexType> - - <!-- this is a subset of properties for each SObject that is returned by the describeGlobal call --> - <complexType name="DescribeGlobalSObjectResult"> - <sequence> - <element name="activateable" type="xsd:boolean"/> - <element name="createable" type="xsd:boolean"/> - <element name="custom" type="xsd:boolean"/> - <element name="customSetting" type="xsd:boolean"/> - <element name="deletable" type="xsd:boolean"/> - <element name="deprecatedAndHidden" type="xsd:boolean"/> - <element name="keyPrefix" type="xsd:string" nillable="true"/> - <element name="label" type="xsd:string"/> - <element name="labelPlural" type="xsd:string"/> - <element name="layoutable" type="xsd:boolean"/> - <element name="mergeable" type="xsd:boolean"/> - <element name="name" type="xsd:string"/> - <element name="queryable" type="xsd:boolean"/> - <element name="replicateable" type="xsd:boolean"/> - <element name="retrieveable" type="xsd:boolean"/> - <element name="searchable" type="xsd:boolean"/> - <element name="triggerable" type="xsd:boolean"/> - <element name="undeletable" type="xsd:boolean"/> - <element name="updateable" type="xsd:boolean"/> - </sequence> - </complexType> - - <complexType name="ChildRelationship"> - <sequence> - <element name="cascadeDelete" type="xsd:boolean"/> - <element name="childSObject" type="xsd:string"/> - <element name="deprecatedAndHidden" type="xsd:boolean"/> - <element name="field" type="xsd:string"/> - <element name="relationshipName" type="xsd:string" minOccurs="0"/> - </sequence> - </complexType> - - <complexType name="DescribeGlobalResult"> - <sequence> - <element name="encoding" type="xsd:string" nillable="true"/> - <element name="maxBatchSize" type="xsd:int"/> - <element name="sobjects" type="tns:DescribeGlobalSObjectResult" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <simpleType name="fieldType"> - <restriction base="xsd:string"> - <enumeration value="string"/> - <enumeration value="picklist"/> - <enumeration value="multipicklist"/> - <enumeration value="combobox"/> - <enumeration value="reference"/> - <enumeration value="base64"/> - <enumeration value="boolean"/> - <enumeration value="currency"/> - <enumeration value="textarea"/> - <enumeration value="int"/> - <enumeration value="double"/> - <enumeration value="percent"/> - <enumeration value="phone"/> - <enumeration value="id"/> - <enumeration value="date"/> - <enumeration value="datetime"/> - <enumeration value="time"/> - <enumeration value="url"/> - <enumeration value="email"/> - <enumeration value="encryptedstring"/> - <enumeration value="anyType"/> <!-- can be string, picklist, reference, boolean, currency, int, double, percent, id, date, datetime, url, email --> - </restriction> - </simpleType> - - <simpleType name="soapType"> - <restriction base="xsd:string"> - <enumeration value="tns:ID"/> - <enumeration value="xsd:base64Binary"/> - <enumeration value="xsd:boolean"/> - <enumeration value="xsd:double"/> - <enumeration value="xsd:int"/> - <enumeration value="xsd:string"/> - <enumeration value="xsd:date"/> - <enumeration value="xsd:dateTime"/> - <enumeration value="xsd:time"/> - <enumeration value="xsd:anyType"/> <!-- can be id, booolean, double, int, string, date, dateTime --> - </restriction> - </simpleType> - - <complexType name="Field"> - <sequence> - <element name="autoNumber" type="xsd:boolean"/> - <element name="byteLength" type="xsd:int"/> - <element name="calculated" type="xsd:boolean"/> - <element name="calculatedFormula" type="xsd:string" minOccurs="0"/> - <element name="caseSensitive" type="xsd:boolean"/> - <element name="controllerName" type="xsd:string" minOccurs="0"/> - <element name="createable" type="xsd:boolean"/> - <element name="custom" type="xsd:boolean"/> - <element name="defaultValueFormula" type="xsd:string" minOccurs="0"/> - <element name="defaultedOnCreate" type="xsd:boolean"/> - <element name="dependentPicklist" type="xsd:boolean" minOccurs="0"/> - <element name="deprecatedAndHidden" type="xsd:boolean"/> - <element name="digits" type="xsd:int"/> - <element name="externalId" type="xsd:boolean" minOccurs="0"/> - <element name="filterable" type="xsd:boolean"/> - <element name="htmlFormatted" type="xsd:boolean" minOccurs="0"/> - <element name="idLookup" type="xsd:boolean"/> - <element name="inlineHelpText" type="xsd:string" minOccurs="0"/> - <element name="label" type="xsd:string"/> - <element name="length" type="xsd:int"/> - <element name="name" type="xsd:string"/> - <element name="nameField" type="xsd:boolean"/> - <element name="namePointing" type="xsd:boolean" minOccurs="0"/> - <element name="nillable" type="xsd:boolean"/> - <element name="picklistValues" type="tns:PicklistEntry" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - <element name="precision" type="xsd:int"/> - <element name="referenceTo" type="xsd:string" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - <element name="relationshipName" type="xsd:string" minOccurs="0"/> - <element name="relationshipOrder" type="xsd:int" minOccurs="0"/> - <element name="restrictedPicklist" type="xsd:boolean"/> - <element name="scale" type="xsd:int"/> - <element name="soapType" type="tns:soapType"/> - <element name="sortable" type="xsd:boolean" minOccurs="0"/> - <element name="type" type="tns:fieldType"/> - <element name="unique" type="xsd:boolean"/> - <element name="updateable" type="xsd:boolean"/> - <element name="writeRequiresMasterRead" type="xsd:boolean" minOccurs="0"/> - </sequence> - </complexType> - - <complexType name="PicklistEntry"> - <sequence> - <element name="active" type="xsd:boolean"/> - <element name="defaultValue" type="xsd:boolean"/> - <element name="label" type="xsd:string" nillable="true"/> - <element name="validFor" type="xsd:base64Binary" minOccurs="0"/> - <element name="value" type="xsd:string"/> - </sequence> - </complexType> - - <complexType name="DescribeSoftphoneLayoutResult"> - <sequence> - <element name="callTypes" type="tns:DescribeSoftphoneLayoutCallType" maxOccurs="unbounded"/> - <element name="id" type="tns:ID"/> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - - <complexType name="DescribeSoftphoneLayoutCallType"> - <sequence> - <element name="infoFields" type="tns:DescribeSoftphoneLayoutInfoField" maxOccurs="unbounded"/> - <element name="name" type="xsd:string"/> - <element name="sections" type="tns:DescribeSoftphoneLayoutSection" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <complexType name="DescribeSoftphoneLayoutInfoField"> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - - <complexType name="DescribeSoftphoneLayoutSection"> - <sequence> - <element name="entityApiName" type="xsd:string"/> - <element name="items" type="tns:DescribeSoftphoneLayoutItem" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <complexType name="DescribeSoftphoneLayoutItem"> - <sequence> - <element name="itemApiName" type="xsd:string"/> - </sequence> - </complexType> - - <complexType name="DescribeLayoutResult"> - <sequence> - <element name="layouts" type="tns:DescribeLayout" maxOccurs="unbounded"/> - <element name="recordTypeMappings" type="tns:RecordTypeMapping" minOccurs="0" maxOccurs="unbounded"/> - <element name="recordTypeSelectorRequired" type="xsd:boolean"/> - </sequence> - </complexType> - - <complexType name="DescribeLayout"> - <sequence> - <element name="buttonLayoutSection" type="tns:DescribeLayoutButtonSection" minOccurs="0"/> - <element name="detailLayoutSections" type="tns:DescribeLayoutSection" minOccurs="0" maxOccurs="unbounded"/> - <element name="editLayoutSections" type="tns:DescribeLayoutSection" minOccurs="0" maxOccurs="unbounded"/> - <element name="id" type="tns:ID"/> - - - <element name="relatedLists" type="tns:RelatedList" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <complexType name="DescribeLayoutSection"> - <sequence> - <element name="columns" type="xsd:int"/> - <element name="heading" type="xsd:string"/> - <element name="layoutRows" type="tns:DescribeLayoutRow" maxOccurs="unbounded"/> - <element name="rows" type="xsd:int"/> - <element name="useCollapsibleSection" type="xsd:boolean"/> - <element name="useHeading" type="xsd:boolean"/> - </sequence> - </complexType> - - <complexType name="DescribeLayoutButtonSection"> - <sequence> - <element name="detailButtons" type="tns:DescribeLayoutButton" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <complexType name="DescribeLayoutRow"> - <sequence> - <element name="layoutItems" type="tns:DescribeLayoutItem" maxOccurs="unbounded"/> - <element name="numItems" type="xsd:int"/> - </sequence> - </complexType> - - <complexType name="DescribeLayoutItem"> - <sequence> - <element name="editable" type="xsd:boolean"/> - <element name="label" type="xsd:string" nillable="true"/> - <element name="layoutComponents" type="tns:DescribeLayoutComponent" minOccurs="0" maxOccurs="unbounded"/> - <element name="placeholder" type="xsd:boolean"/> - <element name="required" type="xsd:boolean"/> - </sequence> - </complexType> - - <complexType name="DescribeLayoutButton"> - <sequence> - <element name="custom" type="xsd:boolean"/> - <element name="label" type="xsd:string" nillable="true"/> - <element name="name" type="xsd:string" nillable="true"/> - </sequence> - </complexType> - - <complexType name="DescribeLayoutComponent"> - <sequence> - <element name="displayLines" type="xsd:int"/> - <element name="tabOrder" type="xsd:int"/> - <element name="type" type="tns:layoutComponentType"/> - <element name="value" type="xsd:string"/> - </sequence> - </complexType> - - <simpleType name="layoutComponentType"> - <restriction base="xsd:string"> - <enumeration value="Field"/> - <enumeration value="Separator"/> - <enumeration value="SControl"/> - <enumeration value="EmptySpace"/> - </restriction> - </simpleType> - - <complexType name="RecordTypeInfo"> - <sequence> - <element name="available" type="xsd:boolean"/> - <element name="defaultRecordTypeMapping" type="xsd:boolean"/> - <element name="name" type="xsd:string"/> - <element name="recordTypeId" type="tns:ID" nillable="true"/> - </sequence> - </complexType> - - <complexType name="RecordTypeMapping"> - <sequence> - <element name="available" type="xsd:boolean"/> - <element name="defaultRecordTypeMapping" type="xsd:boolean"/> - <element name="layoutId" type="tns:ID"/> - <element name="name" type="xsd:string"/> - <element name="picklistsForRecordType" type="tns:PicklistForRecordType" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - <element name="recordTypeId" type="tns:ID" nillable="true"/> - </sequence> - </complexType> - - <complexType name="PicklistForRecordType"> - <sequence> - <element name="picklistName" type="xsd:string"/> - <element name="picklistValues" type="tns:PicklistEntry" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <complexType name="RelatedList"> - <sequence> - <element name="columns" type="tns:RelatedListColumn" maxOccurs="unbounded"/> - <element name="custom" type="xsd:boolean"/> - <element name="field" type="xsd:string" nillable="true"/> - <element name="label" type="xsd:string"/> - <element name="limitRows" type="xsd:int"/> - <element name="name" type="xsd:string"/> - <element name="sobject" type="xsd:string" nillable="true"/> - <element name="sort" type="tns:RelatedListSort" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <complexType name="RelatedListColumn"> - <sequence> - <element name="field" type="xsd:string" nillable="true"/> - <element name="format" type="xsd:string" nillable="true"/> - <element name="label" type="xsd:string"/> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - - <complexType name="RelatedListSort"> - <sequence> - <element name="ascending" type="xsd:boolean"/> - <element name="column" type="xsd:string"/> - </sequence> - </complexType> - - - - <complexType name="EmailFileAttachment"> - <sequence> - <element name="body" nillable="true" minOccurs="0" type="xsd:base64Binary"/> - <element name="contentType" nillable="true" minOccurs="0" type="xsd:string"/> - <element name="fileName" type="xsd:string"/> - <element name="inline" type="xsd:boolean" minOccurs="0"/> - </sequence> - </complexType> - <simpleType name="EmailPriority"> - <restriction base="xsd:string"> - <enumeration value="Highest"/> - <enumeration value="High"/> - <enumeration value="Normal"/> - <enumeration value="Low"/> - <enumeration value="Lowest"/> - </restriction> - </simpleType> - - <complexType name="Email"> - <sequence> - <element name="bccSender" type="xsd:boolean" nillable="true"/> - <element name="emailPriority" type="tns:EmailPriority" nillable="true"/> - <element name="replyTo" type="xsd:string" nillable="true"/> - <element name="saveAsActivity" type="xsd:boolean" nillable="true"/> - <element name="senderDisplayName" type="xsd:string" nillable="true"/> - <element name="subject" type="xsd:string" nillable="true"/> - <element name="useSignature" type="xsd:boolean" nillable="true"/> - </sequence> - </complexType> - - <complexType name="MassEmailMessage"> - <complexContent> - <extension base="tns:Email"> - <sequence> - <element name="description" type="xsd:string" nillable="true"/> - <element name="targetObjectIds" minOccurs="0" maxOccurs="250" type="tns:ID"/> - <element name="templateId" type="tns:ID"/> - <element name="whatIds" minOccurs="0" maxOccurs="250" type="tns:ID"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name="SingleEmailMessage"> - <complexContent> - <extension base="tns:Email"> - <sequence> - <element name="bccAddresses" minOccurs="0" maxOccurs="25" type="xsd:string" nillable="true"/> - <element name="ccAddresses" minOccurs="0" maxOccurs="25" type="xsd:string" nillable="true"/> - <element name="charset" type="xsd:string" nillable="true"/> - <element name="documentAttachments" minOccurs="0" maxOccurs="unbounded" type="tns:ID"/> - <element name="htmlBody" type="xsd:string" nillable="true"/> - <element name="inReplyTo" minOccurs="0" type="xsd:string" nillable="true"/> - <element name="fileAttachments" minOccurs="0" maxOccurs="unbounded" type="tns:EmailFileAttachment"/> - <element name="orgWideEmailAddressId" minOccurs="0" maxOccurs="1" type="tns:ID" nillable="true"/> - <element name="plainTextBody" type="xsd:string" nillable="true"/> - <element name="references" minOccurs="0" type="xsd:string" nillable="true"/> - <element name="targetObjectId" type="tns:ID" nillable="true"/> - <element name="templateId" type="tns:ID" nillable="true"/> - <element name="toAddresses" minOccurs="0" maxOccurs="100" type="xsd:string" nillable="true"/> - <element name="whatId" type="tns:ID" nillable="true"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name="SendEmailResult"> - <sequence> - <element name="errors" minOccurs="0" maxOccurs="unbounded" type="tns:SendEmailError"/> - <element name="success" type="xsd:boolean"/> - </sequence> - </complexType> - - - - <complexType name="DescribeTabSetResult"> - <sequence> - <element name="label" type="xsd:string"/> - <element name="logoUrl" type="xsd:string"/> - <element name="namespace" type="xsd:string" minOccurs="0"/> - <element name="selected" type="xsd:boolean"/> - <element name="tabs" type="tns:DescribeTab" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - - <complexType name="DescribeTab"> - <sequence> - <element name="custom" type="xsd:boolean"/> - <element name="iconUrl" type="xsd:string"/> - <element name="label" type="xsd:string"/> - <element name="miniIconUrl" type="xsd:string"/> - <element name="sobjectName" type="xsd:string" nillable="true"/> - <element name="url" type="xsd:string"/> - </sequence> - </complexType> - - - - - - <!-- Login Message Types --> - <element name="login"> - <complexType> - <sequence> - <element name="username" type="xsd:string"/> - <element name="password" type="xsd:string"/> - </sequence> - </complexType> - </element> - <element name="loginResponse"> - <complexType> - <sequence> - <element name="result" type="tns:LoginResult"/> - </sequence> - </complexType> - </element> - - <!-- Describe Message Types --> - <element name="describeSObject"> - <complexType> - <sequence> - <element name="sObjectType" type="xsd:string"/> - </sequence> - </complexType> - </element> - <element name="describeSObjectResponse"> - <complexType> - <sequence> - <element name="result" type="tns:DescribeSObjectResult" nillable="true"/> - </sequence> - </complexType> - </element> - - <!-- DescibeSObjects Message Types --> - <element name="describeSObjects"> - <complexType> - <sequence> - <element name="sObjectType" type="xsd:string" minOccurs="0" maxOccurs="100"/> - </sequence> - </complexType> - </element> - <element name="describeSObjectsResponse"> - <complexType> - <sequence> - <element name="result" type="tns:DescribeSObjectResult" nillable="true" minOccurs="0" maxOccurs="100"/> - </sequence> - </complexType> - </element> - - <!-- Describe Global Message Types --> - <element name="describeGlobal"> - <complexType> - <sequence/> - </complexType> - </element> - <element name="describeGlobalResponse"> - <complexType> - <sequence> - <element name="result" type="tns:DescribeGlobalResult"/> - </sequence> - </complexType> - </element> - - <element name="describeLayout"> - <complexType> - <sequence> - <element name="sObjectType" type="xsd:string"/> - <element name="recordTypeIds" type="tns:ID" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - <element name="describeLayoutResponse"> - <complexType> - <sequence> - <element name="result" type="tns:DescribeLayoutResult" nillable="true"/> - </sequence> - </complexType> - </element> - - <element name="describeSoftphoneLayout"> - <complexType> - <sequence/> - </complexType> - </element> - <element name="describeSoftphoneLayoutResponse"> - <complexType> - <sequence> - <element name="result" type="tns:DescribeSoftphoneLayoutResult" nillable="true"/> - </sequence> - </complexType> - </element> - - - <element name="describeTabs"> - <complexType> - <sequence/> - </complexType> - </element> - <element name="describeTabsResponse"> - <complexType> - <sequence> - <element name="result" type="tns:DescribeTabSetResult" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - <!-- Create Message Types --> - <element name="create"> - <complexType> - <sequence> - <element name="sObjects" type="ens:sObject" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - <element name="createResponse"> - <complexType> - <sequence> - <element name="result" type="tns:SaveResult" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - - - <!-- Send Email Types --> - <element name="sendEmail"> - <complexType> - <sequence> - <element name="messages" type="tns:Email" minOccurs="0" maxOccurs="10"/> - </sequence> - </complexType> - </element> - <element name="sendEmailResponse"> - <complexType> - <sequence> - <element name="result" minOccurs="0" maxOccurs="10" type="tns:SendEmailResult"/> - </sequence> - </complexType> - </element> - - - <!-- Update Message Types --> - <element name="update"> - <complexType> - <sequence> - <element name="sObjects" type="ens:sObject" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - <element name="updateResponse"> - <complexType> - <sequence> - <element name="result" type="tns:SaveResult" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - <!-- Upsert Message Types --> - <element name="upsert"> - <complexType> - <sequence> - <element name="externalIDFieldName" type="xsd:string"/> - <element name="sObjects" type="ens:sObject" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - <element name="upsertResponse"> - <complexType> - <sequence> - <element name="result" type="tns:UpsertResult" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - <!-- Merge Message Types --> - <element name="merge"> - <complexType> - <sequence> - <element name="request" type="tns:MergeRequest" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - <element name="mergeResponse"> - <complexType> - <sequence> - <element name="result" type="tns:MergeResult" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - <!-- Delete Message Types --> - <element name="delete"> - <complexType> - <sequence> - <element name="ids" type="tns:ID" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - <element name="deleteResponse"> - <complexType> - <sequence> - <element name="result" type="tns:DeleteResult" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - <!-- Undelete Message Types --> - <element name="undelete"> - <complexType> - <sequence> - <element name="ids" type="tns:ID" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - <element name="undeleteResponse"> - <complexType> - <sequence> - <element name="result" type="tns:UndeleteResult" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - <!-- EmptyRecycleBin Message Types --> - <element name="emptyRecycleBin"> - <complexType> - <sequence> - <element name="ids" type="tns:ID" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - <element name="emptyRecycleBinResponse"> - <complexType> - <sequence> - <element name="result" type="tns:EmptyRecycleBinResult" minOccurs="1" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - <!-- Process Message Types --> - <element name="process"> - <complexType> - <sequence> - <element name="actions" type="tns:ProcessRequest" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - <element name="processResponse"> - <complexType> - <sequence> - <element name="result" type="tns:ProcessResult" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - - - - <!-- Retrieve (ID List) Message Types --> - <element name="retrieve"> - <complexType> - <sequence> - <element name="fieldList" type="xsd:string"/> - <element name="sObjectType" type="xsd:string"/> - <element name="ids" type="tns:ID" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - <element name="retrieveResponse"> - <complexType> - <sequence> - <element name="result" type="ens:sObject" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - <!-- Convert Lead Message Types --> - <element name="convertLead"> - <complexType> - <sequence> - <element name="leadConverts" type="tns:LeadConvert" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - <element name="convertLeadResponse"> - <complexType> - <sequence> - <element name="result" type="tns:LeadConvertResult" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - <!-- Get Updated Message Types --> - <element name="getUpdated"> - <complexType> - <sequence> - <element name="sObjectType" type="xsd:string"/> - <element name="startDate" type="xsd:dateTime"/> - <element name="endDate" type="xsd:dateTime"/> - </sequence> - </complexType> - </element> - <element name="getUpdatedResponse"> - <complexType> - <sequence> - <element name="result" type="tns:GetUpdatedResult"/> - </sequence> - </complexType> - </element> - - <!-- Get Deleted Message Types --> - <element name="getDeleted"> - <complexType> - <sequence> - <element name="sObjectType" type="xsd:string"/> - <element name="startDate" type="xsd:dateTime"/> - <element name="endDate" type="xsd:dateTime"/> - </sequence> - </complexType> - </element> - <element name="getDeletedResponse"> - <complexType> - <sequence> - <element name="result" type="tns:GetDeletedResult"/> - </sequence> - </complexType> - </element> - - - <!-- Logout current session --> - <element name="logout"> - <complexType> - </complexType> - </element> - - <element name="logoutResponse"> - <complexType> - </complexType> - </element> - - <!-- Invalidate a list of session ids --> - <element name="invalidateSessions"> - <complexType> - <sequence> - <element name="sessionIds" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - <element name="invalidateSessionsResponse"> - <complexType> - <sequence> - <element name="result" type="tns:InvalidateSessionsResult" minOccurs="0" maxOccurs="unbounded"/> - </sequence> - </complexType> - </element> - - <!-- Create Query --> - <element name="query"> - <complexType> - <sequence> - <element name="queryString" type="xsd:string"/> - </sequence> - </complexType> - </element> - <element name="queryResponse"> - <complexType> - <sequence> - <element name="result" type="tns:QueryResult"/> - </sequence> - </complexType> - </element> - - <!-- Create Query All --> - <element name="queryAll"> - <complexType> - <sequence> - <element name="queryString" type="xsd:string"/> - </sequence> - </complexType> - </element> - <element name="queryAllResponse"> - <complexType> - <sequence> - <element name="result" type="tns:QueryResult"/> - </sequence> - </complexType> - </element> - - <!-- Next Batch of sObjects from a query --> - <element name="queryMore"> - <complexType> - <sequence> - <element name="queryLocator" type="tns:QueryLocator"/> - </sequence> - </complexType> - </element> - <element name="queryMoreResponse"> - <complexType> - <sequence> - <element name="result" type="tns:QueryResult"/> - </sequence> - </complexType> - </element> - - - - <!-- Create Search --> - <element name="search"> - <complexType> - <sequence> - <element name="searchString" type="xsd:string"/> - </sequence> - </complexType> - </element> - <element name="searchResponse"> - <complexType> - <sequence> - <element name="result" type="tns:SearchResult"/> - </sequence> - </complexType> - </element> - - - - <element name="getServerTimestamp"> - <complexType> - <sequence/> - </complexType> - </element> - <element name="getServerTimestampResponse"> - <complexType> - <sequence> - <element name="result" type="tns:GetServerTimestampResult"/> - </sequence> - </complexType> - </element> - - <element name="setPassword"> - <complexType> - <sequence> - <element name="userId" type="tns:ID"/> - <element name="password" type="xsd:string"/> - </sequence> - </complexType> - </element> - <element name="setPasswordResponse"> - <complexType> - <sequence> - <element name="result" type="tns:SetPasswordResult"/> - </sequence> - </complexType> - </element> - - <element name="resetPassword"> - <complexType> - <sequence> - <element name="userId" type="tns:ID"/> - </sequence> - </complexType> - </element> - <element name="resetPasswordResponse"> - <complexType> - <sequence> - <element name="result" type="tns:ResetPasswordResult"/> - </sequence> - </complexType> - </element> - - <element name="getUserInfo"> - <complexType> - <sequence/> - </complexType> - </element> - <element name="getUserInfoResponse"> - <complexType> - <sequence> - <element name="result" type="tns:GetUserInfoResult"/> - </sequence> - </complexType> - </element> - - - - <!-- Header Elements --> - <element name="SessionHeader"> - <complexType> - <sequence> - <element name="sessionId" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="LoginScopeHeader"> - <complexType> - <sequence> - <element name="organizationId" type="tns:ID"/> - <element name="portalId" type="tns:ID" minOccurs="0"/> - </sequence> - </complexType> - </element> - - - <element name="CallOptions"> - <complexType> - <sequence> - <element name="client" type="xsd:string" nillable="true"/> - <element name="defaultNamespace" type="xsd:string" nillable="true"/> - - </sequence> - </complexType> - </element> - - - <element name="QueryOptions"> - <complexType> - <sequence> - <element name="batchSize" type="xsd:int" minOccurs="0"/> - - </sequence> - </complexType> - </element> - - - <simpleType name="DebugLevel"> - <restriction base="xsd:string"> - <enumeration value="None"/> - <enumeration value="DebugOnly"/> - <enumeration value="Db"/> - </restriction> - </simpleType> - <element name="DebuggingHeader"> - <complexType> - <sequence> - <element name="debugLevel" type="tns:DebugLevel"/> - </sequence> - </complexType> - </element> - <element name="DebuggingInfo"> - <complexType> - <sequence> - <element name="debugLog" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <xsd:complexType name="PackageVersion"> - <xsd:sequence> - <xsd:element name="majorNumber" type="xsd:int"/> - <xsd:element name="minorNumber" type="xsd:int"/> - <xsd:element name="namespace" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - <xsd:element name="PackageVersionHeader"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="packageVersions" minOccurs="0" maxOccurs="unbounded" type="tns:PackageVersion"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <element name="AllowFieldTruncationHeader"> - <complexType> - <sequence> - <element name="allowFieldTruncation" type="xsd:boolean"/> - </sequence> - </complexType> - </element> - - - - <!-- ideally this could of just been elem name="..." type="xsd:boolean" - but is required to be nested within a complexType for .NET 1.1 compatibility --> - <element name="MruHeader"> - <complexType> - <sequence> - <element name="updateMru" type="xsd:boolean"/> - </sequence> - </complexType> - </element> - - <element name="EmailHeader"> - <complexType> - <sequence> - <element name="triggerAutoResponseEmail" type="xsd:boolean"/> - <element name="triggerOtherEmail" type="xsd:boolean"/> - <element name="triggerUserEmail" type="xsd:boolean"/> - </sequence> - </complexType> - </element> - - <element name="AssignmentRuleHeader"> - <complexType> - <sequence> - <element name="assignmentRuleId" type="tns:ID" nillable="true"/> - <element name="useDefaultRule" type="xsd:boolean" nillable="true"/> - </sequence> - </complexType> - </element> - - <element name="UserTerritoryDeleteHeader"> - <complexType> - <sequence> - <element name="transferToUserId" type="tns:ID" nillable="true"/> - </sequence> - </complexType> - </element> - - - - <element name="LocaleOptions"> - <complexType> - <sequence> - <element name="language" type="xsd:string" minOccurs="0"/> - </sequence> - </complexType> - </element> - </schema> - - <schema elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:fault.partner.soap.sforce.com" xmlns:fns="urn:fault.partner.soap.sforce.com"> - - <simpleType name="ExceptionCode"> - <restriction base="xsd:string"> - <enumeration value="API_CURRENTLY_DISABLED"/> - <enumeration value="API_DISABLED_FOR_ORG"/> - <enumeration value="CANT_ADD_STANDADRD_PORTAL_USER_TO_TERRITORY"/> - <enumeration value="CANT_ADD_STANDARD_PORTAL_USER_TO_TERRITORY"/> - <enumeration value="CIRCULAR_OBJECT_GRAPH"/> - <enumeration value="CLIENT_NOT_ACCESSIBLE_FOR_USER"/> - <enumeration value="CLIENT_REQUIRE_UPDATE_FOR_USER"/> - <enumeration value="CUSTOM_METADATA_LIMIT_EXCEEDED"/> - <enumeration value="DUPLICATE_VALUE"/> - <enumeration value="EMAIL_BATCH_SIZE_LIMIT_EXCEEDED"/> - <enumeration value="EMAIL_TO_CASE_INVALID_ROUTING"/> - <enumeration value="EMAIL_TO_CASE_LIMIT_EXCEEDED"/> - <enumeration value="EMAIL_TO_CASE_NOT_ENABLED"/> - <enumeration value="EXCEEDED_ID_LIMIT"/> - <enumeration value="EXCEEDED_LEAD_CONVERT_LIMIT"/> - <enumeration value="EXCEEDED_MAX_SIZE_REQUEST"/> - <enumeration value="EXCEEDED_MAX_TYPES_LIMIT"/> - <enumeration value="EXCEEDED_QUOTA"/> - <enumeration value="FUNCTIONALITY_NOT_ENABLED"/> - <enumeration value="INACTIVE_OWNER_OR_USER"/> - <enumeration value="INACTIVE_PORTAL"/> - <enumeration value="INSUFFICIENT_ACCESS"/> - <enumeration value="INVALID_ASSIGNMENT_RULE"/> - <enumeration value="INVALID_BATCH_SIZE"/> - <enumeration value="INVALID_CLIENT"/> - <enumeration value="INVALID_CROSS_REFERENCE_KEY"/> - <enumeration value="INVALID_FIELD"/> - <enumeration value="INVALID_FILTER_LANGUAGE"/> - <enumeration value="INVALID_FILTER_VALUE"/> - <enumeration value="INVALID_ID_FIELD"/> - <enumeration value="INVALID_LOCALE_LANGUAGE"/> - <enumeration value="INVALID_LOCATOR"/> - <enumeration value="INVALID_LOGIN"/> - <enumeration value="INVALID_NEW_PASSWORD"/> - <enumeration value="INVALID_OPERATION"/> - <enumeration value="INVALID_OPERATION_WITH_EXPIRED_PASSWORD"/> - <enumeration value="INVALID_QUERY_FILTER_OPERATOR"/> - <enumeration value="INVALID_QUERY_LOCATOR"/> - <enumeration value="INVALID_QUERY_SCOPE"/> - <enumeration value="INVALID_REPLICATION_DATE"/> - <enumeration value="INVALID_SEARCH"/> - <enumeration value="INVALID_SEARCH_SCOPE"/> - <enumeration value="INVALID_SESSION_ID"/> - <enumeration value="INVALID_SOAP_HEADER"/> - <enumeration value="INVALID_SSO_GATEWAY_URL"/> - <enumeration value="INVALID_TYPE"/> - <enumeration value="INVALID_TYPE_FOR_OPERATION"/> - <enumeration value="LIMIT_EXCEEDED"/> - <enumeration value="LOGIN_CHALLENGE_ISSUED"/> - <enumeration value="LOGIN_CHALLENGE_PENDING"/> - <enumeration value="LOGIN_DURING_RESTRICTED_DOMAIN"/> - <enumeration value="LOGIN_DURING_RESTRICTED_TIME"/> - <enumeration value="LOGIN_MUST_USE_SECURITY_TOKEN"/> - <enumeration value="MALFORMED_ID"/> - <enumeration value="MALFORMED_QUERY"/> - <enumeration value="MALFORMED_SEARCH"/> - <enumeration value="MISSING_ARGUMENT"/> - <enumeration value="NOT_MODIFIED"/> - <enumeration value="NO_SOFTPHONE_LAYOUT"/> - <enumeration value="NUMBER_OUTSIDE_VALID_RANGE"/> - <enumeration value="OPERATION_TOO_LARGE"/> - <enumeration value="ORG_LOCKED"/> - <enumeration value="ORG_NOT_OWNED_BY_INSTANCE"/> - <enumeration value="PASSWORD_LOCKOUT"/> - <enumeration value="PORTAL_NO_ACCESS"/> - <enumeration value="QUERY_TIMEOUT"/> - <enumeration value="QUERY_TOO_COMPLICATED"/> - <enumeration value="REQUEST_LIMIT_EXCEEDED"/> - <enumeration value="REQUEST_RUNNING_TOO_LONG"/> - <enumeration value="SERVER_UNAVAILABLE"/> - <enumeration value="SSO_SERVICE_DOWN"/> - <enumeration value="TOO_MANY_APEX_REQUESTS"/> - <enumeration value="TRIAL_EXPIRED"/> - <enumeration value="UNKNOWN_EXCEPTION"/> - <enumeration value="UNSUPPORTED_API_VERSION"/> - <enumeration value="UNSUPPORTED_CLIENT"/> - </restriction> - </simpleType> - <!-- For convenience these QNames are returned in the standard soap faultcode element --> - <simpleType name="FaultCode"> - <restriction base="xsd:QName"> - <enumeration value="fns:API_CURRENTLY_DISABLED"/> - <enumeration value="fns:API_DISABLED_FOR_ORG"/> - <enumeration value="fns:CANT_ADD_STANDADRD_PORTAL_USER_TO_TERRITORY"/> - <enumeration value="fns:CANT_ADD_STANDARD_PORTAL_USER_TO_TERRITORY"/> - <enumeration value="fns:CIRCULAR_OBJECT_GRAPH"/> - <enumeration value="fns:CLIENT_NOT_ACCESSIBLE_FOR_USER"/> - <enumeration value="fns:CLIENT_REQUIRE_UPDATE_FOR_USER"/> - <enumeration value="fns:CUSTOM_METADATA_LIMIT_EXCEEDED"/> - <enumeration value="fns:DUPLICATE_VALUE"/> - <enumeration value="fns:EMAIL_BATCH_SIZE_LIMIT_EXCEEDED"/> - <enumeration value="fns:EMAIL_TO_CASE_INVALID_ROUTING"/> - <enumeration value="fns:EMAIL_TO_CASE_LIMIT_EXCEEDED"/> - <enumeration value="fns:EMAIL_TO_CASE_NOT_ENABLED"/> - <enumeration value="fns:EXCEEDED_ID_LIMIT"/> - <enumeration value="fns:EXCEEDED_LEAD_CONVERT_LIMIT"/> - <enumeration value="fns:EXCEEDED_MAX_SIZE_REQUEST"/> - <enumeration value="fns:EXCEEDED_MAX_TYPES_LIMIT"/> - <enumeration value="fns:EXCEEDED_QUOTA"/> - <enumeration value="fns:FUNCTIONALITY_NOT_ENABLED"/> - <enumeration value="fns:INACTIVE_OWNER_OR_USER"/> - <enumeration value="fns:INACTIVE_PORTAL"/> - <enumeration value="fns:INSUFFICIENT_ACCESS"/> - <enumeration value="fns:INVALID_ASSIGNMENT_RULE"/> - <enumeration value="fns:INVALID_BATCH_SIZE"/> - <enumeration value="fns:INVALID_CLIENT"/> - <enumeration value="fns:INVALID_CROSS_REFERENCE_KEY"/> - <enumeration value="fns:INVALID_FIELD"/> - <enumeration value="fns:INVALID_FILTER_LANGUAGE"/> - <enumeration value="fns:INVALID_FILTER_VALUE"/> - <enumeration value="fns:INVALID_ID_FIELD"/> - <enumeration value="fns:INVALID_LOCALE_LANGUAGE"/> - <enumeration value="fns:INVALID_LOCATOR"/> - <enumeration value="fns:INVALID_LOGIN"/> - <enumeration value="fns:INVALID_NEW_PASSWORD"/> - <enumeration value="fns:INVALID_OPERATION"/> - <enumeration value="fns:INVALID_OPERATION_WITH_EXPIRED_PASSWORD"/> - <enumeration value="fns:INVALID_QUERY_FILTER_OPERATOR"/> - <enumeration value="fns:INVALID_QUERY_LOCATOR"/> - <enumeration value="fns:INVALID_QUERY_SCOPE"/> - <enumeration value="fns:INVALID_REPLICATION_DATE"/> - <enumeration value="fns:INVALID_SEARCH"/> - <enumeration value="fns:INVALID_SEARCH_SCOPE"/> - <enumeration value="fns:INVALID_SESSION_ID"/> - <enumeration value="fns:INVALID_SOAP_HEADER"/> - <enumeration value="fns:INVALID_SSO_GATEWAY_URL"/> - <enumeration value="fns:INVALID_TYPE"/> - <enumeration value="fns:INVALID_TYPE_FOR_OPERATION"/> - <enumeration value="fns:LIMIT_EXCEEDED"/> - <enumeration value="fns:LOGIN_CHALLENGE_ISSUED"/> - <enumeration value="fns:LOGIN_CHALLENGE_PENDING"/> - <enumeration value="fns:LOGIN_DURING_RESTRICTED_DOMAIN"/> - <enumeration value="fns:LOGIN_DURING_RESTRICTED_TIME"/> - <enumeration value="fns:LOGIN_MUST_USE_SECURITY_TOKEN"/> - <enumeration value="fns:MALFORMED_ID"/> - <enumeration value="fns:MALFORMED_QUERY"/> - <enumeration value="fns:MALFORMED_SEARCH"/> - <enumeration value="fns:MISSING_ARGUMENT"/> - <enumeration value="fns:NOT_MODIFIED"/> - <enumeration value="fns:NO_SOFTPHONE_LAYOUT"/> - <enumeration value="fns:NUMBER_OUTSIDE_VALID_RANGE"/> - <enumeration value="fns:OPERATION_TOO_LARGE"/> - <enumeration value="fns:ORG_LOCKED"/> - <enumeration value="fns:ORG_NOT_OWNED_BY_INSTANCE"/> - <enumeration value="fns:PASSWORD_LOCKOUT"/> - <enumeration value="fns:PORTAL_NO_ACCESS"/> - <enumeration value="fns:QUERY_TIMEOUT"/> - <enumeration value="fns:QUERY_TOO_COMPLICATED"/> - <enumeration value="fns:REQUEST_LIMIT_EXCEEDED"/> - <enumeration value="fns:REQUEST_RUNNING_TOO_LONG"/> - <enumeration value="fns:SERVER_UNAVAILABLE"/> - <enumeration value="fns:SSO_SERVICE_DOWN"/> - <enumeration value="fns:TOO_MANY_APEX_REQUESTS"/> - <enumeration value="fns:TRIAL_EXPIRED"/> - <enumeration value="fns:UNKNOWN_EXCEPTION"/> - <enumeration value="fns:UNSUPPORTED_API_VERSION"/> - <enumeration value="fns:UNSUPPORTED_CLIENT"/> - </restriction> - </simpleType> - - - <!-- Fault --> - <complexType name="ApiFault"> - <sequence> - <element name="exceptionCode" type="fns:ExceptionCode"/> - <element name="exceptionMessage" type="xsd:string"/> - - </sequence> - </complexType> - - <element name="fault" type="fns:ApiFault"/> - - <complexType name="ApiQueryFault"> - <complexContent> - <extension base="fns:ApiFault"> - <sequence> - <element name="row" type="xsd:int"/> - <element name="column" type="xsd:int"/> - </sequence> - </extension> - </complexContent> - </complexType> - - <complexType name="LoginFault"> - <complexContent> - <extension base="fns:ApiFault"/> - </complexContent> - </complexType> - <element name="LoginFault" type="fns:LoginFault"/> - - <complexType name="InvalidQueryLocatorFault"> - <complexContent> - <extension base="fns:ApiFault"/> - </complexContent> - </complexType> - <element name="InvalidQueryLocatorFault" type="fns:InvalidQueryLocatorFault"/> - - <complexType name="InvalidNewPasswordFault"> - <complexContent> - <extension base="fns:ApiFault"/> - </complexContent> - </complexType> - <element name="InvalidNewPasswordFault" type="fns:InvalidNewPasswordFault"/> - - <complexType name="InvalidIdFault"> - <complexContent> - <extension base="fns:ApiFault"/> - </complexContent> - </complexType> - <element name="InvalidIdFault" type="fns:InvalidIdFault"/> - - <complexType name="UnexpectedErrorFault"> - <complexContent> - <extension base="fns:ApiFault"/> - </complexContent> - </complexType> - <element name="UnexpectedErrorFault" type="fns:UnexpectedErrorFault"/> - - <complexType name="InvalidFieldFault"> - <complexContent> - <extension base="fns:ApiQueryFault"/> - </complexContent> - </complexType> - <element name="InvalidFieldFault" type="fns:InvalidFieldFault"/> - - <complexType name="InvalidSObjectFault"> - <complexContent> - <extension base="fns:ApiQueryFault"/> - </complexContent> - </complexType> - <element name="InvalidSObjectFault" type="fns:InvalidSObjectFault"/> - - <complexType name="MalformedQueryFault"> - <complexContent> - <extension base="fns:ApiQueryFault"/> - </complexContent> - </complexType> - <element name="MalformedQueryFault" type="fns:MalformedQueryFault"/> - - <complexType name="MalformedSearchFault"> - <complexContent> - <extension base="fns:ApiQueryFault"/> - </complexContent> - </complexType> - <element name="MalformedSearchFault" type="fns:MalformedSearchFault"/> - - - </schema> - </types> - - <!-- Header Message --> - <message name="Header"> - <part element="tns:LoginScopeHeader" name="LoginScopeHeader"/> - <part element="tns:SessionHeader" name="SessionHeader"/> - - <part element="tns:CallOptions" name="CallOptions"/> - - <part element="tns:QueryOptions" name="QueryOptions"/> - <part element="tns:AssignmentRuleHeader" name="AssignmentRuleHeader"/> - <part element="tns:AllowFieldTruncationHeader" name="AllowFieldTruncationHeader"/> - - <part element="tns:MruHeader" name="MruHeader"/> - <part element="tns:EmailHeader" name="EmailHeader"/> - - <part element="tns:UserTerritoryDeleteHeader" name="UserTerritoryDeleteHeader"/> - - <part element="tns:DebuggingHeader" name="DebuggingHeader"/> - <part element="tns:PackageVersionHeader" name="PackageVersionHeader"/> - <part element="tns:DebuggingInfo" name="DebuggingInfo"/> - <part element="tns:LocaleOptions" name="LocaleOptions"/> - </message> - - <!-- Fault Messages --> - - <message name="ApiFault"> - <part name="fault" element="fns:fault"/> - </message> - - <message name="LoginFault"> - <part name="fault" element="fns:LoginFault"/> - </message> - <message name="InvalidQueryLocatorFault"> - <part name="fault" element="fns:InvalidQueryLocatorFault"/> - </message> - <message name="InvalidNewPasswordFault"> - <part name="fault" element="fns:InvalidNewPasswordFault"/> - </message> - <message name="InvalidIdFault"> - <part name="fault" element="fns:InvalidIdFault"/> - </message> - <message name="UnexpectedErrorFault"> - <part name="fault" element="fns:UnexpectedErrorFault"/> - </message> - <message name="InvalidFieldFault"> - <part name="fault" element="fns:InvalidFieldFault"/> - </message> - <message name="InvalidSObjectFault"> - <part name="fault" element="fns:InvalidSObjectFault"/> - </message> - <message name="MalformedQueryFault"> - <part name="fault" element="fns:MalformedQueryFault"/> - </message> - <message name="MalformedSearchFault"> - <part name="fault" element="fns:MalformedSearchFault"/> - </message> - - - <!-- Method Messages --> - <message name="loginRequest"> - <part element="tns:login" name="parameters"/> - </message> - <message name="loginResponse"> - <part element="tns:loginResponse" name="parameters"/> - </message> - - <message name="describeSObjectRequest"> - <part element="tns:describeSObject" name="parameters"/> - </message> - <message name="describeSObjectResponse"> - <part element="tns:describeSObjectResponse" name="parameters"/> - </message> - - <message name="describeSObjectsRequest"> - <part element="tns:describeSObjects" name="parameters"/> - </message> - <message name="describeSObjectsResponse"> - <part element="tns:describeSObjectsResponse" name="parameters"/> - </message> - - <message name="describeGlobalRequest"> - <part element="tns:describeGlobal" name="parameters"/> - </message> - <message name="describeGlobalResponse"> - <part element="tns:describeGlobalResponse" name="parameters"/> - </message> - - <message name="describeLayoutRequest"> - <part element="tns:describeLayout" name="parameters"/> - </message> - <message name="describeLayoutResponse"> - <part element="tns:describeLayoutResponse" name="parameters"/> - </message> - - <message name="describeSoftphoneLayoutRequest"> - <part element="tns:describeSoftphoneLayout" name="parameters"/> - </message> - <message name="describeSoftphoneLayoutResponse"> - <part element="tns:describeSoftphoneLayoutResponse" name="parameters"/> - </message> - - <message name="describeTabsRequest"> - <part element="tns:describeTabs" name="parameters"/> - </message> - <message name="describeTabsResponse"> - <part element="tns:describeTabsResponse" name="parameters"/> - </message> - - <message name="createRequest"> - <part element="tns:create" name="parameters"/> - </message> - <message name="createResponse"> - <part element="tns:createResponse" name="parameters"/> - </message> - - <message name="updateRequest"> - <part element="tns:update" name="parameters"/> - </message> - <message name="updateResponse"> - <part element="tns:updateResponse" name="parameters"/> - </message> - - <message name="upsertRequest"> - <part element="tns:upsert" name="parameters"/> - </message> - <message name="upsertResponse"> - <part element="tns:upsertResponse" name="parameters"/> - </message> - - <message name="mergeRequest"> - <part element="tns:merge" name="parameters"/> - </message> - <message name="mergeResponse"> - <part element="tns:mergeResponse" name="parameters"/> - </message> - - <message name="deleteRequest"> - <part element="tns:delete" name="parameters"/> - </message> - <message name="deleteResponse"> - <part element="tns:deleteResponse" name="parameters"/> - </message> - - <message name="undeleteRequest"> - <part element="tns:undelete" name="parameters"/> - </message> - <message name="undeleteResponse"> - <part element="tns:undeleteResponse" name="parameters"/> - </message> - - <message name="emptyRecycleBinRequest"> - <part element="tns:emptyRecycleBin" name="parameters"/> - </message> - <message name="emptyRecycleBinResponse"> - <part element="tns:emptyRecycleBinResponse" name="parameters"/> - </message> - - <message name="retrieveRequest"> - <part element="tns:retrieve" name="parameters"/> - </message> - <message name="retrieveResponse"> - <part element="tns:retrieveResponse" name="parameters"/> - </message> - - <message name="processRequest"> - <part element="tns:process" name="parameters"/> - </message> - <message name="processResponse"> - <part element="tns:processResponse" name="parameters"/> - </message> - - <message name="convertLeadRequest"> - <part element="tns:convertLead" name="parameters"/> - </message> - <message name="convertLeadResponse"> - <part element="tns:convertLeadResponse" name="parameters"/> - </message> - - <message name="logoutRequest"> - <part element="tns:logout" name="parameters"/> - </message> - <message name="logoutResponse"> - <part element="tns:logoutResponse" name="parameters"/> - </message> - - <message name="invalidateSessionsRequest"> - <part element="tns:invalidateSessions" name="parameters"/> - </message> - <message name="invalidateSessionsResponse"> - <part element="tns:invalidateSessionsResponse" name="parameters"/> - </message> - - <message name="getDeletedRequest"> - <part element="tns:getDeleted" name="parameters"/> - </message> - <message name="getDeletedResponse"> - <part element="tns:getDeletedResponse" name="parameters"/> - </message> - - <message name="getUpdatedRequest"> - <part element="tns:getUpdated" name="parameters"/> - </message> - <message name="getUpdatedResponse"> - <part element="tns:getUpdatedResponse" name="parameters"/> - </message> - - <message name="queryRequest"> - <part element="tns:query" name="parameters"/> - </message> - <message name="queryResponse"> - <part element="tns:queryResponse" name="parameters"/> - </message> - - <message name="queryAllRequest"> - <part element="tns:queryAll" name="parameters"/> - </message> - <message name="queryAllResponse"> - <part element="tns:queryAllResponse" name="parameters"/> - </message> - - <message name="queryMoreRequest"> - <part element="tns:queryMore" name="parameters"/> - </message> - <message name="queryMoreResponse"> - <part element="tns:queryMoreResponse" name="parameters"/> - </message> - - <message name="searchRequest"> - <part element="tns:search" name="parameters"/> - </message> - <message name="searchResponse"> - <part element="tns:searchResponse" name="parameters"/> - </message> - - <message name="getServerTimestampRequest"> - <part element="tns:getServerTimestamp" name="parameters"/> - </message> - <message name="getServerTimestampResponse"> - <part element="tns:getServerTimestampResponse" name="parameters"/> - </message> - - <message name="setPasswordRequest"> - <part element="tns:setPassword" name="parameters"/> - </message> - <message name="setPasswordResponse"> - <part element="tns:setPasswordResponse" name="parameters"/> - </message> - - <message name="resetPasswordRequest"> - <part element="tns:resetPassword" name="parameters"/> - </message> - <message name="resetPasswordResponse"> - <part element="tns:resetPasswordResponse" name="parameters"/> - </message> - - <message name="getUserInfoRequest"> - <part element="tns:getUserInfo" name="parameters"/> - </message> - <message name="getUserInfoResponse"> - <part element="tns:getUserInfoResponse" name="parameters"/> - </message> - - <message name="sendEmailRequest"> - <part element="tns:sendEmail" name="parameters"/> - </message> - <message name="sendEmailResponse"> - <part element="tns:sendEmailResponse" name="parameters"/> - </message> - - - - <!-- Soap PortType --> - <portType name="Soap"> - <operation name="login"> - <documentation>Login to the Salesforce.com SOAP Api</documentation> - <input message="tns:loginRequest"/> - <output message="tns:loginResponse"/> - <fault message="tns:LoginFault" name="LoginFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> - </operation> - - <operation name="describeSObject"> - <documentation>Describe an sObject</documentation> - <input message="tns:describeSObjectRequest"/> - <output message="tns:describeSObjectResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="describeSObjects"> - <documentation>Describe a number sObjects</documentation> - <input message="tns:describeSObjectsRequest"/> - <output message="tns:describeSObjectsResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="describeGlobal"> - <documentation>Describe the Global state</documentation> - <input message="tns:describeGlobalRequest"/> - <output message="tns:describeGlobalResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="describeLayout"> - <documentation>Describe the layout of an sObject</documentation> - <input message="tns:describeLayoutRequest"/> - <output message="tns:describeLayoutResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> - </operation> - - <operation name="describeSoftphoneLayout"> - <documentation>Describe the layout of the SoftPhone</documentation> - <input message="tns:describeSoftphoneLayoutRequest"/> - <output message="tns:describeSoftphoneLayoutResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="describeTabs"> - <documentation>Describe the tabs that appear on a users page</documentation> - <input message="tns:describeTabsRequest"/> - <output message="tns:describeTabsResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="create"> - <documentation>Create a set of new sObjects</documentation> - <input message="tns:createRequest"/> - <output message="tns:createResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> - <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> - </operation> - - <operation name="update"> - <documentation>Update a set of sObjects</documentation> - <input message="tns:updateRequest"/> - <output message="tns:updateResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> - <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> - </operation> - - <operation name="upsert"> - <documentation>Update or insert a set of sObjects based on object id</documentation> - <input message="tns:upsertRequest"/> - <output message="tns:upsertResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> - <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> - </operation> - - <operation name="merge"> - <documentation>Merge and update a set of sObjects based on object id</documentation> - <input message="tns:mergeRequest"/> - <output message="tns:mergeResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> - <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> - </operation> - - <operation name="delete"> - <documentation>Delete a set of sObjects</documentation> - <input message="tns:deleteRequest"/> - <output message="tns:deleteResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="undelete"> - <documentation>Undelete a set of sObjects</documentation> - <input message="tns:undeleteRequest"/> - <output message="tns:undeleteResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="emptyRecycleBin"> - <documentation>Empty a set of sObjects from the recycle bin</documentation> - <input message="tns:emptyRecycleBinRequest"/> - <output message="tns:emptyRecycleBinResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="retrieve"> - <documentation>Get a set of sObjects</documentation> - <input message="tns:retrieveRequest"/> - <output message="tns:retrieveResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> - <fault message="tns:MalformedQueryFault" name="MalformedQueryFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> - </operation> - - <operation name="process"> - <documentation>Submit an entity to a workflow process or process a workitem</documentation> - <input message="tns:processRequest"/> - <output message="tns:processResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> - </operation> - - <operation name="convertLead"> - <documentation>convert a set of leads</documentation> - <input message="tns:convertLeadRequest"/> - <output message="tns:convertLeadResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="logout"> - <documentation>Logout the current user, invalidating the current session.</documentation> - <input message="tns:logoutRequest"/> - <output message="tns:logoutResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="invalidateSessions"> - <documentation>Logs out and invalidates session ids</documentation> - <input message="tns:invalidateSessionsRequest"/> - <output message="tns:invalidateSessionsResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="getDeleted"> - <documentation>Get the IDs for deleted sObjects</documentation> - <input message="tns:getDeletedRequest"/> - <output message="tns:getDeletedResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="getUpdated"> - <documentation>Get the IDs for updated sObjects</documentation> - <input message="tns:getUpdatedRequest"/> - <output message="tns:getUpdatedResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="query"> - <documentation>Create a Query Cursor</documentation> - <input message="tns:queryRequest"/> - <output message="tns:queryResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> - <fault message="tns:MalformedQueryFault" name="MalformedQueryFault"/> - <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - <fault message="tns:InvalidQueryLocatorFault" name="InvalidQueryLocatorFault"/> - </operation> - - <operation name="queryAll"> - <documentation>Create a Query Cursor, including deleted sObjects</documentation> - <input message="tns:queryAllRequest"/> - <output message="tns:queryAllResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> - <fault message="tns:MalformedQueryFault" name="MalformedQueryFault"/> - <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - <fault message="tns:InvalidQueryLocatorFault" name="InvalidQueryLocatorFault"/> - </operation> - - <operation name="queryMore"> - <documentation>Gets the next batch of sObjects from a query</documentation> - <input message="tns:queryMoreRequest"/> - <output message="tns:queryMoreResponse"/> - <fault message="tns:InvalidQueryLocatorFault" name="InvalidQueryLocatorFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> - </operation> - - <operation name="search"> - <documentation>Search for sObjects</documentation> - <input message="tns:searchRequest"/> - <output message="tns:searchResponse"/> - <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> - <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> - <fault message="tns:MalformedSearchFault" name="MalformedSearchFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="getServerTimestamp"> - <documentation>Gets server timestamp</documentation> - <input message="tns:getServerTimestampRequest"/> - <output message="tns:getServerTimestampResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="setPassword"> - <documentation>Set a user's password</documentation> - <input message="tns:setPasswordRequest"/> - <output message="tns:setPasswordResponse"/> - <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> - <fault message="tns:InvalidNewPasswordFault" name="InvalidNewPasswordFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="resetPassword"> - <documentation>Reset a user's password</documentation> - <input message="tns:resetPasswordRequest"/> - <output message="tns:resetPasswordResponse"/> - <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="getUserInfo"> - <documentation>Returns standard information relevant to the current user</documentation> - <input message="tns:getUserInfoRequest"/> - <output message="tns:getUserInfoResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - <operation name="sendEmail"> - <documentation>Send outbound email</documentation> - <input message="tns:sendEmailRequest"/> - <output message="tns:sendEmailResponse"/> - <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> - </operation> - - </portType> - - <!-- Soap Binding --> - <binding name="SoapBinding" type="tns:Soap"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <operation name="login"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="LoginScopeHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="LoginFault"> - <soap:fault name="LoginFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - <fault name="InvalidIdFault"> - <soap:fault name="InvalidIdFault" use="literal"/> - </fault> - </operation> - <operation name="describeSObject"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:header use="literal" message="tns:Header" part="LocaleOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="describeSObjects"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:header use="literal" message="tns:Header" part="LocaleOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="describeGlobal"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="describeLayout"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - <fault name="InvalidIdFault"> - <soap:fault name="InvalidIdFault" use="literal"/> - </fault> - </operation> - <operation name="describeSoftphoneLayout"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="describeTabs"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="create"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="AssignmentRuleHeader"/> - <soap:header use="literal" message="tns:Header" part="MruHeader"/> - <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> - <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:header use="literal" message="tns:Header" part="EmailHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - <fault name="InvalidIdFault"> - <soap:fault name="InvalidIdFault" use="literal"/> - </fault> - <fault name="InvalidFieldFault"> - <soap:fault name="InvalidFieldFault" use="literal"/> - </fault> - </operation> - <operation name="update"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="AssignmentRuleHeader"/> - <soap:header use="literal" message="tns:Header" part="MruHeader"/> - <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> - <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:header use="literal" message="tns:Header" part="EmailHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - <fault name="InvalidIdFault"> - <soap:fault name="InvalidIdFault" use="literal"/> - </fault> - <fault name="InvalidFieldFault"> - <soap:fault name="InvalidFieldFault" use="literal"/> - </fault> - </operation> - <operation name="upsert"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="AssignmentRuleHeader"/> - <soap:header use="literal" message="tns:Header" part="MruHeader"/> - <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> - <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:header use="literal" message="tns:Header" part="EmailHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - <fault name="InvalidIdFault"> - <soap:fault name="InvalidIdFault" use="literal"/> - </fault> - <fault name="InvalidFieldFault"> - <soap:fault name="InvalidFieldFault" use="literal"/> - </fault> - </operation> - <operation name="merge"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="AssignmentRuleHeader"/> - <soap:header use="literal" message="tns:Header" part="MruHeader"/> - <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> - <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:header use="literal" message="tns:Header" part="EmailHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - <fault name="InvalidIdFault"> - <soap:fault name="InvalidIdFault" use="literal"/> - </fault> - <fault name="InvalidFieldFault"> - <soap:fault name="InvalidFieldFault" use="literal"/> - </fault> - </operation> - <operation name="delete"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:header use="literal" message="tns:Header" part="UserTerritoryDeleteHeader"/> - <soap:header use="literal" message="tns:Header" part="EmailHeader"/> - <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> - <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="undelete"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> - <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="emptyRecycleBin"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="retrieve"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="QueryOptions"/> - <soap:header use="literal" message="tns:Header" part="MruHeader"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="InvalidFieldFault"> - <soap:fault name="InvalidFieldFault" use="literal"/> - </fault> - <fault name="MalformedQueryFault"> - <soap:fault name="MalformedQueryFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - <fault name="InvalidIdFault"> - <soap:fault name="InvalidIdFault" use="literal"/> - </fault> - </operation> - <operation name="process"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> - <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - <fault name="InvalidIdFault"> - <soap:fault name="InvalidIdFault" use="literal"/> - </fault> - </operation> - <operation name="convertLead"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> - <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="logout"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="invalidateSessions"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="getDeleted"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="getUpdated"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="query"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="QueryOptions"/> - <soap:header use="literal" message="tns:Header" part="MruHeader"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="InvalidFieldFault"> - <soap:fault name="InvalidFieldFault" use="literal"/> - </fault> - <fault name="MalformedQueryFault"> - <soap:fault name="MalformedQueryFault" use="literal"/> - </fault> - <fault name="InvalidIdFault"> - <soap:fault name="InvalidIdFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - <fault name="InvalidQueryLocatorFault"> - <soap:fault name="InvalidQueryLocatorFault" use="literal"/> - </fault> - </operation> - <operation name="queryAll"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="QueryOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="InvalidFieldFault"> - <soap:fault name="InvalidFieldFault" use="literal"/> - </fault> - <fault name="MalformedQueryFault"> - <soap:fault name="MalformedQueryFault" use="literal"/> - </fault> - <fault name="InvalidIdFault"> - <soap:fault name="InvalidIdFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - <fault name="InvalidQueryLocatorFault"> - <soap:fault name="InvalidQueryLocatorFault" use="literal"/> - </fault> - </operation> - <operation name="queryMore"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="QueryOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="InvalidQueryLocatorFault"> - <soap:fault name="InvalidQueryLocatorFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - <fault name="InvalidFieldFault"> - <soap:fault name="InvalidFieldFault" use="literal"/> - </fault> - </operation> - <operation name="search"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="InvalidSObjectFault"> - <soap:fault name="InvalidSObjectFault" use="literal"/> - </fault> - <fault name="InvalidFieldFault"> - <soap:fault name="InvalidFieldFault" use="literal"/> - </fault> - <fault name="MalformedSearchFault"> - <soap:fault name="MalformedSearchFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="getServerTimestamp"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="setPassword"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="InvalidIdFault"> - <soap:fault name="InvalidIdFault" use="literal"/> - </fault> - <fault name="InvalidNewPasswordFault"> - <soap:fault name="InvalidNewPasswordFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="resetPassword"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:header use="literal" message="tns:Header" part="EmailHeader"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="InvalidIdFault"> - <soap:fault name="InvalidIdFault" use="literal"/> - </fault> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="getUserInfo"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - <operation name="sendEmail"> - <soap:operation soapAction=""/> - <input> - <soap:header use="literal" message="tns:Header" part="SessionHeader"/> - <soap:header use="literal" message="tns:Header" part="CallOptions"/> - <soap:body parts="parameters" use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="UnexpectedErrorFault"> - <soap:fault name="UnexpectedErrorFault" use="literal"/> - </fault> - </operation> - - </binding> - - <!-- Soap Service Endpoint --> - <service name="SforceService"> - <documentation>Sforce SOAP API</documentation> - <port binding="tns:SoapBinding" name="Soap"> - <soap:address location="https://www.salesforce.com/services/Soap/u/17.0"/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/as7/connectors/salesforce-api/src/main/resources/partner_v22.wsdl (from rev 3597, trunk/connectors/salesforce-api/src/main/resources/partner_v22.wsdl) =================================================================== --- branches/as7/connectors/salesforce-api/src/main/resources/partner_v22.wsdl (rev 0) +++ branches/as7/connectors/salesforce-api/src/main/resources/partner_v22.wsdl 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,3164 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!-- +Salesforce.com Partner Web Services API Version 22.0 +Generated on 2011-08-31 16:53:00 +0000. + +Copyright 1999-2011 salesforce.com, inc. +All Rights Reserved +--> + +<definitions targetNamespace="urn:partner.soap.sforce.com" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:fns="urn:fault.partner.soap.sforce.com" + xmlns:tns="urn:partner.soap.sforce.com" + xmlns:ens="urn:sobject.partner.soap.sforce.com"> + <types> + + <schema elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:sobject.partner.soap.sforce.com"> + + <import namespace="urn:partner.soap.sforce.com"/> + + + <!-- Dynamic sObject --> + <complexType name="sObject"> + <sequence> + <element name="type" type="xsd:string"/> + <element name="fieldsToNull" type="xsd:string" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + <element name="Id" type="tns:ID" nillable="true" /> + <any namespace="##targetNamespace" minOccurs="0" maxOccurs="unbounded" processContents="lax"/> + </sequence> + </complexType> + + </schema> + + <schema elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:partner.soap.sforce.com"> + + <import namespace="urn:sobject.partner.soap.sforce.com"/> + + <!-- Our simple ID Type --> + <simpleType name="ID"> + <restriction base="xsd:string"> + <length value="18"/> + <pattern value='[a-zA-Z0-9]{18}'/> + </restriction> + </simpleType> + + <simpleType name="QueryLocator"> + <restriction base="xsd:string"/> + </simpleType> + + <!-- Shared Result Types --> + <complexType name="QueryResult"> + <sequence> + <element name="done" type="xsd:boolean"/> + <element name="queryLocator" type="tns:QueryLocator" nillable="true"/> + <element name="records" type="ens:sObject" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + <element name="size" type="xsd:int"/> + </sequence> + </complexType> + + + + <!-- Search Result --> + <complexType name="SearchResult"> + <sequence> + <element name="searchRecords" minOccurs="0" maxOccurs="unbounded" type="tns:SearchRecord"/> + <element name="sforceReserved" minOccurs="0" maxOccurs="1" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="SearchRecord"> + <sequence> + <element name="record" type="ens:sObject"/> + </sequence> + </complexType> + + <!-- GetUpdated Result --> + <complexType name="GetUpdatedResult"> + <sequence> + <element name="ids" minOccurs="0" maxOccurs="unbounded" type="tns:ID"/> + <element name="latestDateCovered" type="xsd:dateTime"/> + <element name="sforceReserved" minOccurs="0" maxOccurs="1" type="xsd:string"/> + </sequence> + </complexType> + + <!-- GetDeleted Result --> + <complexType name="GetDeletedResult"> + <sequence> + <element name="deletedRecords" minOccurs="0" maxOccurs="unbounded" type="tns:DeletedRecord"/> + <element name="earliestDateAvailable" type="xsd:dateTime"/> + <element name="latestDateCovered" type="xsd:dateTime"/> + <element name="sforceReserved" minOccurs="0" maxOccurs="1" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="DeletedRecord"> + <sequence> + <element name="deletedDate" type="xsd:dateTime"/> + <element name="id" type="tns:ID"/> + </sequence> + </complexType> + + + <complexType name="GetServerTimestampResult"> + <sequence> + <element name="timestamp" type="xsd:dateTime"/> + </sequence> + </complexType> + + + <!-- InvalidateSessions Result --> + <complexType name="InvalidateSessionsResult"> + <sequence> + <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> + <element name="success" type="xsd:boolean"/> + </sequence> + </complexType> + + <complexType name="SetPasswordResult"> + </complexType> + + <complexType name="ResetPasswordResult"> + <sequence> + <element name="password" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="GetUserInfoResult"> + <sequence> + <element name="accessibilityMode" type="xsd:boolean"/> + <element name="currencySymbol" type="xsd:string" nillable="true"/> + <element name="orgAttachmentFileSizeLimit" type="xsd:int"/> + <element name="orgDefaultCurrencyIsoCode" type="xsd:string" nillable="true"/> + <element name="orgDisallowHtmlAttachments" type="xsd:boolean"/> + <element name="orgHasPersonAccounts" type="xsd:boolean"/> + <element name="organizationId" type="tns:ID"/> + <element name="organizationMultiCurrency" type="xsd:boolean"/> + <element name="organizationName" type="xsd:string"/> + <element name="profileId" type="tns:ID"/> + <element name="roleId" type="tns:ID" nillable="true"/> + <element name="sessionSecondsValid" type="xsd:int"/> + <element name="userDefaultCurrencyIsoCode" type="xsd:string" nillable="true"/> + <element name="userEmail" type="xsd:string"/> + <element name="userFullName" type="xsd:string"/> + <element name="userId" type="tns:ID"/> + <element name="userLanguage" type="xsd:string"/> + <element name="userLocale" type="xsd:string"/> + <element name="userName" type="xsd:string"/> + <element name="userTimeZone" type="xsd:string"/> + <element name="userType" type="xsd:string"/> + <element name="userUiSkin" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="LoginResult"> + <sequence> + <element name="metadataServerUrl" type="xsd:string" nillable="true"/> + <element name="passwordExpired" type="xsd:boolean" /> + <element name="sandbox" type="xsd:boolean"/> + <element name="serverUrl" type="xsd:string" nillable="true"/> + <element name="sessionId" type="xsd:string" nillable="true"/> + + <element name="userId" type="tns:ID" nillable="true"/> + <element name="userInfo" type="tns:GetUserInfoResult" minOccurs="0"/> + </sequence> + </complexType> + + <simpleType name="StatusCode"> + <restriction base="xsd:string"> + <enumeration value="ALL_OR_NONE_OPERATION_ROLLED_BACK"/> + <enumeration value="ALREADY_IN_PROCESS"/> + <enumeration value="ASSIGNEE_TYPE_REQUIRED"/> + <enumeration value="BAD_CUSTOM_ENTITY_PARENT_DOMAIN"/> + <enumeration value="BCC_NOT_ALLOWED_IF_BCC_COMPLIANCE_ENABLED"/> + <enumeration value="CANNOT_CASCADE_PRODUCT_ACTIVE"/> + <enumeration value="CANNOT_CHANGE_FIELD_TYPE_OF_APEX_REFERENCED_FIELD"/> + <enumeration value="CANNOT_CREATE_ANOTHER_MANAGED_PACKAGE"/> + <enumeration value="CANNOT_DEACTIVATE_DIVISION"/> + <enumeration value="CANNOT_DELETE_LAST_DATED_CONVERSION_RATE"/> + <enumeration value="CANNOT_DELETE_MANAGED_OBJECT"/> + <enumeration value="CANNOT_DISABLE_LAST_ADMIN"/> + <enumeration value="CANNOT_ENABLE_IP_RESTRICT_REQUESTS"/> + <enumeration value="CANNOT_INSERT_UPDATE_ACTIVATE_ENTITY"/> + <enumeration value="CANNOT_MODIFY_MANAGED_OBJECT"/> + <enumeration value="CANNOT_RENAME_APEX_REFERENCED_FIELD"/> + <enumeration value="CANNOT_RENAME_APEX_REFERENCED_OBJECT"/> + <enumeration value="CANNOT_REPARENT_RECORD"/> + <enumeration value="CANNOT_UPDATE_CONVERTED_LEAD"/> + <enumeration value="CANT_DISABLE_CORP_CURRENCY"/> + <enumeration value="CANT_UNSET_CORP_CURRENCY"/> + <enumeration value="CHILD_SHARE_FAILS_PARENT"/> + <enumeration value="CIRCULAR_DEPENDENCY"/> + <enumeration value="COMMUNITY_NOT_ACCESSIBLE"/> + <enumeration value="CUSTOM_CLOB_FIELD_LIMIT_EXCEEDED"/> + <enumeration value="CUSTOM_ENTITY_OR_FIELD_LIMIT"/> + <enumeration value="CUSTOM_FIELD_INDEX_LIMIT_EXCEEDED"/> + <enumeration value="CUSTOM_INDEX_EXISTS"/> + <enumeration value="CUSTOM_LINK_LIMIT_EXCEEDED"/> + <enumeration value="CUSTOM_TAB_LIMIT_EXCEEDED"/> + <enumeration value="DELETE_FAILED"/> + <enumeration value="DELETE_REQUIRED_ON_CASCADE"/> + <enumeration value="DEPENDENCY_EXISTS"/> + <enumeration value="DUPLICATE_CASE_SOLUTION"/> + <enumeration value="DUPLICATE_COMM_NICKNAME"/> + <enumeration value="DUPLICATE_CUSTOM_ENTITY_DEFINITION"/> + <enumeration value="DUPLICATE_CUSTOM_TAB_MOTIF"/> + <enumeration value="DUPLICATE_DEVELOPER_NAME"/> + <enumeration value="DUPLICATE_EXTERNAL_ID"/> + <enumeration value="DUPLICATE_MASTER_LABEL"/> + <enumeration value="DUPLICATE_SENDER_DISPLAY_NAME"/> + <enumeration value="DUPLICATE_USERNAME"/> + <enumeration value="DUPLICATE_VALUE"/> + <enumeration value="EMAIL_NOT_PROCESSED_DUE_TO_PRIOR_ERROR"/> + <enumeration value="EMPTY_SCONTROL_FILE_NAME"/> + <enumeration value="ENTITY_FAILED_IFLASTMODIFIED_ON_UPDATE"/> + <enumeration value="ENTITY_IS_ARCHIVED"/> + <enumeration value="ENTITY_IS_DELETED"/> + <enumeration value="ENTITY_IS_LOCKED"/> + <enumeration value="ERROR_IN_MAILER"/> + <enumeration value="FAILED_ACTIVATION"/> + <enumeration value="FIELD_CUSTOM_VALIDATION_EXCEPTION"/> + <enumeration value="FIELD_FILTER_VALIDATION_EXCEPTION"/> + <enumeration value="FIELD_INTEGRITY_EXCEPTION"/> + <enumeration value="FILTERED_LOOKUP_LIMIT_EXCEEDED"/> + <enumeration value="HTML_FILE_UPLOAD_NOT_ALLOWED"/> + <enumeration value="IMAGE_TOO_LARGE"/> + <enumeration value="INACTIVE_OWNER_OR_USER"/> + <enumeration value="INSUFFICIENT_ACCESS_ON_CROSS_REFERENCE_ENTITY"/> + <enumeration value="INSUFFICIENT_ACCESS_OR_READONLY"/> + <enumeration value="INVALID_ACCESS_LEVEL"/> + <enumeration value="INVALID_ARGUMENT_TYPE"/> + <enumeration value="INVALID_ASSIGNEE_TYPE"/> + <enumeration value="INVALID_ASSIGNMENT_RULE"/> + <enumeration value="INVALID_BATCH_OPERATION"/> + <enumeration value="INVALID_CONTENT_TYPE"/> + <enumeration value="INVALID_CREDIT_CARD_INFO"/> + <enumeration value="INVALID_CROSS_REFERENCE_KEY"/> + <enumeration value="INVALID_CROSS_REFERENCE_TYPE_FOR_FIELD"/> + <enumeration value="INVALID_CURRENCY_CONV_RATE"/> + <enumeration value="INVALID_CURRENCY_CORP_RATE"/> + <enumeration value="INVALID_CURRENCY_ISO"/> + <enumeration value="INVALID_DATA_CATEGORY_GROUP_REFERENCE"/> + <enumeration value="INVALID_DATA_URI"/> + <enumeration value="INVALID_EMAIL_ADDRESS"/> + <enumeration value="INVALID_EMPTY_KEY_OWNER"/> + <enumeration value="INVALID_FIELD"/> + <enumeration value="INVALID_FIELD_FOR_INSERT_UPDATE"/> + <enumeration value="INVALID_FIELD_WHEN_USING_TEMPLATE"/> + <enumeration value="INVALID_FILTER_ACTION"/> + <enumeration value="INVALID_GOOGLE_DOCS_URL"/> + <enumeration value="INVALID_ID_FIELD"/> + <enumeration value="INVALID_INET_ADDRESS"/> + <enumeration value="INVALID_LINEITEM_CLONE_STATE"/> + <enumeration value="INVALID_MASTER_OR_TRANSLATED_SOLUTION"/> + <enumeration value="INVALID_MESSAGE_ID_REFERENCE"/> + <enumeration value="INVALID_OPERATION"/> + <enumeration value="INVALID_OPERATOR"/> + <enumeration value="INVALID_OR_NULL_FOR_RESTRICTED_PICKLIST"/> + <enumeration value="INVALID_PARTNER_NETWORK_STATUS"/> + <enumeration value="INVALID_PERSON_ACCOUNT_OPERATION"/> + <enumeration value="INVALID_READ_ONLY_USER_DML"/> + <enumeration value="INVALID_SAVE_AS_ACTIVITY_FLAG"/> + <enumeration value="INVALID_SESSION_ID"/> + <enumeration value="INVALID_SETUP_OWNER"/> + <enumeration value="INVALID_STATUS"/> + <enumeration value="INVALID_TYPE"/> + <enumeration value="INVALID_TYPE_FOR_OPERATION"/> + <enumeration value="INVALID_TYPE_ON_FIELD_IN_RECORD"/> + <enumeration value="IP_RANGE_LIMIT_EXCEEDED"/> + <enumeration value="LICENSE_LIMIT_EXCEEDED"/> + <enumeration value="LIGHT_PORTAL_USER_EXCEPTION"/> + <enumeration value="LIMIT_EXCEEDED"/> + <enumeration value="MALFORMED_ID"/> + <enumeration value="MANAGER_NOT_DEFINED"/> + <enumeration value="MASSMAIL_RETRY_LIMIT_EXCEEDED"/> + <enumeration value="MASS_MAIL_LIMIT_EXCEEDED"/> + <enumeration value="MAXIMUM_CCEMAILS_EXCEEDED"/> + <enumeration value="MAXIMUM_DASHBOARD_COMPONENTS_EXCEEDED"/> + <enumeration value="MAXIMUM_HIERARCHY_LEVELS_REACHED"/> + <enumeration value="MAXIMUM_SIZE_OF_ATTACHMENT"/> + <enumeration value="MAXIMUM_SIZE_OF_DOCUMENT"/> + <enumeration value="MAX_ACTIONS_PER_RULE_EXCEEDED"/> + <enumeration value="MAX_ACTIVE_RULES_EXCEEDED"/> + <enumeration value="MAX_APPROVAL_STEPS_EXCEEDED"/> + <enumeration value="MAX_FORMULAS_PER_RULE_EXCEEDED"/> + <enumeration value="MAX_RULES_EXCEEDED"/> + <enumeration value="MAX_RULE_ENTRIES_EXCEEDED"/> + <enumeration value="MAX_TASK_DESCRIPTION_EXCEEEDED"/> + <enumeration value="MAX_TM_RULES_EXCEEDED"/> + <enumeration value="MAX_TM_RULE_ITEMS_EXCEEDED"/> + <enumeration value="MERGE_FAILED"/> + <enumeration value="MISSING_ARGUMENT"/> + <enumeration value="MIXED_DML_OPERATION"/> + <enumeration value="NONUNIQUE_SHIPPING_ADDRESS"/> + <enumeration value="NO_APPLICABLE_PROCESS"/> + <enumeration value="NO_ATTACHMENT_PERMISSION"/> + <enumeration value="NO_INACTIVE_DIVISION_MEMBERS"/> + <enumeration value="NO_MASS_MAIL_PERMISSION"/> + <enumeration value="NUMBER_OUTSIDE_VALID_RANGE"/> + <enumeration value="NUM_HISTORY_FIELDS_BY_SOBJECT_EXCEEDED"/> + <enumeration value="OPTED_OUT_OF_MASS_MAIL"/> + <enumeration value="OP_WITH_INVALID_USER_TYPE_EXCEPTION"/> + <enumeration value="PACKAGE_LICENSE_REQUIRED"/> + <enumeration value="PORTAL_NO_ACCESS"/> + <enumeration value="PORTAL_USER_ALREADY_EXISTS_FOR_CONTACT"/> + <enumeration value="PRIVATE_CONTACT_ON_ASSET"/> + <enumeration value="RECORD_IN_USE_BY_WORKFLOW"/> + <enumeration value="REQUEST_RUNNING_TOO_LONG"/> + <enumeration value="REQUIRED_FEATURE_MISSING"/> + <enumeration value="REQUIRED_FIELD_MISSING"/> + <enumeration value="SELF_REFERENCE_FROM_TRIGGER"/> + <enumeration value="SHARE_NEEDED_FOR_CHILD_OWNER"/> + <enumeration value="SINGLE_EMAIL_LIMIT_EXCEEDED"/> + <enumeration value="STANDARD_PRICE_NOT_DEFINED"/> + <enumeration value="STORAGE_LIMIT_EXCEEDED"/> + <enumeration value="STRING_TOO_LONG"/> + <enumeration value="TABSET_LIMIT_EXCEEDED"/> + <enumeration value="TEMPLATE_NOT_ACTIVE"/> + <enumeration value="TERRITORY_REALIGN_IN_PROGRESS"/> + <enumeration value="TEXT_DATA_OUTSIDE_SUPPORTED_CHARSET"/> + <enumeration value="TOO_MANY_APEX_REQUESTS"/> + <enumeration value="TOO_MANY_ENUM_VALUE"/> + <enumeration value="TRANSFER_REQUIRES_READ"/> + <enumeration value="UNABLE_TO_LOCK_ROW"/> + <enumeration value="UNAVAILABLE_RECORDTYPE_EXCEPTION"/> + <enumeration value="UNDELETE_FAILED"/> + <enumeration value="UNKNOWN_EXCEPTION"/> + <enumeration value="UNSPECIFIED_EMAIL_ADDRESS"/> + <enumeration value="UNSUPPORTED_APEX_TRIGGER_OPERATON"/> + <enumeration value="UNVERIFIED_SENDER_ADDRESS"/> + <enumeration value="USER_OWNS_PORTAL_ACCOUNT_EXCEPTION"/> + <enumeration value="USER_WITH_APEX_SHARES_EXCEPTION"/> + <enumeration value="WEBLINK_SIZE_LIMIT_EXCEEDED"/> + <enumeration value="WRONG_CONTROLLER_TYPE"/> + </restriction> + </simpleType> + + + <complexType name="Error"> + <sequence> + <element name="fields" type="xsd:string" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + <element name="message" type="xsd:string"/> + <element name="statusCode" type="tns:StatusCode"/> + </sequence> + </complexType> + + <complexType name="SendEmailError"> + <sequence> + <element name="fields" type="xsd:string" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + <element name="message" type="xsd:string"/> + <element name="statusCode" type="tns:StatusCode"/> + <element name="targetObjectId" type="tns:ID" nillable="true"/> + </sequence> + </complexType> + + <complexType name="SaveResult"> + <sequence> + <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> + <element name="id" type="tns:ID" nillable="true"/> + <element name="success" type="xsd:boolean"/> + </sequence> + </complexType> + + <complexType name="UpsertResult"> + <sequence> + <element name="created" type="xsd:boolean"/> + <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> + <element name="id" type="tns:ID" nillable="true"/> + <element name="success" type="xsd:boolean"/> + </sequence> + </complexType> + + <complexType name="MergeRequest"> + <sequence> + <element name="masterRecord" type="ens:sObject"/> + <element name="recordToMergeIds" type="tns:ID" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="MergeResult"> + <sequence> + <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> + <element name="id" type="tns:ID" nillable="true"/> + <element name="mergedRecordIds" type="tns:ID" minOccurs="0" maxOccurs="unbounded"/> + <element name="success" type="xsd:boolean"/> + <element name="updatedRelatedIds" type="tns:ID" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="ProcessRequest"> + <sequence> + <element name="comments" type="xsd:string" nillable="true"/> + <element name="nextApproverIds" type="tns:ID" minOccurs="0" maxOccurs="unbounded" nillable="true"/> + </sequence> + </complexType> + + <complexType name="ProcessSubmitRequest"> + <complexContent> + <extension base="tns:ProcessRequest"> + <sequence> + <element name="objectId" type="tns:ID"/> + </sequence> + </extension> + </complexContent> + </complexType> + + <complexType name="ProcessWorkitemRequest"> + <complexContent> + <extension base="tns:ProcessRequest"> + <sequence> + <element name="action" type="xsd:string"/> + <element name="workitemId" type="tns:ID"/> + </sequence> + </extension> + </complexContent> + </complexType> + + + + <complexType name="ProcessResult"> + <sequence> + <element name="actorIds" type="tns:ID" nillable="false" minOccurs="0" maxOccurs="unbounded"/> + <element name="entityId" type="tns:ID" nillable="true"/> + <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> + <element name="instanceId" type="tns:ID" nillable="true"/> + <element name="instanceStatus" type="xsd:string" nillable="true"/> + <element name="newWorkitemIds" type="tns:ID" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + <element name="success" type="xsd:boolean"/> + </sequence> + </complexType> + + + + + + <complexType name="DeleteResult"> + <sequence> + <element name="errors" type="tns:Error" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + <element name="id" type="tns:ID" nillable="true"/> + <element name="success" type="xsd:boolean"/> + </sequence> + </complexType> + + <complexType name="UndeleteResult"> + <sequence> + <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> + <element name="id" type="tns:ID" nillable="true"/> + <element name="success" type="xsd:boolean"/> + </sequence> + </complexType> + + <complexType name="EmptyRecycleBinResult"> + <sequence> + <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> + <element name="id" type="tns:ID" nillable="true"/> + <element name="success" type="xsd:boolean"/> + </sequence> + </complexType> + + <complexType name="LeadConvert"> + <sequence> + <element name="accountId" type="tns:ID" nillable="true"/> + <element name="contactId" type="tns:ID" nillable="true"/> + <element name="convertedStatus" type="xsd:string"/> + <element name="doNotCreateOpportunity" type="xsd:boolean"/> + <element name="leadId" type="tns:ID"/> + <element name="opportunityName" type="xsd:string" nillable="true"/> + <element name="overwriteLeadSource" type="xsd:boolean"/> + <element name="ownerId" type="tns:ID" nillable="true"/> + <element name="sendNotificationEmail" type="xsd:boolean"/> + </sequence> + </complexType> + + <complexType name="LeadConvertResult"> + <sequence> + <element name="accountId" type="tns:ID" nillable="true"/> + <element name="contactId" type="tns:ID" nillable="true"/> + <element name="errors" type="tns:Error" minOccurs="0" maxOccurs="unbounded"/> + <element name="leadId" type="tns:ID" nillable="true"/> + <element name="opportunityId" type="tns:ID" nillable="true"/> + <element name="success" type="xsd:boolean"/> + </sequence> + </complexType> + + <complexType name="DescribeSObjectResult"> + <sequence> + <element name="activateable" type="xsd:boolean"/> + <element name="childRelationships" type="tns:ChildRelationship" minOccurs="0" maxOccurs="unbounded"/> + <element name="createable" type="xsd:boolean"/> + <element name="custom" type="xsd:boolean"/> + <element name="customSetting" type="xsd:boolean"/> + <element name="deletable" type="xsd:boolean"/> + <element name="deprecatedAndHidden" type="xsd:boolean"/> + <element name="feedEnabled" type="xsd:boolean"/> + <element name="fields" type="tns:Field" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + <element name="keyPrefix" type="xsd:string" nillable="true"/> + <element name="label" type="xsd:string"/> + <element name="labelPlural" type="xsd:string"/> + <element name="layoutable" type="xsd:boolean"/> + <element name="mergeable" type="xsd:boolean"/> + <element name="name" type="xsd:string"/> + <element name="queryable" type="xsd:boolean"/> + <element name="recordTypeInfos" type="tns:RecordTypeInfo" minOccurs="0" maxOccurs="unbounded"/> + <element name="replicateable" type="xsd:boolean"/> + <element name="retrieveable" type="xsd:boolean"/> + <element name="searchable" type="xsd:boolean" /> + <element name="triggerable" type="xsd:boolean" minOccurs="0"/> + <element name="undeletable" type="xsd:boolean"/> + <element name="updateable" type="xsd:boolean"/> + <element name="urlDetail" type="xsd:string" nillable="true"/> + <element name="urlEdit" type="xsd:string" nillable="true"/> + <element name="urlNew" type="xsd:string" nillable="true"/> + </sequence> + </complexType> + + <!-- this is a subset of properties for each SObject that is returned by the describeGlobal call --> + <complexType name="DescribeGlobalSObjectResult"> + <sequence> + <element name="activateable" type="xsd:boolean"/> + <element name="createable" type="xsd:boolean"/> + <element name="custom" type="xsd:boolean"/> + <element name="customSetting" type="xsd:boolean"/> + <element name="deletable" type="xsd:boolean"/> + <element name="deprecatedAndHidden" type="xsd:boolean"/> + <element name="feedEnabled" type="xsd:boolean"/> + <element name="keyPrefix" type="xsd:string" nillable="true"/> + <element name="label" type="xsd:string"/> + <element name="labelPlural" type="xsd:string"/> + <element name="layoutable" type="xsd:boolean"/> + <element name="mergeable" type="xsd:boolean"/> + <element name="name" type="xsd:string"/> + <element name="queryable" type="xsd:boolean"/> + <element name="replicateable" type="xsd:boolean"/> + <element name="retrieveable" type="xsd:boolean"/> + <element name="searchable" type="xsd:boolean"/> + <element name="triggerable" type="xsd:boolean"/> + <element name="undeletable" type="xsd:boolean"/> + <element name="updateable" type="xsd:boolean"/> + </sequence> + </complexType> + + <complexType name="ChildRelationship"> + <sequence> + <element name="cascadeDelete" type="xsd:boolean"/> + <element name="childSObject" type="xsd:string"/> + <element name="deprecatedAndHidden" type="xsd:boolean"/> + <element name="field" type="xsd:string"/> + <element name="relationshipName" type="xsd:string" minOccurs="0"/> + </sequence> + </complexType> + + <complexType name="DescribeGlobalResult"> + <sequence> + <element name="encoding" type="xsd:string" nillable="true"/> + <element name="maxBatchSize" type="xsd:int"/> + <element name="sobjects" type="tns:DescribeGlobalSObjectResult" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <simpleType name="fieldType"> + <restriction base="xsd:string"> + <enumeration value="string"/> + <enumeration value="picklist"/> + <enumeration value="multipicklist"/> + <enumeration value="combobox"/> + <enumeration value="reference"/> + <enumeration value="base64"/> + <enumeration value="boolean"/> + <enumeration value="currency"/> + <enumeration value="textarea"/> + <enumeration value="int"/> + <enumeration value="double"/> + <enumeration value="percent"/> + <enumeration value="phone"/> + <enumeration value="id"/> + <enumeration value="date"/> + <enumeration value="datetime"/> + <enumeration value="time"/> + <enumeration value="url"/> + <enumeration value="email"/> + <enumeration value="encryptedstring"/> + <enumeration value="datacategorygroupreference"/> + <enumeration value="anyType"/> <!-- can be string, picklist, reference, boolean, currency, int, double, percent, id, date, datetime, url, email --> + </restriction> + </simpleType> + + <simpleType name="soapType"> + <restriction base="xsd:string"> + <enumeration value="tns:ID"/> + <enumeration value="xsd:base64Binary"/> + <enumeration value="xsd:boolean"/> + <enumeration value="xsd:double"/> + <enumeration value="xsd:int"/> + <enumeration value="xsd:string"/> + <enumeration value="xsd:date"/> + <enumeration value="xsd:dateTime"/> + <enumeration value="xsd:time"/> + <enumeration value="xsd:anyType"/> <!-- can be id, booolean, double, int, string, date, dateTime --> + </restriction> + </simpleType> + + <complexType name="Field"> + <sequence> + <element name="autoNumber" type="xsd:boolean"/> + <element name="byteLength" type="xsd:int"/> + <element name="calculated" type="xsd:boolean"/> + <element name="calculatedFormula" type="xsd:string" minOccurs="0"/> + <element name="caseSensitive" type="xsd:boolean"/> + <element name="controllerName" type="xsd:string" minOccurs="0"/> + <element name="createable" type="xsd:boolean"/> + <element name="custom" type="xsd:boolean"/> + <element name="defaultValueFormula" type="xsd:string" minOccurs="0"/> + <element name="defaultedOnCreate" type="xsd:boolean"/> + <element name="dependentPicklist" type="xsd:boolean" minOccurs="0"/> + <element name="deprecatedAndHidden" type="xsd:boolean"/> + <element name="digits" type="xsd:int"/> + <element name="externalId" type="xsd:boolean" minOccurs="0"/> + <element name="filterable" type="xsd:boolean"/> + <element name="groupable" type="xsd:boolean"/> + <element name="htmlFormatted" type="xsd:boolean" minOccurs="0"/> + <element name="idLookup" type="xsd:boolean"/> + <element name="inlineHelpText" type="xsd:string" minOccurs="0"/> + <element name="label" type="xsd:string"/> + <element name="length" type="xsd:int"/> + <element name="name" type="xsd:string"/> + <element name="nameField" type="xsd:boolean"/> + <element name="namePointing" type="xsd:boolean" minOccurs="0"/> + <element name="nillable" type="xsd:boolean"/> + <element name="picklistValues" type="tns:PicklistEntry" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + <element name="precision" type="xsd:int"/> + <element name="referenceTo" type="xsd:string" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + <element name="relationshipName" type="xsd:string" minOccurs="0"/> + <element name="relationshipOrder" type="xsd:int" minOccurs="0"/> + <element name="restrictedPicklist" type="xsd:boolean"/> + <element name="scale" type="xsd:int"/> + <element name="soapType" type="tns:soapType"/> + <element name="sortable" type="xsd:boolean" minOccurs="0"/> + <element name="type" type="tns:fieldType"/> + <element name="unique" type="xsd:boolean"/> + <element name="updateable" type="xsd:boolean"/> + <element name="writeRequiresMasterRead" type="xsd:boolean" minOccurs="0"/> + </sequence> + </complexType> + + <complexType name="PicklistEntry"> + <sequence> + <element name="active" type="xsd:boolean"/> + <element name="defaultValue" type="xsd:boolean"/> + <element name="label" type="xsd:string" nillable="true"/> + <element name="validFor" type="xsd:base64Binary" minOccurs="0"/> + <element name="value" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="DescribeDataCategoryGroupResult"> + <sequence> + <element name="categoryCount" type="xsd:int"/> + <element name="description" type="xsd:string"/> + <element name="label" type="xsd:string"/> + <element name="name" type="xsd:string"/> + <element name="sobject" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="DescribeDataCategoryGroupStructureResult"> + <sequence> + <element name="description" type="xsd:string"/> + <element name="label" type="xsd:string"/> + <element name="name" type="xsd:string"/> + <element name="sobject" type="xsd:string"/> + <element name="topCategories" type="tns:DataCategory" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="DataCategoryGroupSobjectTypePair"> + <sequence> + <element name="dataCategoryGroupName" type="xsd:string"/> + <element name="sobject" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="DataCategory"> + <sequence> + <element name="childCategories" type="tns:DataCategory" minOccurs="0" maxOccurs="unbounded"/> + <element name="label" type="xsd:string"/> + <element name="name" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="DescribeSoftphoneLayoutResult"> + <sequence> + <element name="callTypes" type="tns:DescribeSoftphoneLayoutCallType" maxOccurs="unbounded"/> + <element name="id" type="tns:ID"/> + <element name="name" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="DescribeSoftphoneLayoutCallType"> + <sequence> + <element name="infoFields" type="tns:DescribeSoftphoneLayoutInfoField" maxOccurs="unbounded"/> + <element name="name" type="xsd:string"/> + <element name="screenPopOptions" type="tns:DescribeSoftphoneScreenPopOption" minOccurs="0" maxOccurs="unbounded"/> + <element name="screenPopsOpenWithin" type="xsd:string" minOccurs="0"/> + <element name="sections" type="tns:DescribeSoftphoneLayoutSection" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="DescribeSoftphoneScreenPopOption"> + <sequence> + <element name="matchType" type="xsd:string"/> + <element name="screenPopData" type="xsd:string"/> + <element name="screenPopType" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="DescribeSoftphoneLayoutInfoField"> + <sequence> + <element name="name" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="DescribeSoftphoneLayoutSection"> + <sequence> + <element name="entityApiName" type="xsd:string"/> + <element name="items" type="tns:DescribeSoftphoneLayoutItem" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="DescribeSoftphoneLayoutItem"> + <sequence> + <element name="itemApiName" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="DescribeLayoutResult"> + <sequence> + <element name="layouts" type="tns:DescribeLayout" maxOccurs="unbounded"/> + <element name="recordTypeMappings" type="tns:RecordTypeMapping" minOccurs="0" maxOccurs="unbounded"/> + <element name="recordTypeSelectorRequired" type="xsd:boolean" /> + </sequence> + </complexType> + + <complexType name="DescribeLayout"> + <sequence> + <element name="buttonLayoutSection" type="tns:DescribeLayoutButtonSection" minOccurs="0"/> + <element name="detailLayoutSections" type="tns:DescribeLayoutSection" minOccurs="0" maxOccurs="unbounded"/> + <element name="editLayoutSections" type="tns:DescribeLayoutSection" minOccurs="0" maxOccurs="unbounded"/> + <element name="id" type="tns:ID"/> + + + <element name="relatedLists" type="tns:RelatedList" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="DescribeLayoutSection"> + <sequence> + <element name="columns" type="xsd:int"/> + <element name="heading" type="xsd:string"/> + <element name="layoutRows" type="tns:DescribeLayoutRow" maxOccurs="unbounded"/> + <element name="rows" type="xsd:int"/> + <element name="useCollapsibleSection" type="xsd:boolean"/> + <element name="useHeading" type="xsd:boolean"/> + </sequence> + </complexType> + + <complexType name="DescribeLayoutButtonSection"> + <sequence> + <element name="detailButtons" type="tns:DescribeLayoutButton" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="DescribeLayoutRow"> + <sequence> + <element name="layoutItems" type="tns:DescribeLayoutItem" maxOccurs="unbounded"/> + <element name="numItems" type="xsd:int"/> + </sequence> + </complexType> + + <complexType name="DescribeLayoutItem"> + <sequence> + <element name="editable" type="xsd:boolean"/> + <element name="label" type="xsd:string" nillable="true"/> + <element name="layoutComponents" type="tns:DescribeLayoutComponent" minOccurs="0" maxOccurs="unbounded"/> + <element name="placeholder" type="xsd:boolean"/> + <element name="required" type="xsd:boolean"/> + </sequence> + </complexType> + + <complexType name="DescribeLayoutButton"> + <sequence> + <element name="custom" type="xsd:boolean"/> + <element name="label" type="xsd:string" nillable="true"/> + <element name="name" type="xsd:string" nillable="true"/> + </sequence> + </complexType> + + <complexType name="DescribeLayoutComponent"> + <sequence> + <element name="displayLines" type="xsd:int"/> + <element name="tabOrder" type="xsd:int"/> + <element name="type" type="tns:layoutComponentType"/> + <element name="value" type="xsd:string"/> + </sequence> + </complexType> + + <simpleType name="layoutComponentType"> + <restriction base="xsd:string"> + <enumeration value="Field"/> + <enumeration value="Separator"/> + <enumeration value="SControl"/> + <enumeration value="EmptySpace"/> + </restriction> + </simpleType> + + <complexType name="RecordTypeInfo"> + <sequence> + <element name="available" type="xsd:boolean"/> + <element name="defaultRecordTypeMapping" type="xsd:boolean"/> + <element name="name" type="xsd:string"/> + <element name="recordTypeId" type="tns:ID" nillable="true"/> + </sequence> + </complexType> + + <complexType name="RecordTypeMapping"> + <sequence> + <element name="available" type="xsd:boolean"/> + <element name="defaultRecordTypeMapping" type="xsd:boolean"/> + <element name="layoutId" type="tns:ID"/> + <element name="name" type="xsd:string"/> + <element name="picklistsForRecordType" type="tns:PicklistForRecordType" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + <element name="recordTypeId" type="tns:ID" nillable="true"/> + </sequence> + </complexType> + + <complexType name="PicklistForRecordType"> + <sequence> + <element name="picklistName" type="xsd:string"/> + <element name="picklistValues" type="tns:PicklistEntry" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="RelatedList"> + <sequence> + <element name="columns" type="tns:RelatedListColumn" maxOccurs="unbounded"/> + <element name="custom" type="xsd:boolean"/> + <element name="field" type="xsd:string" nillable="true"/> + <element name="label" type="xsd:string"/> + <element name="limitRows" type="xsd:int"/> + <element name="name" type="xsd:string"/> + <element name="sobject" type="xsd:string" nillable="true"/> + <element name="sort" type="tns:RelatedListSort" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="RelatedListColumn"> + <sequence> + <element name="field" type="xsd:string" nillable="true"/> + <element name="format" type="xsd:string" nillable="true"/> + <element name="label" type="xsd:string"/> + <element name="name" type="xsd:string"/> + </sequence> + </complexType> + + <complexType name="RelatedListSort"> + <sequence> + <element name="ascending" type="xsd:boolean"/> + <element name="column" type="xsd:string"/> + </sequence> + </complexType> + + + + <complexType name="EmailFileAttachment"> + <sequence> + <element name="body" nillable="true" minOccurs="0" type="xsd:base64Binary"/> + <element name="contentType" nillable="true" minOccurs="0" type="xsd:string" /> + <element name="fileName" type="xsd:string" /> + <element name="inline" type="xsd:boolean" minOccurs="0"/> + </sequence> + </complexType> + <simpleType name="EmailPriority"> + <restriction base="xsd:string"> + <enumeration value="Highest"/> + <enumeration value="High"/> + <enumeration value="Normal"/> + <enumeration value="Low"/> + <enumeration value="Lowest"/> + </restriction> + </simpleType> + + <complexType name="Email"> + <sequence> + <element name="bccSender" type="xsd:boolean" nillable="true"/> + <element name="emailPriority" type="tns:EmailPriority" nillable="true"/> + <element name="replyTo" type="xsd:string" nillable="true"/> + <element name="saveAsActivity" type="xsd:boolean" nillable="true"/> + <element name="senderDisplayName" type="xsd:string" nillable="true"/> + <element name="subject" type="xsd:string" nillable="true"/> + <element name="useSignature" type="xsd:boolean" nillable="true"/> + </sequence> + </complexType> + + <complexType name="MassEmailMessage"> + <complexContent> + <extension base="tns:Email"> + <sequence> + <element name="description" type="xsd:string" nillable="true"/> + <element name="targetObjectIds" minOccurs="0" maxOccurs="250" type="tns:ID" /> + <element name="templateId" type="tns:ID"/> + <element name="whatIds" minOccurs="0" maxOccurs="250" type="tns:ID" /> + </sequence> + </extension> + </complexContent> + </complexType> + + <complexType name="SingleEmailMessage"> + <complexContent> + <extension base="tns:Email"> + <sequence> + <element name="bccAddresses" minOccurs="0" maxOccurs="25" type="xsd:string" nillable="true"/> + <element name="ccAddresses" minOccurs="0" maxOccurs="25" type="xsd:string" nillable="true"/> + <element name="charset" type="xsd:string" nillable="true"/> + <element name="documentAttachments" minOccurs="0" maxOccurs="unbounded" type="tns:ID" /> + <element name="htmlBody" type="xsd:string" nillable="true"/> + <element name="inReplyTo" minOccurs="0" type="xsd:string" nillable="true"/> + <element name="fileAttachments" minOccurs="0" maxOccurs="unbounded" type="tns:EmailFileAttachment"/> + <element name="orgWideEmailAddressId" minOccurs="0" maxOccurs="1" type="tns:ID" nillable="true"/> + <element name="plainTextBody" type="xsd:string" nillable="true"/> + <element name="references" minOccurs="0" type="xsd:string" nillable="true"/> + <element name="targetObjectId" type="tns:ID" nillable="true"/> + <element name="templateId" type="tns:ID" nillable="true"/> + <element name="toAddresses" minOccurs="0" maxOccurs="100" type="xsd:string" nillable="true"/> + <element name="whatId" type="tns:ID" nillable="true"/> + </sequence> + </extension> + </complexContent> + </complexType> + + <complexType name="SendEmailResult"> + <sequence> + <element name="errors" minOccurs="0" maxOccurs="unbounded" type="tns:SendEmailError" /> + <element name="success" type="xsd:boolean" /> + </sequence> + </complexType> + + + + <complexType name="DescribeTabSetResult"> + <sequence> + <element name="label" type="xsd:string" /> + <element name="logoUrl" type="xsd:string" /> + <element name="namespace" type="xsd:string" minOccurs="0"/> + <element name="selected" type="xsd:boolean" /> + <element name="tabs" type="tns:DescribeTab" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="DescribeTab"> + <sequence> + <element name="custom" type="xsd:boolean" /> + <element name="iconUrl" type="xsd:string" /> + <element name="label" type="xsd:string" /> + <element name="miniIconUrl" type="xsd:string" /> + <element name="sobjectName" type="xsd:string" nillable="true" /> + <element name="url" type="xsd:string" /> + </sequence> + </complexType> + + + + + + <!-- Login Message Types --> + <element name="login"> + <complexType> + <sequence> + <element name="username" type="xsd:string"/> + <element name="password" type="xsd:string"/> + </sequence> + </complexType> + </element> + <element name="loginResponse"> + <complexType> + <sequence> + <element name="result" type="tns:LoginResult"/> + </sequence> + </complexType> + </element> + + <!-- Describe Message Types --> + <element name="describeSObject"> + <complexType> + <sequence> + <element name="sObjectType" type="xsd:string"/> + </sequence> + </complexType> + </element> + <element name="describeSObjectResponse"> + <complexType> + <sequence> + <element name="result" type="tns:DescribeSObjectResult" nillable="true"/> + </sequence> + </complexType> + </element> + + <!-- DescibeSObjects Message Types --> + <element name="describeSObjects"> + <complexType> + <sequence> + <element name="sObjectType" type="xsd:string" minOccurs='0' maxOccurs='100' /> + </sequence> + </complexType> + </element> + <element name="describeSObjectsResponse"> + <complexType> + <sequence> + <element name="result" type="tns:DescribeSObjectResult" nillable="true" minOccurs='0' maxOccurs='100'/> + </sequence> + </complexType> + </element> + + <!-- Describe Global Message Types --> + <element name="describeGlobal"> + <complexType> + <sequence/> + </complexType> + </element> + <element name="describeGlobalResponse"> + <complexType> + <sequence> + <element name="result" type="tns:DescribeGlobalResult"/> + </sequence> + </complexType> + </element> + + <!-- Describe Data Category Groups Message Types --> + <element name="describeDataCategoryGroups"> + <complexType> + <sequence> + <element name="sObjectType" type="xsd:string" minOccurs='0' maxOccurs='10' /> + </sequence> + </complexType> + </element> + <element name="describeDataCategoryGroupsResponse"> + <complexType> + <sequence> + <element name="result" type="tns:DescribeDataCategoryGroupResult" minOccurs='0' maxOccurs='100'/> + </sequence> + </complexType> + </element> + <element name="describeDataCategoryGroupStructures"> + <complexType> + <sequence> + <element name="pairs" type="tns:DataCategoryGroupSobjectTypePair" minOccurs='0' maxOccurs='100' /> + <element name="topCategoriesOnly" type="xsd:boolean"/> + </sequence> + </complexType> + </element> + <element name="describeDataCategoryGroupStructuresResponse"> + <complexType> + <sequence> + <element name="result" type="tns:DescribeDataCategoryGroupStructureResult" minOccurs='0' maxOccurs='100'/> + </sequence> + </complexType> + </element> + <element name="describeLayout"> + <complexType> + <sequence> + <element name="sObjectType" type="xsd:string"/> + <element name="recordTypeIds" type="tns:ID" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + <element name="describeLayoutResponse"> + <complexType> + <sequence> + <element name="result" type="tns:DescribeLayoutResult" nillable="true"/> + </sequence> + </complexType> + </element> + + <element name="describeSoftphoneLayout"> + <complexType> + <sequence/> + </complexType> + </element> + <element name="describeSoftphoneLayoutResponse"> + <complexType> + <sequence> + <element name="result" type="tns:DescribeSoftphoneLayoutResult" nillable="true"/> + </sequence> + </complexType> + </element> + + + <element name="describeTabs"> + <complexType> + <sequence/> + </complexType> + </element> + <element name="describeTabsResponse"> + <complexType> + <sequence> + <element name="result" type="tns:DescribeTabSetResult" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + <!-- Create Message Types --> + <element name="create"> + <complexType> + <sequence> + <element name="sObjects" type="ens:sObject" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + <element name="createResponse"> + <complexType> + <sequence> + <element name="result" type="tns:SaveResult" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + + + <!-- Send Email Types --> + <element name="sendEmail"> + <complexType> + <sequence> + <element name="messages" type="tns:Email" minOccurs="0" maxOccurs="10"/> + </sequence> + </complexType> + </element> + <element name="sendEmailResponse"> + <complexType> + <sequence> + <element name="result" minOccurs="0" maxOccurs="10" type="tns:SendEmailResult"/> + </sequence> + </complexType> + </element> + + + <!-- Update Message Types --> + <element name="update"> + <complexType> + <sequence> + <element name="sObjects" type="ens:sObject" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + <element name="updateResponse"> + <complexType> + <sequence> + <element name="result" type="tns:SaveResult" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + <!-- Upsert Message Types --> + <element name="upsert"> + <complexType> + <sequence> + <element name="externalIDFieldName" type="xsd:string"/> + <element name="sObjects" type="ens:sObject" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + <element name="upsertResponse"> + <complexType> + <sequence> + <element name="result" type="tns:UpsertResult" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + <!-- Merge Message Types --> + <element name="merge"> + <complexType> + <sequence> + <element name="request" type="tns:MergeRequest" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + <element name="mergeResponse"> + <complexType> + <sequence> + <element name="result" type="tns:MergeResult" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + <!-- Delete Message Types --> + <element name="delete"> + <complexType> + <sequence> + <element name="ids" type="tns:ID" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + <element name="deleteResponse"> + <complexType> + <sequence> + <element name="result" type="tns:DeleteResult" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + <!-- Undelete Message Types --> + <element name="undelete"> + <complexType> + <sequence> + <element name="ids" type="tns:ID" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + <element name="undeleteResponse"> + <complexType> + <sequence> + <element name="result" type="tns:UndeleteResult" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + <!-- EmptyRecycleBin Message Types --> + <element name="emptyRecycleBin"> + <complexType> + <sequence> + <element name="ids" type="tns:ID" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + <element name="emptyRecycleBinResponse"> + <complexType> + <sequence> + <element name="result" type="tns:EmptyRecycleBinResult" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + <!-- Process Message Types --> + <element name="process"> + <complexType> + <sequence> + <element name="actions" type="tns:ProcessRequest" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + <element name="processResponse"> + <complexType> + <sequence> + <element name="result" type="tns:ProcessResult" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + + + <!-- Retrieve (ID List) Message Types --> + <element name="retrieve"> + <complexType> + <sequence> + <element name="fieldList" type="xsd:string"/> + <element name="sObjectType" type="xsd:string"/> + <element name="ids" type="tns:ID" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + <element name="retrieveResponse"> + <complexType> + <sequence> + <element name="result" type="ens:sObject" nillable="true" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + <!-- Convert Lead Message Types --> + <element name="convertLead"> + <complexType> + <sequence> + <element name="leadConverts" type="tns:LeadConvert" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + <element name="convertLeadResponse"> + <complexType> + <sequence> + <element name="result" type="tns:LeadConvertResult" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + <!-- Get Updated Message Types --> + <element name="getUpdated"> + <complexType> + <sequence> + <element name="sObjectType" type="xsd:string"/> + <element name="startDate" type="xsd:dateTime"/> + <element name="endDate" type="xsd:dateTime"/> + </sequence> + </complexType> + </element> + <element name="getUpdatedResponse"> + <complexType> + <sequence> + <element name="result" type="tns:GetUpdatedResult"/> + </sequence> + </complexType> + </element> + + <!-- Get Deleted Message Types --> + <element name="getDeleted"> + <complexType> + <sequence> + <element name="sObjectType" type="xsd:string"/> + <element name="startDate" type="xsd:dateTime"/> + <element name="endDate" type="xsd:dateTime"/> + </sequence> + </complexType> + </element> + <element name="getDeletedResponse"> + <complexType> + <sequence> + <element name="result" type="tns:GetDeletedResult"/> + </sequence> + </complexType> + </element> + + + <!-- Logout current session --> + <element name="logout"> + <complexType> + </complexType> + </element> + + <element name="logoutResponse"> + <complexType> + </complexType> + </element> + + <!-- Invalidate a list of session ids --> + <element name="invalidateSessions"> + <complexType> + <sequence> + <element name="sessionIds" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + <element name="invalidateSessionsResponse"> + <complexType> + <sequence> + <element name="result" type="tns:InvalidateSessionsResult" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + </complexType> + </element> + + <!-- Create Query --> + <element name="query"> + <complexType> + <sequence> + <element name="queryString" type="xsd:string"/> + </sequence> + </complexType> + </element> + <element name="queryResponse"> + <complexType> + <sequence> + <element name="result" type="tns:QueryResult"/> + </sequence> + </complexType> + </element> + + <!-- Create Query All --> + <element name="queryAll"> + <complexType> + <sequence> + <element name="queryString" type="xsd:string"/> + </sequence> + </complexType> + </element> + <element name="queryAllResponse"> + <complexType> + <sequence> + <element name="result" type="tns:QueryResult"/> + </sequence> + </complexType> + </element> + + <!-- Next Batch of sObjects from a query --> + <element name="queryMore"> + <complexType> + <sequence> + <element name="queryLocator" type="tns:QueryLocator"/> + </sequence> + </complexType> + </element> + <element name="queryMoreResponse"> + <complexType> + <sequence> + <element name="result" type="tns:QueryResult"/> + </sequence> + </complexType> + </element> + + + + <!-- Create Search --> + <element name="search"> + <complexType> + <sequence> + <element name="searchString" type="xsd:string"/> + </sequence> + </complexType> + </element> + <element name="searchResponse"> + <complexType> + <sequence> + <element name="result" type="tns:SearchResult"/> + </sequence> + </complexType> + </element> + + + + <element name="getServerTimestamp"> + <complexType> + <sequence/> + </complexType> + </element> + <element name="getServerTimestampResponse"> + <complexType> + <sequence> + <element name="result" type="tns:GetServerTimestampResult"/> + </sequence> + </complexType> + </element> + + <element name="setPassword"> + <complexType> + <sequence> + <element name="userId" type="tns:ID"/> + <element name="password" type="xsd:string"/> + </sequence> + </complexType> + </element> + <element name="setPasswordResponse"> + <complexType> + <sequence> + <element name="result" type="tns:SetPasswordResult"/> + </sequence> + </complexType> + </element> + + <element name="resetPassword"> + <complexType> + <sequence> + <element name="userId" type="tns:ID"/> + </sequence> + </complexType> + </element> + <element name="resetPasswordResponse"> + <complexType> + <sequence> + <element name="result" type="tns:ResetPasswordResult"/> + </sequence> + </complexType> + </element> + + <element name="getUserInfo"> + <complexType> + <sequence/> + </complexType> + </element> + <element name="getUserInfoResponse"> + <complexType> + <sequence> + <element name="result" type="tns:GetUserInfoResult"/> + </sequence> + </complexType> + </element> + + + + <!-- Header Elements --> + <element name="SessionHeader"> + <complexType> + <sequence> + <element name="sessionId" type="xsd:string"/> + </sequence> + </complexType> + </element> + + <element name="LoginScopeHeader"> + <complexType> + <sequence> + <element name="organizationId" type="tns:ID"/> + <element name="portalId" type="tns:ID" minOccurs="0"/> + </sequence> + </complexType> + </element> + + + <element name="CallOptions"> + <complexType> + <sequence> + <element name="client" type="xsd:string" nillable="true"/> + <element name="defaultNamespace" type="xsd:string" nillable="true"/> + + </sequence> + </complexType> + </element> + + + <element name="QueryOptions"> + <complexType> + <sequence> + <element name="batchSize" type="xsd:int" minOccurs="0"/> + + </sequence> + </complexType> + </element> + + + <simpleType name="DebugLevel"> + <restriction base="xsd:string"> + <enumeration value="None"/> + <enumeration value="DebugOnly"/> + <enumeration value="Db"/> + </restriction> + </simpleType> + <element name="DebuggingHeader"> + <complexType> + <sequence> + <element name="debugLevel" type="tns:DebugLevel"/> + </sequence> + </complexType> + </element> + <element name="DebuggingInfo"> + <complexType> + <sequence> + <element name="debugLog" type="xsd:string"/> + </sequence> + </complexType> + </element> + + <xsd:complexType name="PackageVersion"> + <xsd:sequence> + <xsd:element name="majorNumber" type="xsd:int"/> + <xsd:element name="minorNumber" type="xsd:int"/> + <xsd:element name="namespace" type="xsd:string"/> + </xsd:sequence> + </xsd:complexType> + <xsd:element name="PackageVersionHeader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="packageVersions" minOccurs="0" maxOccurs="unbounded" type="tns:PackageVersion"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + + <element name="AllowFieldTruncationHeader"> + <complexType> + <sequence> + <element name="allowFieldTruncation" type="xsd:boolean" /> + </sequence> + </complexType> + </element> + + + <element name="DisableFeedTrackingHeader"> + <complexType> + <sequence> + <element name="disableFeedTracking" type="xsd:boolean" /> + </sequence> + </complexType> + </element> + + + + + + <element name="AllOrNoneHeader"> + <complexType> + <sequence> + <element name="allOrNone" type="xsd:boolean" /> + </sequence> + </complexType> + </element> + + + <!-- ideally this could of just been elem name="..." type="xsd:boolean" + but is required to be nested within a complexType for .NET 1.1 compatibility --> + <element name="MruHeader"> + <complexType> + <sequence> + <element name="updateMru" type="xsd:boolean" /> + </sequence> + </complexType> + </element> + + <element name="EmailHeader"> + <complexType> + <sequence> + <element name="triggerAutoResponseEmail" type="xsd:boolean"/> + <element name="triggerOtherEmail" type="xsd:boolean"/> + <element name="triggerUserEmail" type="xsd:boolean"/> + </sequence> + </complexType> + </element> + + <element name="AssignmentRuleHeader"> + <complexType> + <sequence> + <element name="assignmentRuleId" type="tns:ID" nillable="true" /> + <element name="useDefaultRule" type="xsd:boolean" nillable="true" /> + </sequence> + </complexType> + </element> + + <element name="UserTerritoryDeleteHeader"> + <complexType> + <sequence> + <element name="transferToUserId" type="tns:ID" nillable="true"/> + </sequence> + </complexType> + </element> + + + + <element name="LocaleOptions"> + <complexType> + <sequence> + <element name="language" type="xsd:string" minOccurs="0"/> + </sequence> + </complexType> + </element> + </schema> + + <schema elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:fault.partner.soap.sforce.com" xmlns:fns="urn:fault.partner.soap.sforce.com"> + + <simpleType name="ExceptionCode"> + <restriction base="xsd:string"> + <enumeration value="API_CURRENTLY_DISABLED"/> + <enumeration value="API_DISABLED_FOR_ORG"/> + <enumeration value="CANT_ADD_STANDADRD_PORTAL_USER_TO_TERRITORY"/> + <enumeration value="CANT_ADD_STANDARD_PORTAL_USER_TO_TERRITORY"/> + <enumeration value="CIRCULAR_OBJECT_GRAPH"/> + <enumeration value="CLIENT_NOT_ACCESSIBLE_FOR_USER"/> + <enumeration value="CLIENT_REQUIRE_UPDATE_FOR_USER"/> + <enumeration value="CUSTOM_METADATA_LIMIT_EXCEEDED"/> + <enumeration value="DATACLOUD_API_CLIENT_EXCEPTION"/> + <enumeration value="DATACLOUD_API_SERVER_EXCEPTION"/> + <enumeration value="DATACLOUD_API_UNAVAILABLE"/> + <enumeration value="DUPLICATE_VALUE"/> + <enumeration value="EMAIL_BATCH_SIZE_LIMIT_EXCEEDED"/> + <enumeration value="EMAIL_TO_CASE_INVALID_ROUTING"/> + <enumeration value="EMAIL_TO_CASE_LIMIT_EXCEEDED"/> + <enumeration value="EMAIL_TO_CASE_NOT_ENABLED"/> + <enumeration value="EXCEEDED_ID_LIMIT"/> + <enumeration value="EXCEEDED_LEAD_CONVERT_LIMIT"/> + <enumeration value="EXCEEDED_MAX_SIZE_REQUEST"/> + <enumeration value="EXCEEDED_MAX_TYPES_LIMIT"/> + <enumeration value="EXCEEDED_QUOTA"/> + <enumeration value="FUNCTIONALITY_NOT_ENABLED"/> + <enumeration value="FUNCTIONALITY_TEMPORARILY_UNAVAILABLE"/> + <enumeration value="INACTIVE_OWNER_OR_USER"/> + <enumeration value="INACTIVE_PORTAL"/> + <enumeration value="INSUFFICIENT_ACCESS"/> + <enumeration value="INVALID_ASSIGNMENT_RULE"/> + <enumeration value="INVALID_BATCH_SIZE"/> + <enumeration value="INVALID_CLIENT"/> + <enumeration value="INVALID_CROSS_REFERENCE_KEY"/> + <enumeration value="INVALID_FIELD"/> + <enumeration value="INVALID_FILTER_LANGUAGE"/> + <enumeration value="INVALID_FILTER_VALUE"/> + <enumeration value="INVALID_ID_FIELD"/> + <enumeration value="INVALID_LOCALE_LANGUAGE"/> + <enumeration value="INVALID_LOCATOR"/> + <enumeration value="INVALID_LOGIN"/> + <enumeration value="INVALID_NEW_PASSWORD"/> + <enumeration value="INVALID_OPERATION"/> + <enumeration value="INVALID_OPERATION_WITH_EXPIRED_PASSWORD"/> + <enumeration value="INVALID_QUERY_FILTER_OPERATOR"/> + <enumeration value="INVALID_QUERY_LOCATOR"/> + <enumeration value="INVALID_QUERY_SCOPE"/> + <enumeration value="INVALID_REPLICATION_DATE"/> + <enumeration value="INVALID_SEARCH"/> + <enumeration value="INVALID_SEARCH_SCOPE"/> + <enumeration value="INVALID_SESSION_ID"/> + <enumeration value="INVALID_SOAP_HEADER"/> + <enumeration value="INVALID_SSO_GATEWAY_URL"/> + <enumeration value="INVALID_TYPE"/> + <enumeration value="INVALID_TYPE_FOR_OPERATION"/> + <enumeration value="JIGSAW_IMPORT_LIMIT_EXCEEDED"/> + <enumeration value="JIGSAW_REQUEST_NOT_SUPPORTED"/> + <enumeration value="JSON_PARSER_ERROR"/> + <enumeration value="LIMIT_EXCEEDED"/> + <enumeration value="LOGIN_CHALLENGE_ISSUED"/> + <enumeration value="LOGIN_CHALLENGE_PENDING"/> + <enumeration value="LOGIN_DURING_RESTRICTED_DOMAIN"/> + <enumeration value="LOGIN_DURING_RESTRICTED_TIME"/> + <enumeration value="LOGIN_MUST_USE_SECURITY_TOKEN"/> + <enumeration value="MALFORMED_ID"/> + <enumeration value="MALFORMED_QUERY"/> + <enumeration value="MALFORMED_SEARCH"/> + <enumeration value="MISSING_ARGUMENT"/> + <enumeration value="NOT_MODIFIED"/> + <enumeration value="NO_SOFTPHONE_LAYOUT"/> + <enumeration value="NUMBER_OUTSIDE_VALID_RANGE"/> + <enumeration value="OPERATION_TOO_LARGE"/> + <enumeration value="ORG_IN_MAINTENANCE"/> + <enumeration value="ORG_IS_DOT_ORG"/> + <enumeration value="ORG_LOCKED"/> + <enumeration value="ORG_NOT_OWNED_BY_INSTANCE"/> + <enumeration value="PASSWORD_LOCKOUT"/> + <enumeration value="PORTAL_NO_ACCESS"/> + <enumeration value="QUERY_TIMEOUT"/> + <enumeration value="QUERY_TOO_COMPLICATED"/> + <enumeration value="REQUEST_LIMIT_EXCEEDED"/> + <enumeration value="REQUEST_RUNNING_TOO_LONG"/> + <enumeration value="SERVER_UNAVAILABLE"/> + <enumeration value="SOCIALCRM_FEEDSERVICE_API_CLIENT_EXCEPTION"/> + <enumeration value="SOCIALCRM_FEEDSERVICE_API_SERVER_EXCEPTION"/> + <enumeration value="SOCIALCRM_FEEDSERVICE_API_UNAVAILABLE"/> + <enumeration value="SSO_SERVICE_DOWN"/> + <enumeration value="TOO_MANY_APEX_REQUESTS"/> + <enumeration value="TRIAL_EXPIRED"/> + <enumeration value="UNKNOWN_EXCEPTION"/> + <enumeration value="UNSUPPORTED_API_VERSION"/> + <enumeration value="UNSUPPORTED_CLIENT"/> + <enumeration value="UNSUPPORTED_MEDIA_TYPE"/> + <enumeration value="XML_PARSER_ERROR"/> + </restriction> + </simpleType> + <!-- For convenience these QNames are returned in the standard soap faultcode element --> + <simpleType name="FaultCode"> + <restriction base="xsd:QName"> + <enumeration value="fns:API_CURRENTLY_DISABLED"/> + <enumeration value="fns:API_DISABLED_FOR_ORG"/> + <enumeration value="fns:CANT_ADD_STANDADRD_PORTAL_USER_TO_TERRITORY"/> + <enumeration value="fns:CANT_ADD_STANDARD_PORTAL_USER_TO_TERRITORY"/> + <enumeration value="fns:CIRCULAR_OBJECT_GRAPH"/> + <enumeration value="fns:CLIENT_NOT_ACCESSIBLE_FOR_USER"/> + <enumeration value="fns:CLIENT_REQUIRE_UPDATE_FOR_USER"/> + <enumeration value="fns:CUSTOM_METADATA_LIMIT_EXCEEDED"/> + <enumeration value="fns:DATACLOUD_API_CLIENT_EXCEPTION"/> + <enumeration value="fns:DATACLOUD_API_SERVER_EXCEPTION"/> + <enumeration value="fns:DATACLOUD_API_UNAVAILABLE"/> + <enumeration value="fns:DUPLICATE_VALUE"/> + <enumeration value="fns:EMAIL_BATCH_SIZE_LIMIT_EXCEEDED"/> + <enumeration value="fns:EMAIL_TO_CASE_INVALID_ROUTING"/> + <enumeration value="fns:EMAIL_TO_CASE_LIMIT_EXCEEDED"/> + <enumeration value="fns:EMAIL_TO_CASE_NOT_ENABLED"/> + <enumeration value="fns:EXCEEDED_ID_LIMIT"/> + <enumeration value="fns:EXCEEDED_LEAD_CONVERT_LIMIT"/> + <enumeration value="fns:EXCEEDED_MAX_SIZE_REQUEST"/> + <enumeration value="fns:EXCEEDED_MAX_TYPES_LIMIT"/> + <enumeration value="fns:EXCEEDED_QUOTA"/> + <enumeration value="fns:FUNCTIONALITY_NOT_ENABLED"/> + <enumeration value="fns:FUNCTIONALITY_TEMPORARILY_UNAVAILABLE"/> + <enumeration value="fns:INACTIVE_OWNER_OR_USER"/> + <enumeration value="fns:INACTIVE_PORTAL"/> + <enumeration value="fns:INSUFFICIENT_ACCESS"/> + <enumeration value="fns:INVALID_ASSIGNMENT_RULE"/> + <enumeration value="fns:INVALID_BATCH_SIZE"/> + <enumeration value="fns:INVALID_CLIENT"/> + <enumeration value="fns:INVALID_CROSS_REFERENCE_KEY"/> + <enumeration value="fns:INVALID_FIELD"/> + <enumeration value="fns:INVALID_FILTER_LANGUAGE"/> + <enumeration value="fns:INVALID_FILTER_VALUE"/> + <enumeration value="fns:INVALID_ID_FIELD"/> + <enumeration value="fns:INVALID_LOCALE_LANGUAGE"/> + <enumeration value="fns:INVALID_LOCATOR"/> + <enumeration value="fns:INVALID_LOGIN"/> + <enumeration value="fns:INVALID_NEW_PASSWORD"/> + <enumeration value="fns:INVALID_OPERATION"/> + <enumeration value="fns:INVALID_OPERATION_WITH_EXPIRED_PASSWORD"/> + <enumeration value="fns:INVALID_QUERY_FILTER_OPERATOR"/> + <enumeration value="fns:INVALID_QUERY_LOCATOR"/> + <enumeration value="fns:INVALID_QUERY_SCOPE"/> + <enumeration value="fns:INVALID_REPLICATION_DATE"/> + <enumeration value="fns:INVALID_SEARCH"/> + <enumeration value="fns:INVALID_SEARCH_SCOPE"/> + <enumeration value="fns:INVALID_SESSION_ID"/> + <enumeration value="fns:INVALID_SOAP_HEADER"/> + <enumeration value="fns:INVALID_SSO_GATEWAY_URL"/> + <enumeration value="fns:INVALID_TYPE"/> + <enumeration value="fns:INVALID_TYPE_FOR_OPERATION"/> + <enumeration value="fns:JIGSAW_IMPORT_LIMIT_EXCEEDED"/> + <enumeration value="fns:JIGSAW_REQUEST_NOT_SUPPORTED"/> + <enumeration value="fns:JSON_PARSER_ERROR"/> + <enumeration value="fns:LIMIT_EXCEEDED"/> + <enumeration value="fns:LOGIN_CHALLENGE_ISSUED"/> + <enumeration value="fns:LOGIN_CHALLENGE_PENDING"/> + <enumeration value="fns:LOGIN_DURING_RESTRICTED_DOMAIN"/> + <enumeration value="fns:LOGIN_DURING_RESTRICTED_TIME"/> + <enumeration value="fns:LOGIN_MUST_USE_SECURITY_TOKEN"/> + <enumeration value="fns:MALFORMED_ID"/> + <enumeration value="fns:MALFORMED_QUERY"/> + <enumeration value="fns:MALFORMED_SEARCH"/> + <enumeration value="fns:MISSING_ARGUMENT"/> + <enumeration value="fns:NOT_MODIFIED"/> + <enumeration value="fns:NO_SOFTPHONE_LAYOUT"/> + <enumeration value="fns:NUMBER_OUTSIDE_VALID_RANGE"/> + <enumeration value="fns:OPERATION_TOO_LARGE"/> + <enumeration value="fns:ORG_IN_MAINTENANCE"/> + <enumeration value="fns:ORG_IS_DOT_ORG"/> + <enumeration value="fns:ORG_LOCKED"/> + <enumeration value="fns:ORG_NOT_OWNED_BY_INSTANCE"/> + <enumeration value="fns:PASSWORD_LOCKOUT"/> + <enumeration value="fns:PORTAL_NO_ACCESS"/> + <enumeration value="fns:QUERY_TIMEOUT"/> + <enumeration value="fns:QUERY_TOO_COMPLICATED"/> + <enumeration value="fns:REQUEST_LIMIT_EXCEEDED"/> + <enumeration value="fns:REQUEST_RUNNING_TOO_LONG"/> + <enumeration value="fns:SERVER_UNAVAILABLE"/> + <enumeration value="fns:SOCIALCRM_FEEDSERVICE_API_CLIENT_EXCEPTION"/> + <enumeration value="fns:SOCIALCRM_FEEDSERVICE_API_SERVER_EXCEPTION"/> + <enumeration value="fns:SOCIALCRM_FEEDSERVICE_API_UNAVAILABLE"/> + <enumeration value="fns:SSO_SERVICE_DOWN"/> + <enumeration value="fns:TOO_MANY_APEX_REQUESTS"/> + <enumeration value="fns:TRIAL_EXPIRED"/> + <enumeration value="fns:UNKNOWN_EXCEPTION"/> + <enumeration value="fns:UNSUPPORTED_API_VERSION"/> + <enumeration value="fns:UNSUPPORTED_CLIENT"/> + <enumeration value="fns:UNSUPPORTED_MEDIA_TYPE"/> + <enumeration value="fns:XML_PARSER_ERROR"/> + </restriction> + </simpleType> + + + <!-- Fault --> + <complexType name="ApiFault"> + <sequence> + <element name="exceptionCode" type="fns:ExceptionCode"/> + <element name="exceptionMessage" type="xsd:string"/> + + </sequence> + </complexType> + + <element name="fault" type="fns:ApiFault" /> + + <complexType name="ApiQueryFault"> + <complexContent> + <extension base="fns:ApiFault"> + <sequence> + <element name="row" type="xsd:int"/> + <element name="column" type="xsd:int"/> + </sequence> + </extension> + </complexContent> + </complexType> + + <complexType name="LoginFault"> + <complexContent> + <extension base="fns:ApiFault"/> + </complexContent> + </complexType> + <element name="LoginFault" type="fns:LoginFault"/> + + <complexType name="InvalidQueryLocatorFault"> + <complexContent> + <extension base="fns:ApiFault"/> + </complexContent> + </complexType> + <element name="InvalidQueryLocatorFault" type="fns:InvalidQueryLocatorFault"/> + + <complexType name="InvalidNewPasswordFault"> + <complexContent> + <extension base="fns:ApiFault"/> + </complexContent> + </complexType> + <element name="InvalidNewPasswordFault" type="fns:InvalidNewPasswordFault"/> + + <complexType name="InvalidIdFault"> + <complexContent> + <extension base="fns:ApiFault"/> + </complexContent> + </complexType> + <element name="InvalidIdFault" type="fns:InvalidIdFault"/> + + <complexType name="UnexpectedErrorFault"> + <complexContent> + <extension base="fns:ApiFault"/> + </complexContent> + </complexType> + <element name="UnexpectedErrorFault" type="fns:UnexpectedErrorFault"/> + + <complexType name="InvalidFieldFault"> + <complexContent> + <extension base="fns:ApiQueryFault"/> + </complexContent> + </complexType> + <element name="InvalidFieldFault" type="fns:InvalidFieldFault"/> + + <complexType name="InvalidSObjectFault"> + <complexContent> + <extension base="fns:ApiQueryFault"/> + </complexContent> + </complexType> + <element name="InvalidSObjectFault" type="fns:InvalidSObjectFault"/> + + <complexType name="MalformedQueryFault"> + <complexContent> + <extension base="fns:ApiQueryFault"/> + </complexContent> + </complexType> + <element name="MalformedQueryFault" type="fns:MalformedQueryFault"/> + + <complexType name="MalformedSearchFault"> + <complexContent> + <extension base="fns:ApiQueryFault"/> + </complexContent> + </complexType> + <element name="MalformedSearchFault" type="fns:MalformedSearchFault"/> + + + </schema> + </types> + + <!-- Header Message --> + <message name="Header"> + <part element="tns:LoginScopeHeader" name="LoginScopeHeader"/> + <part element="tns:SessionHeader" name="SessionHeader"/> + + <part element="tns:CallOptions" name="CallOptions"/> + + <part element="tns:QueryOptions" name="QueryOptions"/> + <part element="tns:AssignmentRuleHeader" name="AssignmentRuleHeader"/> + <part element="tns:AllowFieldTruncationHeader" name="AllowFieldTruncationHeader"/> + + <part element="tns:AllOrNoneHeader" name="AllOrNoneHeader"/> + + + <part element="tns:DisableFeedTrackingHeader" name="DisableFeedTrackingHeader"/> + + + <part element="tns:MruHeader" name="MruHeader"/> + <part element="tns:EmailHeader" name="EmailHeader"/> + + <part element="tns:UserTerritoryDeleteHeader" name="UserTerritoryDeleteHeader"/> + + <part element="tns:DebuggingHeader" name="DebuggingHeader"/> + <part element="tns:PackageVersionHeader" name="PackageVersionHeader"/> + <part element="tns:DebuggingInfo" name="DebuggingInfo"/> + <part element="tns:LocaleOptions" name="LocaleOptions"/> + </message> + + <!-- Fault Messages --> + + <message name="ApiFault"> + <part name="fault" element="fns:fault"/> + </message> + + <message name="LoginFault"> + <part name="fault" element="fns:LoginFault"/> + </message> + <message name="InvalidQueryLocatorFault"> + <part name="fault" element="fns:InvalidQueryLocatorFault"/> + </message> + <message name="InvalidNewPasswordFault"> + <part name="fault" element="fns:InvalidNewPasswordFault"/> + </message> + <message name="InvalidIdFault"> + <part name="fault" element="fns:InvalidIdFault"/> + </message> + <message name="UnexpectedErrorFault"> + <part name="fault" element="fns:UnexpectedErrorFault"/> + </message> + <message name="InvalidFieldFault"> + <part name="fault" element="fns:InvalidFieldFault"/> + </message> + <message name="InvalidSObjectFault"> + <part name="fault" element="fns:InvalidSObjectFault"/> + </message> + <message name="MalformedQueryFault"> + <part name="fault" element="fns:MalformedQueryFault"/> + </message> + <message name="MalformedSearchFault"> + <part name="fault" element="fns:MalformedSearchFault"/> + </message> + + + <!-- Method Messages --> + <message name="loginRequest"> + <part element="tns:login" name="parameters"/> + </message> + <message name="loginResponse"> + <part element="tns:loginResponse" name="parameters"/> + </message> + + <message name="describeSObjectRequest"> + <part element="tns:describeSObject" name="parameters"/> + </message> + <message name="describeSObjectResponse"> + <part element="tns:describeSObjectResponse" name="parameters"/> + </message> + + <message name="describeSObjectsRequest"> + <part element="tns:describeSObjects" name="parameters"/> + </message> + <message name="describeSObjectsResponse"> + <part element="tns:describeSObjectsResponse" name="parameters"/> + </message> + + <message name="describeGlobalRequest"> + <part element="tns:describeGlobal" name="parameters"/> + </message> + <message name="describeGlobalResponse"> + <part element="tns:describeGlobalResponse" name="parameters"/> + </message> + + <message name="describeDataCategoryGroupsRequest"> + <part element="tns:describeDataCategoryGroups" name="parameters"/> + </message> + <message name="describeDataCategoryGroupsResponse"> + <part element="tns:describeDataCategoryGroupsResponse" name="parameters"/> + </message> + + <message name="describeDataCategoryGroupStructuresRequest"> + <part element="tns:describeDataCategoryGroupStructures" name="parameters"/> + </message> + <message name="describeDataCategoryGroupStructuresResponse"> + <part element="tns:describeDataCategoryGroupStructuresResponse" name="parameters"/> + </message> + + <message name="describeLayoutRequest"> + <part element="tns:describeLayout" name="parameters"/> + </message> + <message name="describeLayoutResponse"> + <part element="tns:describeLayoutResponse" name="parameters"/> + </message> + + <message name="describeSoftphoneLayoutRequest"> + <part element="tns:describeSoftphoneLayout" name="parameters"/> + </message> + <message name="describeSoftphoneLayoutResponse"> + <part element="tns:describeSoftphoneLayoutResponse" name="parameters"/> + </message> + + <message name="describeTabsRequest"> + <part element="tns:describeTabs" name="parameters"/> + </message> + <message name="describeTabsResponse"> + <part element="tns:describeTabsResponse" name="parameters"/> + </message> + + <message name="createRequest"> + <part element="tns:create" name="parameters"/> + </message> + <message name="createResponse"> + <part element="tns:createResponse" name="parameters"/> + </message> + + <message name="updateRequest"> + <part element="tns:update" name="parameters"/> + </message> + <message name="updateResponse"> + <part element="tns:updateResponse" name="parameters"/> + </message> + + <message name="upsertRequest"> + <part element="tns:upsert" name="parameters"/> + </message> + <message name="upsertResponse"> + <part element="tns:upsertResponse" name="parameters"/> + </message> + + <message name="mergeRequest"> + <part element="tns:merge" name="parameters"/> + </message> + <message name="mergeResponse"> + <part element="tns:mergeResponse" name="parameters"/> + </message> + + <message name="deleteRequest"> + <part element="tns:delete" name="parameters"/> + </message> + <message name="deleteResponse"> + <part element="tns:deleteResponse" name="parameters"/> + </message> + + <message name="undeleteRequest"> + <part element="tns:undelete" name="parameters"/> + </message> + <message name="undeleteResponse"> + <part element="tns:undeleteResponse" name="parameters"/> + </message> + + <message name="emptyRecycleBinRequest"> + <part element="tns:emptyRecycleBin" name="parameters"/> + </message> + <message name="emptyRecycleBinResponse"> + <part element="tns:emptyRecycleBinResponse" name="parameters"/> + </message> + + <message name="retrieveRequest"> + <part element="tns:retrieve" name="parameters"/> + </message> + <message name="retrieveResponse"> + <part element="tns:retrieveResponse" name="parameters"/> + </message> + + <message name="processRequest"> + <part element="tns:process" name="parameters"/> + </message> + <message name="processResponse"> + <part element="tns:processResponse" name="parameters"/> + </message> + + <message name="convertLeadRequest"> + <part element="tns:convertLead" name="parameters"/> + </message> + <message name="convertLeadResponse"> + <part element="tns:convertLeadResponse" name="parameters"/> + </message> + + <message name="logoutRequest"> + <part element="tns:logout" name="parameters"/> + </message> + <message name="logoutResponse"> + <part element="tns:logoutResponse" name="parameters"/> + </message> + + <message name="invalidateSessionsRequest"> + <part element="tns:invalidateSessions" name="parameters"/> + </message> + <message name="invalidateSessionsResponse"> + <part element="tns:invalidateSessionsResponse" name="parameters"/> + </message> + + <message name="getDeletedRequest"> + <part element="tns:getDeleted" name="parameters"/> + </message> + <message name="getDeletedResponse"> + <part element="tns:getDeletedResponse" name="parameters"/> + </message> + + <message name="getUpdatedRequest"> + <part element="tns:getUpdated" name="parameters"/> + </message> + <message name="getUpdatedResponse"> + <part element="tns:getUpdatedResponse" name="parameters"/> + </message> + + <message name="queryRequest"> + <part element="tns:query" name="parameters"/> + </message> + <message name="queryResponse"> + <part element="tns:queryResponse" name="parameters"/> + </message> + + <message name="queryAllRequest"> + <part element="tns:queryAll" name="parameters"/> + </message> + <message name="queryAllResponse"> + <part element="tns:queryAllResponse" name="parameters"/> + </message> + + <message name="queryMoreRequest"> + <part element="tns:queryMore" name="parameters"/> + </message> + <message name="queryMoreResponse"> + <part element="tns:queryMoreResponse" name="parameters"/> + </message> + + <message name="searchRequest"> + <part element="tns:search" name="parameters"/> + </message> + <message name="searchResponse"> + <part element="tns:searchResponse" name="parameters"/> + </message> + + <message name="getServerTimestampRequest"> + <part element="tns:getServerTimestamp" name="parameters"/> + </message> + <message name="getServerTimestampResponse"> + <part element="tns:getServerTimestampResponse" name="parameters"/> + </message> + + <message name="setPasswordRequest"> + <part element="tns:setPassword" name="parameters"/> + </message> + <message name="setPasswordResponse"> + <part element="tns:setPasswordResponse" name="parameters"/> + </message> + + <message name="resetPasswordRequest"> + <part element="tns:resetPassword" name="parameters"/> + </message> + <message name="resetPasswordResponse"> + <part element="tns:resetPasswordResponse" name="parameters"/> + </message> + + <message name="getUserInfoRequest"> + <part element="tns:getUserInfo" name="parameters"/> + </message> + <message name="getUserInfoResponse"> + <part element="tns:getUserInfoResponse" name="parameters"/> + </message> + + <message name="sendEmailRequest"> + <part element="tns:sendEmail" name="parameters"/> + </message> + <message name="sendEmailResponse"> + <part element="tns:sendEmailResponse" name="parameters"/> + </message> + + + + <!-- Soap PortType --> + <portType name="Soap"> + <operation name="login"> + <documentation>Login to the Salesforce.com SOAP Api</documentation> + <input message="tns:loginRequest"/> + <output message="tns:loginResponse"/> + <fault message="tns:LoginFault" name="LoginFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> + </operation> + + <operation name="describeSObject"> + <documentation>Describe an sObject</documentation> + <input message="tns:describeSObjectRequest"/> + <output message="tns:describeSObjectResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="describeSObjects"> + <documentation>Describe a number sObjects</documentation> + <input message="tns:describeSObjectsRequest"/> + <output message="tns:describeSObjectsResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="describeGlobal"> + <documentation>Describe the Global state</documentation> + <input message="tns:describeGlobalRequest"/> + <output message="tns:describeGlobalResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="describeDataCategoryGroups"> + <documentation>Describe all the data category groups available for a given set of types</documentation> + <input message="tns:describeDataCategoryGroupsRequest"/> + <output message="tns:describeDataCategoryGroupsResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="describeDataCategoryGroupStructures"> + <documentation>Describe the data category group structures for a given set of pair of types and data category group name</documentation> + <input message="tns:describeDataCategoryGroupStructuresRequest"/> + <output message="tns:describeDataCategoryGroupStructuresResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="describeLayout"> + <documentation>Describe the layout of an sObject</documentation> + <input message="tns:describeLayoutRequest"/> + <output message="tns:describeLayoutResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> + </operation> + + <operation name="describeSoftphoneLayout"> + <documentation>Describe the layout of the SoftPhone</documentation> + <input message="tns:describeSoftphoneLayoutRequest"/> + <output message="tns:describeSoftphoneLayoutResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="describeTabs"> + <documentation>Describe the tabs that appear on a users page</documentation> + <input message="tns:describeTabsRequest"/> + <output message="tns:describeTabsResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="create"> + <documentation>Create a set of new sObjects</documentation> + <input message="tns:createRequest"/> + <output message="tns:createResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> + <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> + </operation> + + <operation name="update"> + <documentation>Update a set of sObjects</documentation> + <input message="tns:updateRequest"/> + <output message="tns:updateResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> + <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> + </operation> + + <operation name="upsert"> + <documentation>Update or insert a set of sObjects based on object id</documentation> + <input message="tns:upsertRequest"/> + <output message="tns:upsertResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> + <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> + </operation> + + <operation name="merge"> + <documentation>Merge and update a set of sObjects based on object id</documentation> + <input message="tns:mergeRequest"/> + <output message="tns:mergeResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> + <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> + </operation> + + <operation name="delete"> + <documentation>Delete a set of sObjects</documentation> + <input message="tns:deleteRequest"/> + <output message="tns:deleteResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="undelete"> + <documentation>Undelete a set of sObjects</documentation> + <input message="tns:undeleteRequest"/> + <output message="tns:undeleteResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="emptyRecycleBin"> + <documentation>Empty a set of sObjects from the recycle bin</documentation> + <input message="tns:emptyRecycleBinRequest"/> + <output message="tns:emptyRecycleBinResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="retrieve"> + <documentation>Get a set of sObjects</documentation> + <input message="tns:retrieveRequest"/> + <output message="tns:retrieveResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> + <fault message="tns:MalformedQueryFault" name="MalformedQueryFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> + </operation> + + <operation name="process"> + <documentation>Submit an entity to a workflow process or process a workitem</documentation> + <input message="tns:processRequest"/> + <output message="tns:processResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> + </operation> + + <operation name="convertLead"> + <documentation>convert a set of leads</documentation> + <input message="tns:convertLeadRequest"/> + <output message="tns:convertLeadResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="logout"> + <documentation>Logout the current user, invalidating the current session.</documentation> + <input message="tns:logoutRequest"/> + <output message="tns:logoutResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="invalidateSessions"> + <documentation>Logs out and invalidates session ids</documentation> + <input message="tns:invalidateSessionsRequest"/> + <output message="tns:invalidateSessionsResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="getDeleted"> + <documentation>Get the IDs for deleted sObjects</documentation> + <input message="tns:getDeletedRequest"/> + <output message="tns:getDeletedResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="getUpdated"> + <documentation>Get the IDs for updated sObjects</documentation> + <input message="tns:getUpdatedRequest"/> + <output message="tns:getUpdatedResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="query"> + <documentation>Create a Query Cursor</documentation> + <input message="tns:queryRequest"/> + <output message="tns:queryResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> + <fault message="tns:MalformedQueryFault" name="MalformedQueryFault"/> + <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + <fault message="tns:InvalidQueryLocatorFault" name="InvalidQueryLocatorFault"/> + </operation> + + <operation name="queryAll"> + <documentation>Create a Query Cursor, including deleted sObjects</documentation> + <input message="tns:queryAllRequest"/> + <output message="tns:queryAllResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> + <fault message="tns:MalformedQueryFault" name="MalformedQueryFault"/> + <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + <fault message="tns:InvalidQueryLocatorFault" name="InvalidQueryLocatorFault"/> + </operation> + + <operation name="queryMore"> + <documentation>Gets the next batch of sObjects from a query</documentation> + <input message="tns:queryMoreRequest"/> + <output message="tns:queryMoreResponse"/> + <fault message="tns:InvalidQueryLocatorFault" name="InvalidQueryLocatorFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> + </operation> + + <operation name="search"> + <documentation>Search for sObjects</documentation> + <input message="tns:searchRequest"/> + <output message="tns:searchResponse"/> + <fault message="tns:InvalidSObjectFault" name="InvalidSObjectFault"/> + <fault message="tns:InvalidFieldFault" name="InvalidFieldFault"/> + <fault message="tns:MalformedSearchFault" name="MalformedSearchFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="getServerTimestamp"> + <documentation>Gets server timestamp</documentation> + <input message="tns:getServerTimestampRequest"/> + <output message="tns:getServerTimestampResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="setPassword"> + <documentation>Set a user's password</documentation> + <input message="tns:setPasswordRequest"/> + <output message="tns:setPasswordResponse"/> + <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> + <fault message="tns:InvalidNewPasswordFault" name="InvalidNewPasswordFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="resetPassword"> + <documentation>Reset a user's password</documentation> + <input message="tns:resetPasswordRequest"/> + <output message="tns:resetPasswordResponse"/> + <fault message="tns:InvalidIdFault" name="InvalidIdFault"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="getUserInfo"> + <documentation>Returns standard information relevant to the current user</documentation> + <input message="tns:getUserInfoRequest"/> + <output message="tns:getUserInfoResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + <operation name="sendEmail"> + <documentation>Send outbound email</documentation> + <input message="tns:sendEmailRequest"/> + <output message="tns:sendEmailResponse"/> + <fault message="tns:UnexpectedErrorFault" name="UnexpectedErrorFault"/> + </operation> + + </portType> + + <!-- Soap Binding --> + <binding name="SoapBinding" type="tns:Soap"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="login"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="LoginScopeHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="LoginFault"> + <soap:fault name="LoginFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + <fault name="InvalidIdFault"> + <soap:fault name="InvalidIdFault" use="literal"/> + </fault> + </operation> + <operation name="describeSObject"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:header use="literal" message="tns:Header" part="LocaleOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="describeSObjects"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:header use="literal" message="tns:Header" part="LocaleOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="describeGlobal"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="describeDataCategoryGroups"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="describeDataCategoryGroupStructures"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="describeLayout"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + <fault name="InvalidIdFault"> + <soap:fault name="InvalidIdFault" use="literal"/> + </fault> + </operation> + <operation name="describeSoftphoneLayout"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="describeTabs"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="create"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="AssignmentRuleHeader"/> + <soap:header use="literal" message="tns:Header" part="MruHeader"/> + <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> + <soap:header use="literal" message="tns:Header" part="DisableFeedTrackingHeader"/> + <soap:header use="literal" message="tns:Header" part="AllOrNoneHeader"/> + <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:header use="literal" message="tns:Header" part="EmailHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + <fault name="InvalidIdFault"> + <soap:fault name="InvalidIdFault" use="literal"/> + </fault> + <fault name="InvalidFieldFault"> + <soap:fault name="InvalidFieldFault" use="literal"/> + </fault> + </operation> + <operation name="update"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="AssignmentRuleHeader"/> + <soap:header use="literal" message="tns:Header" part="MruHeader"/> + <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> + <soap:header use="literal" message="tns:Header" part="DisableFeedTrackingHeader"/> + <soap:header use="literal" message="tns:Header" part="AllOrNoneHeader"/> + <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:header use="literal" message="tns:Header" part="EmailHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + <fault name="InvalidIdFault"> + <soap:fault name="InvalidIdFault" use="literal"/> + </fault> + <fault name="InvalidFieldFault"> + <soap:fault name="InvalidFieldFault" use="literal"/> + </fault> + </operation> + <operation name="upsert"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="AssignmentRuleHeader"/> + <soap:header use="literal" message="tns:Header" part="MruHeader"/> + <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> + <soap:header use="literal" message="tns:Header" part="DisableFeedTrackingHeader"/> + <soap:header use="literal" message="tns:Header" part="AllOrNoneHeader"/> + <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:header use="literal" message="tns:Header" part="EmailHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + <fault name="InvalidIdFault"> + <soap:fault name="InvalidIdFault" use="literal"/> + </fault> + <fault name="InvalidFieldFault"> + <soap:fault name="InvalidFieldFault" use="literal"/> + </fault> + </operation> + <operation name="merge"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="AssignmentRuleHeader"/> + <soap:header use="literal" message="tns:Header" part="MruHeader"/> + <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> + <soap:header use="literal" message="tns:Header" part="DisableFeedTrackingHeader"/> + <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:header use="literal" message="tns:Header" part="EmailHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + <fault name="InvalidIdFault"> + <soap:fault name="InvalidIdFault" use="literal"/> + </fault> + <fault name="InvalidFieldFault"> + <soap:fault name="InvalidFieldFault" use="literal"/> + </fault> + </operation> + <operation name="delete"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:header use="literal" message="tns:Header" part="UserTerritoryDeleteHeader"/> + <soap:header use="literal" message="tns:Header" part="EmailHeader"/> + <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> + <soap:header use="literal" message="tns:Header" part="DisableFeedTrackingHeader"/> + <soap:header use="literal" message="tns:Header" part="AllOrNoneHeader"/> + <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="undelete"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> + <soap:header use="literal" message="tns:Header" part="DisableFeedTrackingHeader"/> + <soap:header use="literal" message="tns:Header" part="AllOrNoneHeader"/> + <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="emptyRecycleBin"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="retrieve"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="QueryOptions"/> + <soap:header use="literal" message="tns:Header" part="MruHeader"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="InvalidFieldFault"> + <soap:fault name="InvalidFieldFault" use="literal"/> + </fault> + <fault name="MalformedQueryFault"> + <soap:fault name="MalformedQueryFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + <fault name="InvalidIdFault"> + <soap:fault name="InvalidIdFault" use="literal"/> + </fault> + </operation> + <operation name="process"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> + <soap:header use="literal" message="tns:Header" part="DisableFeedTrackingHeader"/> + <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + <fault name="InvalidIdFault"> + <soap:fault name="InvalidIdFault" use="literal"/> + </fault> + </operation> + <operation name="convertLead"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="AllowFieldTruncationHeader"/> + <soap:header use="literal" message="tns:Header" part="DisableFeedTrackingHeader"/> + <soap:header use="literal" message="tns:Header" part="DebuggingHeader"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:header use="literal" message="tns:Header" part="DebuggingInfo"/> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="logout"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="invalidateSessions"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="getDeleted"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="getUpdated"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="query"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="QueryOptions"/> + <soap:header use="literal" message="tns:Header" part="MruHeader"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="InvalidFieldFault"> + <soap:fault name="InvalidFieldFault" use="literal"/> + </fault> + <fault name="MalformedQueryFault"> + <soap:fault name="MalformedQueryFault" use="literal"/> + </fault> + <fault name="InvalidIdFault"> + <soap:fault name="InvalidIdFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + <fault name="InvalidQueryLocatorFault"> + <soap:fault name="InvalidQueryLocatorFault" use="literal"/> + </fault> + </operation> + <operation name="queryAll"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="QueryOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="InvalidFieldFault"> + <soap:fault name="InvalidFieldFault" use="literal"/> + </fault> + <fault name="MalformedQueryFault"> + <soap:fault name="MalformedQueryFault" use="literal"/> + </fault> + <fault name="InvalidIdFault"> + <soap:fault name="InvalidIdFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + <fault name="InvalidQueryLocatorFault"> + <soap:fault name="InvalidQueryLocatorFault" use="literal"/> + </fault> + </operation> + <operation name="queryMore"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="QueryOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidQueryLocatorFault"> + <soap:fault name="InvalidQueryLocatorFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + <fault name="InvalidFieldFault"> + <soap:fault name="InvalidFieldFault" use="literal"/> + </fault> + </operation> + <operation name="search"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="PackageVersionHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidSObjectFault"> + <soap:fault name="InvalidSObjectFault" use="literal"/> + </fault> + <fault name="InvalidFieldFault"> + <soap:fault name="InvalidFieldFault" use="literal"/> + </fault> + <fault name="MalformedSearchFault"> + <soap:fault name="MalformedSearchFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="getServerTimestamp"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="setPassword"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidIdFault"> + <soap:fault name="InvalidIdFault" use="literal"/> + </fault> + <fault name="InvalidNewPasswordFault"> + <soap:fault name="InvalidNewPasswordFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="resetPassword"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:header use="literal" message="tns:Header" part="EmailHeader"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="InvalidIdFault"> + <soap:fault name="InvalidIdFault" use="literal"/> + </fault> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="getUserInfo"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + <operation name="sendEmail"> + <soap:operation soapAction=""/> + <input> + <soap:header use="literal" message="tns:Header" part="SessionHeader"/> + <soap:header use="literal" message="tns:Header" part="CallOptions"/> + <soap:body parts="parameters" use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + <fault name="UnexpectedErrorFault"> + <soap:fault name="UnexpectedErrorFault" use="literal"/> + </fault> + </operation> + + </binding> + + <!-- Soap Service Endpoint --> + <service name="SforceService"> + <documentation>Sforce SOAP API</documentation> + <port binding="tns:SoapBinding" name="Soap"> + <soap:address location="https://login.salesforce.com/services/Soap/u/22.0"/> + </port> + </service> +</definitions> + Modified: branches/as7/connectors/sandbox/pom.xml =================================================================== --- branches/as7/connectors/sandbox/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/sandbox/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid.connectors</groupId> Modified: branches/as7/connectors/sandbox/translator-yahoo/pom.xml =================================================================== --- branches/as7/connectors/sandbox/translator-yahoo/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/sandbox/translator-yahoo/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>sandbox</artifactId> <groupId>org.jboss.teiid.connectors</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-yahoo</artifactId> Modified: branches/as7/connectors/translator-file/pom.xml =================================================================== --- branches/as7/connectors/translator-file/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-file/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-file</artifactId> Modified: branches/as7/connectors/translator-jdbc/pom.xml =================================================================== --- branches/as7/connectors/translator-jdbc/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-jdbc/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-jdbc</artifactId> Modified: branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java =================================================================== --- branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -24,13 +24,11 @@ */ package org.teiid.translator.jdbc; -import java.util.HashMap; import java.util.List; -import java.util.Map; +import org.teiid.core.types.DataTypeManager; import org.teiid.language.Function; import org.teiid.language.LanguageObject; -import org.teiid.translator.TypeFacility; /** @@ -43,52 +41,28 @@ /* * Public sharing part for the mapping between class and type in format of Map<class->Integer>. */ - public static final int STRING = 0; - public static final int CHAR = 1; - public static final int BOOLEAN = 2; - public static final int BYTE = 3; - public static final int SHORT = 4; - public static final int INTEGER = 5; - public static final int LONG = 6; - public static final int BIGINTEGER = 7; - public static final int FLOAT = 8; - public static final int DOUBLE = 9; - public static final int BIGDECIMAL = 10; - public static final int DATE = 11; - public static final int TIME = 12; - public static final int TIMESTAMP = 13; - public static final int OBJECT = 14; - public static final int BLOB = 15; - public static final int CLOB = 16; - public static final int XML = 17; - public static final int NULL = 18; + public static final int STRING = DataTypeManager.DefaultTypeCodes.STRING; + public static final int CHAR = DataTypeManager.DefaultTypeCodes.CHAR; + public static final int BOOLEAN = DataTypeManager.DefaultTypeCodes.BOOLEAN; + public static final int BYTE = DataTypeManager.DefaultTypeCodes.BYTE; + public static final int SHORT = DataTypeManager.DefaultTypeCodes.SHORT; + public static final int INTEGER = DataTypeManager.DefaultTypeCodes.INTEGER; + public static final int LONG = DataTypeManager.DefaultTypeCodes.LONG; + public static final int BIGINTEGER = DataTypeManager.DefaultTypeCodes.BIGINTEGER; + public static final int FLOAT = DataTypeManager.DefaultTypeCodes.FLOAT; + public static final int DOUBLE = DataTypeManager.DefaultTypeCodes.DOUBLE; + public static final int BIGDECIMAL = DataTypeManager.DefaultTypeCodes.BIGDECIMAL; + public static final int DATE = DataTypeManager.DefaultTypeCodes.DATE; + public static final int TIME = DataTypeManager.DefaultTypeCodes.TIME; + public static final int TIMESTAMP = DataTypeManager.DefaultTypeCodes.TIMESTAMP; + public static final int OBJECT = DataTypeManager.DefaultTypeCodes.OBJECT; + public static final int BLOB = DataTypeManager.DefaultTypeCodes.BLOB; + public static final int CLOB = DataTypeManager.DefaultTypeCodes.CLOB; + public static final int XML = DataTypeManager.DefaultTypeCodes.XML; + public static final int NULL = DataTypeManager.DefaultTypeCodes.NULL; - private static final Map<Class<?>, Integer> typeMap = new HashMap<Class<?>, Integer>(); - - static { - typeMap.put(TypeFacility.RUNTIME_TYPES.STRING, STRING); - typeMap.put(TypeFacility.RUNTIME_TYPES.CHAR, CHAR); - typeMap.put(TypeFacility.RUNTIME_TYPES.BOOLEAN, BOOLEAN); - typeMap.put(TypeFacility.RUNTIME_TYPES.BYTE, BYTE); - typeMap.put(TypeFacility.RUNTIME_TYPES.SHORT, SHORT); - typeMap.put(TypeFacility.RUNTIME_TYPES.INTEGER, INTEGER); - typeMap.put(TypeFacility.RUNTIME_TYPES.LONG, LONG); - typeMap.put(TypeFacility.RUNTIME_TYPES.BIG_INTEGER, BIGINTEGER); - typeMap.put(TypeFacility.RUNTIME_TYPES.FLOAT, FLOAT); - typeMap.put(TypeFacility.RUNTIME_TYPES.DOUBLE, DOUBLE); - typeMap.put(TypeFacility.RUNTIME_TYPES.BIG_DECIMAL, BIGDECIMAL); - typeMap.put(TypeFacility.RUNTIME_TYPES.DATE, DATE); - typeMap.put(TypeFacility.RUNTIME_TYPES.TIME, TIME); - typeMap.put(TypeFacility.RUNTIME_TYPES.TIMESTAMP, TIMESTAMP); - typeMap.put(TypeFacility.RUNTIME_TYPES.OBJECT, OBJECT); - typeMap.put(TypeFacility.RUNTIME_TYPES.BLOB, BLOB); - typeMap.put(TypeFacility.RUNTIME_TYPES.CLOB, CLOB); - typeMap.put(TypeFacility.RUNTIME_TYPES.XML, XML); - typeMap.put(TypeFacility.RUNTIME_TYPES.NULL, NULL); - } - public static int getCode(Class<?> source) { - return typeMap.get(source).intValue(); + return DataTypeManager.getTypeCode(source); } /** Property changes on: branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/FunctionModifier.java:3535-3555 Modified: branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCProcedureExecution.java =================================================================== --- branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCProcedureExecution.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCProcedureExecution.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -31,10 +31,10 @@ import org.teiid.language.Argument; import org.teiid.language.Call; import org.teiid.language.Command; -import org.teiid.translator.TranslatorException; import org.teiid.translator.DataNotAvailableException; import org.teiid.translator.ExecutionContext; import org.teiid.translator.ProcedureExecution; +import org.teiid.translator.TranslatorException; /** */ @@ -87,7 +87,10 @@ List<Object> result = new ArrayList<Object>(); int paramIndex = 1; if (proc.getReturnType() != null) { - addParameterValue(result, paramIndex++, proc.getReturnType()); + if (proc.getReturnParameter() != null) { + addParameterValue(result, paramIndex, proc.getReturnType()); + } + paramIndex++; } for (Argument parameter : proc.getArguments()) { switch (parameter.getDirection()) { Modified: branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java =================================================================== --- branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/SQLConversionVisitor.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -24,15 +24,20 @@ */ package org.teiid.translator.jdbc; +import static org.teiid.language.SQLConstants.Reserved.*; + import java.sql.Time; import java.sql.Timestamp; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collections; import java.util.IdentityHashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.teiid.language.Argument; import org.teiid.language.Call; @@ -45,6 +50,7 @@ import org.teiid.language.LanguageObject; import org.teiid.language.Like; import org.teiid.language.Literal; +import org.teiid.language.NamedTable; import org.teiid.language.SearchedCase; import org.teiid.language.SetClause; import org.teiid.language.Argument.Direction; @@ -52,6 +58,7 @@ import org.teiid.language.SQLConstants.Tokens; import org.teiid.language.SetQuery.Operation; import org.teiid.language.visitor.SQLStringVisitor; +import org.teiid.metadata.Procedure; import org.teiid.translator.ExecutionContext; import org.teiid.translator.TypeFacility; @@ -61,6 +68,9 @@ * to produce a SQL String. This class is expected to be subclassed. */ public class SQLConversionVisitor extends SQLStringVisitor{ + + public static final String TEIID_NATIVE_QUERY = "teiid:native-query"; //$NON-NLS-1$ + public static final String TEIID_NON_PREPARED = "teiid:non-prepared"; //$NON-NLS-1$ private static DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#############################0.0#############################"); //$NON-NLS-1$ @@ -181,14 +191,71 @@ * @see org.teiid.language.visitor.SQLStringVisitor#visit(org.teiid.language.Call) */ public void visit(Call obj) { - this.prepared = true; - /* + Procedure p = obj.getMetadataObject(); + if (p != null) { + String nativeQuery = p.getProperties().get(TEIID_NATIVE_QUERY); + if (nativeQuery != null) { + List<Object> parts = parseNativeQueryParts(nativeQuery); + this.prepared = !Boolean.valueOf(p.getProperties().get(TEIID_NON_PREPARED)); + if (this.prepared) { + this.preparedValues = new ArrayList<Object>(); + } + for (Object o : parts) { + if (o instanceof String) { + buffer.append(o); + } else { + Integer i = (Integer)o; + if (obj.getArguments().size() <= i) { + throw new IllegalArgumentException("Invalid parameter {0}. Must be less than or equal to {1}."); + } + if (obj.getArguments().get(i).getDirection() != Direction.IN) { + throw new IllegalArgumentException("Native query procedures cannot use non IN parameters."); + } + visit(obj.getArguments().get(i)); + if (this.prepared) { + this.preparedValues.add(obj.getArguments()); + } + } + } + return; + } + } + this.prepared = true; + /* * preparedValues is now a list of procedure params instead of just values */ this.preparedValues = obj.getArguments(); buffer.append(generateSqlForStoredProcedure(obj)); } + private List<Object> parseNativeQueryParts(String nativeQuery) { + Pattern pattern = Pattern.compile("\\$(\\$\\$)*\\d+"); //$NON-NLS-1$ + List<Object> parts = new LinkedList<Object>(); + Matcher m = pattern.matcher(nativeQuery); + for (int i = 0; i < nativeQuery.length(); i++) { + if (!m.find(i)) { + parts.add(nativeQuery.substring(i).replaceAll("\\$\\$", "\\$")); //$NON-NLS-1$ //$NON-NLS-2$ + break; + } + if (m.start() != i) { + parts.add(nativeQuery.substring(i, m.start()).replaceAll("\\$\\$", "\\$")); //$NON-NLS-1$ //$NON-NLS-2$ + } + String match = m.group(); + int end = match.lastIndexOf('$'); + if ((end&0x1) == 1) { + //escaped + parts.add(match.replaceAll("\\$\\$", "\\$")); //$NON-NLS-1$ //$NON-NLS-2$ + } else { + if (end != 0) { + parts.add(match.substring(0, end/2)); + } + parts.add(Integer.parseInt(match.substring(end + 1))-1); + } + i = m.end(); + } + return parts; + } + /** * @see org.teiid.language.visitor.SQLStringVisitor#visit(org.teiid.language.Literal) */ @@ -355,4 +422,22 @@ return executionFactory.getLikeRegexString(); } + @Override + protected void appendBaseName(NamedTable obj) { + if (obj.getMetadataObject() != null) { + String nativeQuery = obj.getMetadataObject().getProperties().get(TEIID_NATIVE_QUERY); + if (nativeQuery != null) { + buffer.append(Tokens.LPAREN).append(nativeQuery).append(Tokens.RPAREN); + if (obj.getCorrelationName() == null) { + buffer.append(Tokens.SPACE); + if (useAsInGroupAlias()){ + buffer.append(AS).append(Tokens.SPACE); + } + } + } + } + super.appendBaseName(obj); + } + + } Modified: branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java =================================================================== --- branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -57,13 +57,14 @@ convert.addTypeMapping("decimal(38,19)", FunctionModifier.BIGDECIMAL); //$NON-NLS-1$ convert.addTypeMapping("decimal(15,0)", FunctionModifier.BIGINTEGER); //$NON-NLS-1$ convert.addTypeMapping("date", FunctionModifier.DATE); //$NON-NLS-1$ - convert.addTypeMapping("time with time zone", FunctionModifier.TIME); //$NON-NLS-1$ - convert.addTypeMapping("timestamp with time zone", FunctionModifier.TIMESTAMP); //$NON-NLS-1$ + convert.addTypeMapping("time", FunctionModifier.TIME); //$NON-NLS-1$ + convert.addTypeMapping("timestamp", FunctionModifier.TIMESTAMP); //$NON-NLS-1$ convert.addTypeMapping("char(1)", FunctionModifier.CHAR); //$NON-NLS-1$ convert.addTypeMapping("varchar(4000)", FunctionModifier.STRING); //$NON-NLS-1$ convert.addTypeMapping("blob", FunctionModifier.BLOB); //$NON-NLS-1$ convert.addTypeMapping("clob", FunctionModifier.CLOB); //$NON-NLS-1$ convert.addNumericBooleanConversions(); + convert.setWideningNumericImplicit(true); registerFunctionModifier(SourceSystemFunctions.CONVERT, convert); registerFunctionModifier(SourceSystemFunctions.BITAND, new AliasModifier("bit_and")); //$NON-NLS-1$ @@ -76,7 +77,7 @@ registerFunctionModifier(SourceSystemFunctions.RAND, new AliasModifier("random")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.UCASE, new AliasModifier("uppercase")); //$NON-NLS-1$ registerFunctionModifier(SourceSystemFunctions.DAYOFMONTH, new AliasModifier("day")); //$NON-NLS-1$ - registerFunctionModifier(SourceSystemFunctions.LOCATE, new LocateFunctionModifier(getLanguageFactory())); + registerFunctionModifier(SourceSystemFunctions.LOCATE, new LocateFunctionModifier()); addPushDownFunction(INGRES, "bit_add", INTEGER, INTEGER, INTEGER); //$NON-NLS-1$ addPushDownFunction(INGRES, "bit_length", INTEGER, INTEGER); //$NON-NLS-1$ Modified: branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/LocateFunctionModifier.java =================================================================== --- branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/LocateFunctionModifier.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/LocateFunctionModifier.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -21,28 +21,24 @@ */ package org.teiid.translator.jdbc.ingres; -import java.util.Arrays; import java.util.List; import org.teiid.language.Expression; import org.teiid.language.Function; -import org.teiid.language.LanguageFactory; -import org.teiid.translator.TypeFacility; import org.teiid.translator.jdbc.FunctionModifier; public class LocateFunctionModifier extends FunctionModifier { - private LanguageFactory languageFactory; - - public LocateFunctionModifier(LanguageFactory languageFactory) { - this.languageFactory = languageFactory; + public LocateFunctionModifier() { } + @Override public List<?> translate(Function function) { Expression a = function.getParameters().get(0); Expression b = function.getParameters().get(1); - - return Arrays.asList(languageFactory.createFunction("locate", new Expression[] {b, a}, TypeFacility.RUNTIME_TYPES.INTEGER)); //$NON-NLS-1$ + function.getParameters().set(0, b); + function.getParameters().set(1, a); + return null; } } Modified: branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java =================================================================== --- branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -26,7 +26,9 @@ import static org.teiid.translator.TypeFacility.RUNTIME_NAMES.*; +import java.sql.CallableStatement; import java.sql.PreparedStatement; +import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; import java.sql.Types; @@ -35,6 +37,7 @@ import java.util.Collection; import java.util.List; +import org.teiid.language.Call; import org.teiid.language.ColumnReference; import org.teiid.language.Command; import org.teiid.language.DerivedColumn; @@ -42,6 +45,7 @@ import org.teiid.language.ExpressionValueSource; import org.teiid.language.Function; import org.teiid.language.Insert; +import org.teiid.language.LanguageObject; import org.teiid.language.Limit; import org.teiid.language.Literal; import org.teiid.language.NamedTable; @@ -55,6 +59,7 @@ import org.teiid.translator.SourceSystemFunctions; import org.teiid.translator.Translator; import org.teiid.translator.TranslatorException; +import org.teiid.translator.TranslatorProperty; import org.teiid.translator.TypeFacility; import org.teiid.translator.jdbc.AliasModifier; import org.teiid.translator.jdbc.ConvertModifier; @@ -62,6 +67,7 @@ import org.teiid.translator.jdbc.FunctionModifier; import org.teiid.translator.jdbc.JDBCExecutionFactory; import org.teiid.translator.jdbc.LocateFunctionModifier; +import org.teiid.translator.jdbc.TranslatedCommand; @Translator(name="oracle", description="A translator for Oracle 9i Database or later") @@ -85,6 +91,14 @@ public static final String WITHIN_DISTANCE = "sdo_within_distance"; //$NON-NLS-1$ public static final String NEAREST_NEIGHBOR_DISTANCE = "sdo_nn_distance"; //$NON-NLS-1$ public static final String ORACLE_SDO = "Oracle-SDO"; //$NON-NLS-1$ + + /* + * Handling for cursor return values + */ + static final class RefCursorType {} + static int CURSOR_TYPE = -10; + + private boolean oracleSuppliedDriver = true; public void start() throws TranslatorException { super.start(); @@ -548,4 +562,46 @@ return "REGEXP_LIKE"; //$NON-NLS-1$ } + public void setOracleSuppliedDriver(boolean oracleNative) { + this.oracleSuppliedDriver = oracleNative; + } + + @TranslatorProperty(display="Oracle Native Driver", description="True if the driver is an Oracle supplied driver",advanced=true) + public boolean isOracleSuppliedDriver() { + return oracleSuppliedDriver; + } + + @Override + public List<?> translate(LanguageObject obj, ExecutionContext context) { + if (oracleSuppliedDriver && obj instanceof Call) { + Call call = (Call)obj; + //oracle returns the resultset as a parameter + if (call.getReturnType() == null) { + call.setReturnType(RefCursorType.class); + } + } + return super.translate(obj, context); + } + + @Override + protected void registerSpecificTypeOfOutParameter( + CallableStatement statement, Class<?> runtimeType, int index) + throws SQLException { + if (oracleSuppliedDriver && index == 1 && runtimeType == RefCursorType.class) { + statement.registerOutParameter(1, CURSOR_TYPE); + } else { + super.registerSpecificTypeOfOutParameter(statement, runtimeType, index); + } + } + + @Override + public ResultSet executeStoredProcedure(CallableStatement statement, + TranslatedCommand command, Class<?> returnType) throws SQLException { + ResultSet rs = super.executeStoredProcedure(statement, command, returnType); + if (!oracleSuppliedDriver || returnType != RefCursorType.class) { + return rs; + } + return (ResultSet)statement.getObject(1); + } + } Property changes on: branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3535-3555* /trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres:3507-3597 Modified: branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java =================================================================== --- branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -68,7 +68,7 @@ } @Test public void testBooleanToBigDecimal() throws Exception { - helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), "bigdecimal", "cast(1 AS decimal(38,19))"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTest(LANG_FACTORY.createLiteral(Boolean.TRUE, Boolean.class), "bigdecimal", "1"); //$NON-NLS-1$ //$NON-NLS-2$ } // Source = BYTE @@ -82,7 +82,7 @@ } @Test public void testBigIntegerToDouble() throws Exception { - helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigInteger.class), "double", "cast(1 AS float)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + helpTest(LANG_FACTORY.createLiteral(new BigInteger("1"), BigInteger.class), "double", "1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } // Source = FLOAT @@ -106,7 +106,7 @@ // Source = DATE @Test public void testDateToTimestamp() throws Exception { - helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, 10, 1), java.sql.Date.class), "timestamp", "cast(DATE '2003-11-01' AS timestamp with time zone)"); //$NON-NLS-1$ //$NON-NLS-2$ + helpTest(LANG_FACTORY.createLiteral(TimestampUtil.createDate(103, 10, 1), java.sql.Date.class), "timestamp", "cast(DATE '2003-11-01' AS timestamp)"); //$NON-NLS-1$ //$NON-NLS-2$ } // Source = TIME Property changes on: branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3535-3555 /trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresConvertModifier.java:3507-3597 Copied: branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java (from rev 3597, trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java) =================================================================== --- branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java (rev 0) +++ branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,47 @@ +/* + * 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.translator.jdbc.ingres; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.teiid.translator.TranslatorException; +import org.teiid.translator.jdbc.TranslationHelper; + +public class TestIngresExecutionFactory { + + private static IngresExecutionFactory TRANSLATOR; + + @BeforeClass + public static void setUp() throws TranslatorException { + TRANSLATOR = new IngresExecutionFactory(); + TRANSLATOR.start(); + } + + @Test public void testLocate() throws Exception { + String input = "SELECT INTKEY FROM BQT1.SmallA WHERE LOCATE(1, INTKEY) = 1 ORDER BY INTKEY"; //$NON-NLS-1$ + String output = "SELECT SmallA.IntKey FROM SmallA WHERE locate(cast(SmallA.IntKey AS varchar(4000)), '1') = 1 ORDER BY SmallA.IntKey"; //$NON-NLS-1$ + + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, input, output, TRANSLATOR); + } + +} Property changes on: branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:mergeinfo + /branches/7.4.x/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3535-3555 /trunk/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/ingres/TestIngresExecutionFactory.java:3507-3597 Modified: branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java =================================================================== --- branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/oracle/TestOracleTranslator.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -24,10 +24,15 @@ import static org.junit.Assert.*; +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.ResultSet; +import java.util.Arrays; import java.util.List; import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; import org.teiid.cdk.CommandBuilder; import org.teiid.cdk.api.TranslationUtility; import org.teiid.core.types.DataTypeManager; @@ -36,19 +41,25 @@ import org.teiid.dqp.internal.datamgr.FakeExecutionContextImpl; import org.teiid.language.Command; import org.teiid.metadata.Column; +import org.teiid.metadata.ColumnSet; import org.teiid.metadata.MetadataStore; +import org.teiid.metadata.Procedure; +import org.teiid.metadata.ProcedureParameter; import org.teiid.metadata.Schema; import org.teiid.metadata.Table; import org.teiid.query.metadata.CompositeMetadataStore; import org.teiid.query.metadata.QueryMetadataInterface; import org.teiid.query.metadata.TransformationMetadata; +import org.teiid.query.sql.lang.SPParameter; import org.teiid.query.unittest.RealMetadataFactory; import org.teiid.translator.ExecutionContext; import org.teiid.translator.TranslatorException; +import org.teiid.translator.jdbc.JDBCProcedureExecution; +import org.teiid.translator.jdbc.SQLConversionVisitor; import org.teiid.translator.jdbc.TranslatedCommand; import org.teiid.translator.jdbc.TranslationHelper; - +@SuppressWarnings("nls") public class TestOracleTranslator { private OracleExecutionFactory TRANSLATOR; @@ -710,6 +721,8 @@ MetadataStore metadataStore = new MetadataStore(); Schema foo = RealMetadataFactory.createPhysicalModel("BQT1", metadataStore); //$NON-NLS-1$ Table table = RealMetadataFactory.createPhysicalGroup("SmallA", foo); //$NON-NLS-1$ + Table x = RealMetadataFactory.createPhysicalGroup("x", foo); //$NON-NLS-1$ + x.setProperty(SQLConversionVisitor.TEIID_NATIVE_QUERY, "select c from d"); Table dual = RealMetadataFactory.createPhysicalGroup("DUAL", foo); //$NON-NLS-1$ table.setNameInSource("SmallishA");//$NON-NLS-1$ String[] elemNames = new String[] { @@ -722,12 +735,19 @@ DataTypeManager.DefaultDataTypes.INTEGER, DataTypeManager.DefaultDataTypes.TIMESTAMP, }; + RealMetadataFactory.createElements(x, elemNames, elemTypes); List<Column> cols = RealMetadataFactory.createElements(table, elemNames, elemTypes); cols.get(1).setAutoIncremented(true); cols.get(1).setNameInSource("ID:SEQUENCE=MYSEQUENCE.nextVal"); //$NON-NLS-1$ cols.get(2).setNativeType("date"); //$NON-NLS-1$ RealMetadataFactory.createElements(dual, new String[] {"something"}, new String[] {DataTypeManager.DefaultDataTypes.STRING}); //$NON-NLS-1$ + ProcedureParameter in1 = RealMetadataFactory.createParameter("in1", SPParameter.IN, DataTypeManager.DefaultDataTypes.INTEGER); //$NON-NLS-1$ + ColumnSet<Procedure> rs3 = RealMetadataFactory.createResultSet("proc.rs1", new String[] { "e1" }, new String[] { DataTypeManager.DefaultDataTypes.INTEGER }); //$NON-NLS-1$ //$NON-NLS-2$ + Procedure p = RealMetadataFactory.createStoredProcedure("proc", foo, Arrays.asList(in1)); + p.setResultSet(rs3); + p.setProperty(SQLConversionVisitor.TEIID_NATIVE_QUERY, "select x from y where z = $1"); + CompositeMetadataStore store = new CompositeMetadataStore(metadataStore); return new TransformationMetadata(null, store, null, RealMetadataFactory.SFM.getSystemFunctions(), null); } @@ -789,5 +809,50 @@ input, output, TRANSLATOR); } + + @Test public void testCallWithResultSet() throws Exception { + String input = "call spTest5(1)"; //$NON-NLS-1$ + String output = "{ ?= call spTest5(?)}"; //$NON-NLS-1$ + TranslationHelper.helpTestVisitor(TranslationHelper.BQT_VDB, + input, output, + TRANSLATOR); + } + + @Test public void testProcedureExecution() throws Exception { + Command command = TranslationHelper.helpTranslate(TranslationHelper.BQT_VDB, "call spTest8(1)"); //$NON-NLS-1$ + Connection connection = Mockito.mock(Connection.class); + CallableStatement cs = Mockito.mock(CallableStatement.class); + Mockito.stub(cs.getUpdateCount()).toReturn(-1); + ResultSet rs = Mockito.mock(ResultSet.class); + Mockito.stub(cs.getObject(1)).toReturn(rs); + Mockito.stub(cs.getInt(3)).toReturn(4); + Mockito.stub(connection.prepareCall("{ ?= call spTest8(?,?)}")).toReturn(cs); //$NON-NLS-1$ + OracleExecutionFactory ef = new OracleExecutionFactory(); + + JDBCProcedureExecution procedureExecution = new JDBCProcedureExecution(command, connection, Mockito.mock(ExecutionContext.class), ef); + procedureExecution.execute(); + assertEquals(Arrays.asList(4), procedureExecution.getOutputParameterValues()); + Mockito.verify(cs, Mockito.times(1)).registerOutParameter(1, OracleExecutionFactory.CURSOR_TYPE); + Mockito.verify(cs, Mockito.times(1)).getObject(1); + } + + @Test public void testNativeQuery() throws Exception { + String input = "SELECT (DoubleNum * 1.0) FROM x"; //$NON-NLS-1$ + String output = "SELECT (x.DoubleNum * 1.0) FROM (select c from d) x"; //$NON-NLS-1$ + + QueryMetadataInterface metadata = getOracleSpecificMetadata(); + + helpTestVisitor(metadata, input, EMPTY_CONTEXT, null, output); + } + + @Test public void testNativeQueryProc() throws Exception { + String input = "call proc(2)"; //$NON-NLS-1$ + String output = "select x from y where z = 2"; //$NON-NLS-1$ + + QueryMetadataInterface metadata = getOracleSpecificMetadata(); + + helpTestVisitor(metadata, input, EMPTY_CONTEXT, null, output); + } + } Modified: branches/as7/connectors/translator-ldap/pom.xml =================================================================== --- branches/as7/connectors/translator-ldap/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-ldap/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -2,7 +2,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ldap</artifactId> Property changes on: branches/as7/connectors/translator-ldap/src/main/java/org/teiid/translator ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator:3535-3555* /trunk/connectors/translator-ldap/src/main/java/org/teiid/translator:3507-3597 Property changes on: branches/as7/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.4.x/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3535-3555 /trunk/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap:3507-3597 Modified: branches/as7/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPExecutionFactory.java =================================================================== --- branches/as7/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPExecutionFactory.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPExecutionFactory.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -54,6 +54,7 @@ private boolean restrictToObjectClass; private SearchDefaultScope searchDefaultScope = SearchDefaultScope.ONELEVEL_SCOPE; private boolean usePagination; + private boolean exceptionOnSizeLimitExceeded; public LDAPExecutionFactory() { this.setMaxInCriteriaSize(1000); @@ -154,4 +155,14 @@ this.usePagination = usePagination; } + @TranslatorProperty(display="Exception on Size Limit Exceeded", description="Set to true to throw an exception when a SizeLimitExceededException is received and a LIMIT is not properly enforced.") + public boolean isExceptionOnSizeLimitExceeded() { + return exceptionOnSizeLimitExceeded; + } + + public void setExceptionOnSizeLimitExceeded( + boolean exceptionOnSizeLimitExceeded) { + this.exceptionOnSizeLimitExceeded = exceptionOnSizeLimitExceeded; + } + } Modified: branches/as7/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSyncQueryExecution.java =================================================================== --- branches/as7/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSyncQueryExecution.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-ldap/src/main/java/org/teiid/translator/ldap/LDAPSyncQueryExecution.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -124,6 +124,7 @@ private LDAPExecutionFactory executionFactory; private ExecutionContext executionContext; private SearchControls ctrls; + private int resultCount; /** * Constructor @@ -323,16 +324,21 @@ return next(); } + if (result != null) { + resultCount++; + } return result; } catch (SizeLimitExceededException e) { - LogManager.logWarning(LogConstants.CTX_CONNECTOR, "Search results exceeded size limit. Results may be incomplete."); //$NON-NLS-1$ - searchEnumeration = null; // GHH 20080326 - NamingEnumartion's are no longer good after an exception so toss it + if (resultCount != searchDetails.getCountLimit()) { + String msg = "LDAP Search results exceeded size limit. Results may be incomplete."; //$NON-NLS-1$ + if (executionFactory.isExceptionOnSizeLimitExceeded()) { + throw new TranslatorException(e, msg); + } + LogManager.logWarning(LogConstants.CTX_CONNECTOR, e, msg); + } return null; // GHH 20080326 - if size limit exceeded don't try to read more results } catch (NamingException ne) { - final String msg = "Ldap error while processing next batch of results: " + ne.getExplanation(); //$NON-NLS-1$ - LogManager.logError(LogConstants.CTX_CONNECTOR, msg); // GHH 20080326 - changed to output explanation from LDAP server - searchEnumeration = null; // GHH 20080326 - NamingEnumertion's are no longer good after an exception so toss it - throw new TranslatorException(msg); + throw new TranslatorException(ne, "Ldap error while processing next batch of results"); //$NON-NLS-1$ } } Modified: branches/as7/connectors/translator-loopback/pom.xml =================================================================== --- branches/as7/connectors/translator-loopback/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-loopback/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-loopback</artifactId> Modified: branches/as7/connectors/translator-olap/pom.xml =================================================================== --- branches/as7/connectors/translator-olap/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-olap/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-olap</artifactId> Modified: branches/as7/connectors/translator-salesforce/pom.xml =================================================================== --- branches/as7/connectors/translator-salesforce/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-salesforce/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-salesforce</artifactId> Modified: branches/as7/connectors/translator-ws/pom.xml =================================================================== --- branches/as7/connectors/translator-ws/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/connectors/translator-ws/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>connectors</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translator-ws</artifactId> Modified: branches/as7/console/pom.xml =================================================================== --- branches/as7/console/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/console/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -3,7 +3,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/as7/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java =================================================================== --- branches/as7/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/console/src/main/java/org/teiid/rhq/admin/DQPManagementView.java 2011-11-02 15:15:47 UTC (rev 3601) @@ -211,8 +211,8 @@ getTransactionCollectionValue(transactionMetaValue,transactionsCollection); operationResult.setContent(createReportResultList(fieldNameList, resultObject.iterator())); } else if (operationName.equals(Platform.Operations.KILL_TRANSACTION)) { - String sessionID = (String) valueMap.get(Operation.Value.TRANSACTION_ID); - MetaValue[] args = new MetaValue[] { SimpleValueSupport.wrap(sessionID) }; + String transactionID = (String) valueMap.get(Operation.Value.TRANSACTION_ID); + MetaValue[] args = new MetaValue[] { SimpleValueSupport.wrap(transactionID) }; try { executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc), Platform.Operations.KILL_TRANSACTION, args); } catch (Exception e) { @@ -232,8 +232,8 @@ Long requestID = (Long) valueMap.get(Operation.Value.REQUEST_ID); String sessionID = (String) valueMap.get(Operation.Value.SESSION_ID); MetaValue[] args = new MetaValue[] { - SimpleValueSupport.wrap(requestID), - SimpleValueSupport.wrap(sessionID) }; + SimpleValueSupport.wrap(sessionID), + SimpleValueSupport.wrap(requestID) }; try { executeManagedOperation(connection, getRuntimeEngineDeployer(connection, mc), Platform.Operations.KILL_REQUEST, args); } catch (Exception e) { @@ -876,7 +876,7 @@ request.setSourceRequest((Boolean) ProfileServiceUtil.booleanValue(compositeValue.get(SOURCE_REQUEST))); request.setNodeId((Integer) ProfileServiceUtil.integerValue(compositeValue.get(NODE_ID))); request.setTransactionId((String) ProfileServiceUtil.stringValue(compositeValue.get(TRANSACTION_ID))); - request.setState((ProcessingState) ProfileServiceUtil.getSimpleValue(compositeValue.get(STATE), ProcessingState.class)); + request.setState((ProcessingState.valueOf(ProfileServiceUtil.getSimpleValue(compositeValue.get(STATE), String.class)))); return request; } throw new IllegalStateException("Unable to unwrap RequestMetadata " + metaValue); //$NON-NLS-1$ Modified: branches/as7/console/src/main/resources/META-INF/rhq-plugin.xml =================================================================== --- branches/as7/console/src/main/resources/META-INF/rhq-plugin.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/console/src/main/resources/META-INF/rhq-plugin.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -73,7 +73,7 @@ <plugin name="TeiidPlugin" displayName="Teiid Plugin" package="org.teiid.rhq.plugin" - version="2.0.0" description="Supports management and monitoring of JBoss Teiid" + version="2.0.1" description="Supports management and monitoring of JBoss Teiid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:xmlns:rhq-plugin" xmlns:c="urn:xmlns:rhq-configuration"> @@ -93,23 +93,18 @@ <results> <c:list-property name="list"> <c:map-property name="map"> + <c:simple-property displayName="Request ID" + name="getExecutionId" type="string" description="The id for the request" /> <c:simple-property displayName="Session ID" name="getSessionId" type="string" - description="The name of the resource whose availability is being reported" /> - <c:simple-property displayName="Request ID" - name="getRequestId" type="string" description="The id for the request" /> + description="The session id the request is using" /> <c:simple-property displayName="SQL String" name="getCommand" type="string" description="The SQL string for this query" /> <c:simple-property displayName="Source Request" name="sourceRequest" type="string" description="If false,this is the top level query. If true, this a physical source query." /> - <c:simple-property displayName="Execution ID" - name="getExecutionId" type="string" - description="The execution id for this request (if this is a physical source query)" /> <c:simple-property displayName="Start Time" - name="getCreatedTime" type="string" description="The time this query began" /> - <c:simple-property displayName="Start Time" - name="getProcessingTime" type="string" description="Processing time for this request" /> + name="getStartTime" type="string" description="The time this query began" /> <c:simple-property displayName="Transaction ID" name="getTransactionId" type="string" description="The transaction XID if there is a transaction involved" /> @@ -187,15 +182,11 @@ required="false"> <c:map-property name="map"> <c:simple-property displayName="Request ID" - name="getRequestId" type="string" description="The request identifier" /> + name="getExecutionId" type="string" description="The request identifier" /> <c:simple-property displayName="Session ID" name="getSessionId" type="string" description="Session identifier" /> - <c:simple-property displayName="Execution ID" - name="getExecutionId" type="string" description="Unique Identifier for Request" /> - <c:simple-property displayName="Created Time" - name="getCreatedTime" type="string" description="Time when request submitted" /> - <c:simple-property displayName="Processing Time" - name="getProcessingTime" type="string" description="Processing time for the request" /> + <c:simple-property displayName="Start Time" + name="getStartTime" type="string" description="Time when request submitted" /> <c:simple-property displayName="Last ping time" name="getCommand" type="string" description="SQL Command" /> <c:simple-property displayName="Connector level request?" @@ -203,7 +194,7 @@ description="True if this is a connector level request" /> <c:simple-property displayName="Node ID" name="getNodeId" type="string" description="The node identifier" /> - <c:simple-property displayName="Tansaction identifier" + <c:simple-property displayName="Transaction identifier" name="getTransactionId" type="string" description="Transaction XID if a transaction is involved" /> </c:map-property> @@ -484,8 +475,8 @@ name="getSessionId" type="string" description="Session identifier" /> <c:simple-property displayName="Execution ID" name="getExecutionId" type="string" description="Unique Identifier for Request" /> - <c:simple-property displayName="Created Time" - name="getCreatedTime" type="string" description="Time when request submitted" /> + <c:simple-property displayName="Start Time" + name="getStartTime" type="string" description="Time when request submitted" /> <c:simple-property displayName="Processing Time" name="getProcessingTime" type="string" description="Processing time for the request" /> <c:simple-property displayName="Last ping time" @@ -495,7 +486,7 @@ description="True if this is a connector level request" /> <c:simple-property displayName="Node ID" name="getNodeId" type="string" description="The node identifier" /> - <c:simple-property displayName="Tansaction identifier" + <c:simple-property displayName="Transaction identifier" name="getTransactionId" type="string" description="Transaction XID if a transaction is involved" /> </c:map-property> Modified: branches/as7/documentation/admin-guide/pom.xml =================================================================== --- branches/as7/documentation/admin-guide/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/admin-guide/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>admin-guide</artifactId> Modified: branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml =================================================================== --- branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/installation.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -98,7 +98,8 @@ /deployers /teiid.deployer /lib - /teiid-examples]]></programlisting> + /teiid-examples + /tmp/teiid]]></programlisting> </example> <section> <title>/deploy/teiid/teiid-jboss-beans.xml</title> @@ -163,6 +164,14 @@ <title>teiid-docs</title> <para>This directory contains the PDF documents related Teiid and Teiid development. </para> </section> + + <section> + <title>tmp/teiid</title> + <para>This directory contains temporary files created by Teiid. These are mostly created by the buffer manager. + These files are not needed across a VM restart. Creation of Teiid lob values (for example through SQL/XML) will typically create one file per lob once it exceeds the allowable + in memory size of 8KB. In heavy usage scenarios, consider pointing the buffer directory at a partition that is routinely defragmented. + </para> + </section> </section> Modified: branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/performance.xml =================================================================== --- branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/performance.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/performance.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -63,6 +63,38 @@ if your installation makes use of internal materialization, makes heavy use of SQL/XML, or processes large row counts. </para> + <section> + <title>Big Data/Memory</title> + <para>Usage of extremely large VM sizes and or datasets requires additional considerations. + Teiid has a non-negligible amount of overhead per batch/table page on the order of 100-200 bytes. Depending on the data types involved each + full batch/table page will represent a variable number of rows (a power of two multiple above or below the processor batch size). If you are dealing with datasets with billions of rows and you run into OutOfMemory issues, consider increasing the processor + batch size in the &jboss-beans; file to force the allocation of larger batches and table pages. If the processor batch size is increased and/or you are dealing with extremely wide result sets (several hundred columns), + then the default setting of 8MB for the maxStorageObjectSize in the &jboss-beans; file may be too low. The sizing for maxStorageObjectSize is terms of serialized size, which will be much + closer to the raw data size then the Java memory footprint estimation used for maxReservedKB. + maxStorageObjectSize should not be set too large relative to memoryBufferSpace since it will reduce the performance of the memory buffer. The memory buffer supports only 1 concurrent writer for each maxStorageObjectSize of the memoryBufferSpace. + </para> + <note><para>Teiid temporary tables (also used for internal materialization) can only support 2^31-1 rows per table.</para></note> + <para> + The memoryBufferSpace setting controls the amount of on or off heap memory allocated as byte buffers for use by the Teiid buffer manager. This setting defaults to -1, which automatically determines a setting based upon whether it is on or off heap and the value for maxReserveKB. + </para> + <para>You can take advantage of the buffer manager memory buffer to access system memory without allocating it to the heap. Setting memoryBufferOffHeap to true in &jboss-beans; will allocate the + Teiid memory buffer off heap. Depending on whether your installation is dedicated to Teiid and the amount of system memory available, this may be perferable to on-heap allocation. The primary + benefit is additional memory usage for Teiid without additional garbage collection tuning. This becomes especially important in situations where more than 32GB of memory is desired for the VM. + Note that when using off-heap allocation, the memory must still be available to the java process and that setting the value of memoryBufferSpace too high may cause the VM to swap rather than reside in memory. + With large off-heap buffer sizes (greater than several gigabytes) you may also need to adjust VM settings. For Sun VMs the relevant VM settings are MaxDirectMemorySize and UseLargePages. For example adding: + <programlisting>-XX:MaxDirectMemorySize=12g -XX:+UseLargePages</programlisting> + to the VM process arguments would allow for an effective allocation of approximately an 11GB Teiid memory buffer (the memoryBufferSpace setting) accounting for any additional direct memory that may be needed + by the AS or applications running in the AS.</para> + </section> + <section> + <title>Disk Usage</title> + <para>For table page and result batches the buffer manager will we a limited number of files that are dedicated to a particular storage size. + However, as mentioned in the installation, creation of Teiid lob values (for example through SQL/XML) will typically create one file per lob once the lob exceeds the allowable + in memory size of 8KB. In heavy usage scenarios, consider pointing the buffer directory on a partition that is routinely defragmented. + By default Teiid will use up to 50GB of disk space. This is tracked in terms of the number of bytes written by Teiid. For large data sets, you may need to increase the + maxBufferSpace setting in the &jboss-beans; file. + </para> + </section> </section> <section> <title>Threading</title> Modified: branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/security.xml =================================================================== --- branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/admin-guide/src/main/docbook/en-US/content/security.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -87,24 +87,80 @@ The default name of JDBC connection's security-domain is "teiid-security". The default name for Admin connection is "jmx-console". For the Admin connection's security domain, the user is allowed to change which LoginModule that "jmx-console" pointing to, however should not change the name of the domain, as this name is - shared between the "admin-console" application.</para> + shared between the "admin-console" application. In existing installations an appropriate security domain may already be configured for use by administrative clients (typically "jmx-console"). + In this case it may be perfectly valid to reuse this existing security domain instead of creating a new teiid-security security domain.</para> </note> <section> <title>Built-in LoginModules</title> - <para>JBossAS provides several LoginModules for common authentication needs, such as authenticating from text files or LDAP.</para> - <para>The UsersRolesLoginModule, which utilizes simple text files - to authenticate users and to define - their groups.  The teiid-jboss-beans.xml configuration file contains an example of how to use UsersRolesLoginModule. - Note that this is typically not for production use and is strongly recommended that you replace this login module. Please - also note that, you can install multiple login modules as part of single security domain configuration and configure them + <para>JBossAS provides several LoginModules for common authentication needs, such as authenticating from a <xref linkend="text-login"/> or a <xref linkend="ldap-login"/>.</para> + <para>You can install multiple login modules as part of single security domain configuration and configure them to part of login process. For example, for "teiid-security" domain, you can configure a file based and also LDAP based login modules, - and have your user authenticated with either both or single login module. + and have your user authenticated with either or both login modules. If you want to write your own custom login module, check out the Developer's Guide for instructions. </para> - <para>See <ulink url="http://community.jboss.org/docs/DOC-11253">LDAP LoginModule configuration</ulink> for utilizing LDAP based authentication. - If you want write your own Custom Login module, check out the Developer's Guide for instructions. - </para> + + <section id="text-login"> + <title>Text Based LoginModule</title> + <para>The UsersRolesLoginModule utilizes simple text files to authenticate users and to define their groups.   +The teiid-jboss-beans.xml configuration file contains an example of how to use UsersRolesLoginModule. +<note><para>The UsersRolesLoginModule is not recommended for production use and is strongly recommended that you replace this login module.</para></note> + </para> + <para>User names and passwords are stored in the &lt;profile&gt;conf/props/teiid-security-users.properties file. +<example><title>Example user.properties file</title> +<programlisting><![CDATA[# A users.properties file for use with the UsersRolesLoginModule +# username=password + +fred=password +george=password +...]]></programlisting></example> + +JAAS role assignments are stored in the &lt;profile&gt;conf/props/teiid-security-roles.properties file. +<example><title>Example user.properties file</title> +<programlisting><![CDATA[# A roles.properties file for use with the UsersRolesLoginModule +# username=role1,role2,... + +data_role_1=fred,sally +data_role_2=george +]]></programlisting></example> + +User and role names are entirely up to the needs of the given deployment. For example each application team can set their own security constraints for their VDBs, by mapping their VDB data roles to application specific JAAS roles, e.g. app_role_1=user1,user2,user3. +<note><para>Teiid data roles names are independent of JAAS roles. VDB creators can choose whatever name they want for their data roles, which are then mapped at deployment time to JAAS roles.</para></note> +</para> </section> + + <section id="ldap-login"> + <title>LDAP Based LoginModule</title> + <para>See <ulink url="http://community.jboss.org/docs/DOC-11253">LDAP LoginModule configuration</ulink> for the AS community guide. The following are streamlined installation instruction. + <orderedlist> + <listitem><para>If using SSL to the LDAP server, ensure that the Corporate CA Certificate is added to the JRE trust store.</para> + </listitem> + + <listitem><para>Include LDAP LoginModule in the JAAS Configuration</para> + <para>Configure LDAP authentication by editing &lt;profile&gt;conf/login-config.xml. If you wish to configure specifically for teiid, then the security domain teiid-security will need to be created/altered. + In new installations the more likely option is that you want to configure LDAP based authentication for the AS itself by modifying the "jmx-console" security domain. + You could do one of the following for Teiid: + <itemizedlist> + <listitem> + <para>Reuse the jmx-console (or whatever name you choose) security domain for Teiid by changing the teiid configuration &jboss-beans; to point to jmx-console, rather than teiid-security. + </para> + </listitem> + <listitem> + <para>Follow the same steps to configure an LDAP security domain named teiid-security. + </para> + </listitem> + <listitem> + <para>Leave Teiid to use the default file based LoginModule secuirty domain or create an entirely custom security domain configuration. + </para> + </listitem> + </itemizedlist> + </para></listitem> + <listitem><para>Obscure the LDAP Password</para><para>Finally, protect the password following <ulink url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Application_... instructions.</ulink> + Note that the salt must be 8 chars andd see also http://community.jboss.org/message/137756#137756 for more on securing passwords. + </para></listitem> + </orderedlist> + </para> + </section> + </section> <section> <title>Kerberos support through GSSAPI</title> @@ -124,53 +180,47 @@ <section> <title>Remote Connections</title> <para>On the server, edit the &jboss-beans; under the "SessionService" bean definition, as follows: - <programlisting><![CDATA[ - <!-- Sets the authentication Type --> - <property name="authenticationType">KRB5</property> - <!-- Security domain used for kerberos authentication --> - <property name="krb5SecurityDomain">teiid-krb5</property> - ]]></programlisting> + <programlisting><![CDATA[<!-- Sets the authentication Type --> +<property name="authenticationType">KRB5</property> +<!-- Security domain used for kerberos authentication --> +<property name="krb5SecurityDomain">teiid-krb5</property>]]></programlisting> Now we need to define a security domain context for kerberos with the name mentioned in above. Since kerberos authorization cannot define authorization roles, we'll define them using another login context. Given below is a sample configuration to define roles using a UserRolesLoginModule. <note><para>This configuration replaces the default Teiid login configuration, and you should change the principal and key tab locations accordingly.</para></note> - <programlisting><![CDATA[ - <!--login module that negotiates the login conext for kerberos --> - <application-policy xmlns="urn:jboss:security-beans:1.0" name="teiid-krb5"> - <authentication> - <login-module code="com.sun.security.auth.module.Krb5LoginModule" flag="required"> - <module-option name="storeKey">true</module-option> - <module-option name="useKeyTab">true</module-option> - <module-option name=&quot;principal&quot;&gt;demo(a)EXAMPLE.COM&lt;/module-option&gt; - <module-option name="keyTab">path/to/krb5.keytab</module-option> - <module-option name="doNotPrompt">true</module-option> - <module-option name="debug">false</module-option> - </login-module> - </authentication> - </application-policy> - - <!-- teiid's default security domain, replace this with your own if needs to be any other JAAS domain --> - <application-policy xmlns="urn:jboss:security-beans:1.0" name="teiid-security"> - <authentication> - <!-- This module assosiates kerberos user with this login set of login modules --> - <login-module code="org.teiid.jboss.AssosiateCallerIdentityLoginModule" flag="required"/> - <!-- Login module used for defining roles for user authencated using kerberos, keep the users file empty - but provide roles in the roles file for users --> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"> - <module-option name="password-stacking">useFirstPass</module-option> - <module-option name="usersProperties">props/teiid-security-users.properties</module-option> - <module-option name="rolesProperties">props/teiid-security-roles.properties</module-option> - </login-module> - </authentication> - </application-policy> - ]]></programlisting> + <programlisting><![CDATA[<!--login module that negotiates the login conext for kerberos --> +<application-policy xmlns="urn:jboss:security-beans:1.0" name="teiid-krb5"> + <authentication> + <login-module code="com.sun.security.auth.module.Krb5LoginModule" flag="required"> + <module-option name="storeKey">true</module-option> + <module-option name="useKeyTab">true</module-option> + <module-option name=&quot;principal&quot;&gt;demo(a)EXAMPLE.COM&lt;/module-option&gt; + <module-option name="keyTab">path/to/krb5.keytab</module-option> + <module-option name="doNotPrompt">true</module-option> + <module-option name="debug">false</module-option> + </login-module> + </authentication> +</application-policy> + +<!-- teiid's default security domain, replace this with your own if needs to be any other JAAS domain --> +<application-policy xmlns="urn:jboss:security-beans:1.0" name="teiid-security"> + <authentication> + <!-- This module assosiates kerberos user with this login set of login modules --> + <login-module code="org.teiid.jboss.AssosiateCallerIdentityLoginModule" flag="required"/> + <!-- Login module used for defining roles for user authencated using kerberos, keep the users file empty + but provide roles in the roles file for users --> + <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"> + <module-option name="password-stacking">useFirstPass</module-option> + <module-option name="usersProperties">props/teiid-security-users.properties</module-option> + <module-option name="rolesProperties">props/teiid-security-roles.properties</module-option> + </login-module> + </authentication> +</application-policy>]]></programlisting> Edit the "run.conf" or "run.conf.bat" file depending upon the environment in the "${jboss-as}/bin" directory and add the following JVM options (changing the realm and KDC settings according to your environment) - <programlisting><![CDATA[ - JAVA_OPTS = "$JAVA_OPTS -Djava.security.krb5.realm=EXAMPLE.COM -Djava.security.krb5.kdc=kerberos.example.com -Djavax.security.auth.useSubjectCredsOnly=false" - ]]></programlisting> + <programlisting><![CDATA[JAVA_OPTS = "$JAVA_OPTS -Djava.security.krb5.realm=EXAMPLE.COM -Djava.security.krb5.kdc=kerberos.example.com -Djavax.security.auth.useSubjectCredsOnly=false"]]></programlisting> This finishes the configuration on the server side, restart the server and make sure that there were no errors during startup. </para> @@ -179,33 +229,27 @@ <para>In you client VM the JAAS configuration for kerberos authentication needs to be written. A sample configuration file (client.conf) is show below - <programlisting><![CDATA[ - Client { - com.sun.security.auth.module.Krb5LoginModule required - useTicketCache=true - storeKey=true - useKeyTab=true - keyTab="/path/to/krb5.keytab" - doNotPrompt=false - debug=false - principal=&quot;demo(a)EXAMPLE.COM&quot;; - }; - ]]></programlisting> + <programlisting><![CDATA[Client { + com.sun.security.auth.module.Krb5LoginModule required + useTicketCache=true + storeKey=true + useKeyTab=true + keyTab="/path/to/krb5.keytab" + doNotPrompt=false + debug=false + principal=&quot;demo(a)EXAMPLE.COM&quot;; +};]]></programlisting> Add the following JVM options to your client's startup script - change Realm and KDC settings according to your environment - <programlisting><![CDATA[ - -Djava.security.krb5.realm=EXAMPLE.COM - -Djava.security.krb5.kdc=kerberos.example.com - -Djavax.security.auth.useSubjectCredsOnly=false - -Dsun.security.krb5.debug=false - -Djava.security.auth.login.config=/path/to/client.conf - ]]></programlisting> + <programlisting><![CDATA[-Djava.security.krb5.realm=EXAMPLE.COM +-Djava.security.krb5.kdc=kerberos.example.com +-Djavax.security.auth.useSubjectCredsOnly=false +-Dsun.security.krb5.debug=false +-Djava.security.auth.login.config=/path/to/client.conf]]></programlisting> Add the following URL connection properties to Teiid JDBC connection string - <programlisting><![CDATA[ - authenticationType=KRB5;jaasName=Client;kerberosServicePrincipleName=demo(a)EXAMPLE.COM - ]]></programlisting> + <programlisting&gt;&lt;![CDATA[authenticationType=KRB5;jaasName=Client;kerberosServicePrincipleName=demo(a)EXAMPLE.COM]]&gt;&lt;/programlisting&gt; There is no need to provide the user name and password, when the application is trying to make JDBC connection it will authenticate locally and use the same user credetinals to neogitiate service token with server and grant the connection. See Client Developer's guide for information on connection properties and how to configure data sources. @@ -236,31 +280,27 @@ data source. Here is a sample configuration, this needs to be configured in "teiid-jboss-beans.xml" file. </para> - <programlisting><![CDATA[ - <application-policy xmlns="urn:jboss:security-beans:1.0" name="teiid-security"> - <authentication> + <programlisting><![CDATA[<application-policy xmlns="urn:jboss:security-beans:1.0" name="teiid-security"> + <authentication> + + <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"> + <module-option name = "password-stacking">useFirstPass</module-option> + <module-option name="usersProperties">props/teiid-security-users.properties</module-option> + <module-option name="rolesProperties">props/teiid-security-roles.properties</module-option> + </login-module> + + <login-module code="org.jboss.resource.security.CallerIdentityLoginModule" flag="required"> + <module-option name = "password-stacking">useFirstPass</module-option> + <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option> + </login-module> + + </authentication> +</application-policy>]]></programlisting> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"> - <module-option name = "password-stacking">useFirstPass</module-option> - <module-option name="usersProperties">props/teiid-security-users.properties</module-option> - <module-option name="rolesProperties">props/teiid-security-roles.properties</module-option> - </login-module> - - <login-module code="org.jboss.resource.security.CallerIdentityLoginModule" flag="required"> - <module-option name = "password-stacking">useFirstPass</module-option> - <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option> - </login-module> - - </authentication> - </application-policy> - ]]></programlisting> - <para>In the -ds.xml file that is defined as the "managedConnectionFactoryName" in the above configuration, you need to add the following element</para> - <programlisting><![CDATA[ - <security-domain>teiid-security</security-domain> - ]]></programlisting> + <programlisting><![CDATA[<security-domain>teiid-security</security-domain>]]></programlisting> <para>In the above configuration example, in the primary login module "UsersRolesLoginModule" is setup to hold the passwords in the file, and when user logs in with password, the same password will be also set on the logged in Subject after @@ -285,31 +325,27 @@ map to different roles. If a user has multiple roles, the first role that has the credential will be chosen. Below find the sample configuration.</para> - <programlisting><![CDATA[ - <application-policy xmlns="urn:jboss:security-beans:1.0" name="teiid-security"> - <authentication> - - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"> - <module-option name = "password-stacking">useFirstPass</module-option> - <module-option name="usersProperties">props/teiid-security-users.properties</module-option> - <module-option name="rolesProperties">props/teiid-security-roles.properties</module-option> - </login-module> - - <login-module code="org.teiid.jboss.RoleBasedCredentialMapIdentityLoginModule" flag="required"> - <module-option name = "password-stacking">useFirstPass</module-option> - <module-option name="credentialMap">props/teiid-credentialmap.properties</module-option> - <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option> - </login-module> - - </authentication> - </application-policy> - ]]></programlisting> + <programlisting><![CDATA[<application-policy xmlns="urn:jboss:security-beans:1.0" name="teiid-security"> + <authentication> + + <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required"> + <module-option name = "password-stacking">useFirstPass</module-option> + <module-option name="usersProperties">props/teiid-security-users.properties</module-option> + <module-option name="rolesProperties">props/teiid-security-roles.properties</module-option> + </login-module> + + <login-module code="org.teiid.jboss.RoleBasedCredentialMapIdentityLoginModule" flag="required"> + <module-option name = "password-stacking">useFirstPass</module-option> + <module-option name="credentialMap">props/teiid-credentialmap.properties</module-option> + <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option> + </login-module> + + </authentication> +</application-policy>]]></programlisting> <para>In the -ds.xml file that is defined as the "managedConnectionFactoryName" in the above configuration, you need to add the following element</para> - <programlisting><![CDATA[ - <security-domain>teiid-security</security-domain> - ]]></programlisting> + <programlisting><![CDATA[<security-domain>teiid-security</security-domain>]]></programlisting> <para>In the above configuration example, in the primary login module "UsersRolesLoginModule" is setup for logging in the primary user and assign some roles. The "RoleBasedCredentialMap" login module is configured to hold @@ -322,19 +358,17 @@ password in the file defined by the "credentialMap" property, and define following properties in the "RoleBasedCredentialMap" login module.</para> - <programlisting><![CDATA[ - <login-module code="org.teiid.jboss.RoleBasedCredentialMapIdentityLoginModule" flag="required"> - <module-option name = "password-stacking">useFirstPass</module-option> - <module-option name="credentialMap">props/teiid-credentialmap.properties</module-option> - <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option> - - <!-- below properties are only required when passwords are encrypted --> - <module-option name = "pbealgo">PBEWithMD5AndDES</module-option> - <module-option name = "pbepass">testPBEIdentityLoginModule</module-option> - <module-option name = "salt">abcdefgh</module-option> - <module-option name = "iterationCount">19</module-option> - </login-module> - ]]></programlisting> + <programlisting><![CDATA[<login-module code="org.teiid.jboss.RoleBasedCredentialMapIdentityLoginModule" flag="required"> + <module-option name = "password-stacking">useFirstPass</module-option> + <module-option name="credentialMap">props/teiid-credentialmap.properties</module-option> + <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option> + + <!-- below properties are only required when passwords are encrypted --> + <module-option name = "pbealgo">PBEWithMD5AndDES</module-option> + <module-option name = "pbepass">testPBEIdentityLoginModule</module-option> + <module-option name = "salt">abcdefgh</module-option> + <module-option name = "iterationCount">19</module-option> +</login-module>]]></programlisting> <para>For full details about encryption of the password, please follow this <ulink url="http://community.jboss.org/docs/DOC-9703">document</... @@ -367,6 +401,8 @@ <property name="truststorePassword">passwd</property> <!-- 1-way, 2-way, anonymous --> <property name="authenticationMode">1-way</property> + <!-- an optional property to constrain the cipher suites to be negotiated between server and client --> + <property name="enabledCipherSuites">SSL_RSA_WITH_RC4_128_MD5,SSL_RSA_WITH_RC4_128_SHA</property> </bean>]]></programlisting> </example> <itemizedlist> @@ -387,6 +423,7 @@ public key for the client. Depending upon how you created the keystore and truststores, this may be same file as defined under "keystoreFilename" property.</para></listitem> <listitem><para>truststorePassword - password for the truststore. </para></listitem> + <listitem><para>enabledCipherSuites - A comma separated list of cipher suites allowed for encryption between server and client. The values must be valid supported cipher suites otherwise SSL connections will fail.</para></listitem> </itemizedlist> <section id="ssl_auth"> <title>SSL Authentication Modes</title> @@ -408,8 +445,9 @@ </section> <section id="encryption_strength"> <title>Encryption Strength</title> - <para>Both anonymous SSL and login only encryption are configured to use 128 bit AES encryption. - 1-way and 2-way SSL allow for cipher suite negotiation based upon the default cipher suites supported by the respective Java platforms of the client and server. + <para>Both anonymous SSL and login only encryption are configured to use 128 bit AES encryption by default. By default, + 1-way and 2-way SSL allow for cipher suite negotiation based upon the default cipher suites supported by the respective Java platforms of the client and server. + User can restrict the cipher suites used for encryption by specifying the <emphasis>enabledCipherSuites</emphasis> property above in ssl configuration. </para> </section> </section> Modified: branches/as7/documentation/caching-guide/pom.xml =================================================================== --- branches/as7/documentation/caching-guide/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/caching-guide/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>caching-guide</artifactId> Modified: branches/as7/documentation/client-developers-guide/pom.xml =================================================================== --- branches/as7/documentation/client-developers-guide/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/client-developers-guide/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-developers-guide</artifactId> Modified: branches/as7/documentation/developer-guide/pom.xml =================================================================== --- branches/as7/documentation/developer-guide/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/developer-guide/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>developer-guide</artifactId> Modified: branches/as7/documentation/pom.xml =================================================================== --- branches/as7/documentation/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -2,7 +2,7 @@ <parent> <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> Modified: branches/as7/documentation/quick-start-example/pom.xml =================================================================== --- branches/as7/documentation/quick-start-example/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/quick-start-example/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>quick-start-example</artifactId> Modified: branches/as7/documentation/reference/pom.xml =================================================================== --- branches/as7/documentation/reference/pom.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/reference/pom.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -2,7 +2,7 @@ <parent> <groupId>org.jboss.teiid</groupId> <artifactId>documentation</artifactId> - <version>7.6.0.Alpha1-SNAPSHOT</version> + <version>7.6.0.Beta2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>reference</artifactId> Modified: branches/as7/documentation/reference/src/main/docbook/en-US/Reference.xml =================================================================== --- branches/as7/documentation/reference/src/main/docbook/en-US/Reference.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/reference/src/main/docbook/en-US/Reference.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -58,7 +58,7 @@ <xi:include href="content/transaction_support.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="content/dataroles.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="content/system_schema.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="content/multisource.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="content/vdbs.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="content/translators.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="content/federated_planning.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="content/architecture.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> Modified: branches/as7/documentation/reference/src/main/docbook/en-US/content/architecture.xml =================================================================== --- branches/as7/documentation/reference/src/main/docbook/en-US/content/architecture.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/reference/src/main/docbook/en-US/content/architecture.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -123,17 +123,25 @@ actually support this method.</para> </section> <section> - <title>Timeouts</title> - <para>Timeouts in Teiid are managed on the client-side, - in the JDBC API (which underlies both SOAP and ODBC access). - Timeouts are only relevant for the first record returned. If the + <title>User Query Timeouts</title> + <para>User query timeouts in Teiid can be managed on the client-side or the server-side. + Timeouts are only relevant for the first record returned. If the first record has not been received by the client within the - specified timeout period, a ‘cancel’ command is issued to the + specified timeout period, a 'cancel' command is issued to the server for the request and no results are returned to the - client. The cancel command is issued by the JDBC API without the - client’s intervention. See the Client Developers Guide for more on setting - statement timeouts via the connection property "QUERYTIMEOUT" and see the Java JDBC API for setting - the query timeout via <code>java.sql.Statement.setQueryTimeout</code> method.</para> + client. The cancel command is issued asynchronously without the + client’s intervention. + </para><para> + The JDBC API uses the query timeout set by the <code>java.sql.Statement.setQueryTimeout</code> method. + You may also set a default statement timeout via the connection property "QUERYTIMEOUT". + ODBC clients may also utilize QUERYTIMEOUT as an execution property via a set statement to control the default timeout setting. + See the Client Developers Guide for more on connection/execution properties and set statements.</para> + <para>Server-side timeouts start when the query is received by the engine. There may be a skew from the when the + client issued the query due to network latency or server load that may slow the processing of IO work. + The timeout will be cancelled if the first result is sent back before the timeout has ended. + See the <xref linkend="vdbs"/> section for more on setting the query-timeout VDB property. + See the Admin Guide for more on modifying the &jboss-beans; file to set default query timeout for all queries. + </para> </section> </section> <section> Deleted: branches/as7/documentation/reference/src/main/docbook/en-US/content/multisource.xml =================================================================== --- branches/as7/documentation/reference/src/main/docbook/en-US/content/multisource.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/reference/src/main/docbook/en-US/content/multisource.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ -<!ENTITY % CustomDTD SYSTEM "../../../../../../docbook/custom.dtd"> -%CustomDTD; -]> -<chapter id="multisource"> - <title>Multi-source models</title> - <para>Multi-source models can be used to quickly access data in multiple sources with homogeneous metadata. - Since all sources utilize the same physical metadata, this feature is most appropriate for accessing the same source type with multiple instances. - <para>A model is marked as supporting multi-source by setting the property supports-multi-source-bindings to true. - With supports-multi-source-bindings set to true, 1 or more uniquely named source elements can be added to the model. - See <xref linkend="dynamic_vdbs"/> for a full template of the vdb.xml.</para> - A physical table in a multi-source model is effectively treated as a view that is a - union all of the actual physical table from each of the configured sources. These tables tables are implicitly partitioned on a string pseudo-column "source_name". - The "source_name" column will be available to your use queries for a multi-source model regardless of whether it is explicitly part of the metadata. - The source_name column value for a particular row is the source name used to obtain that row. - More complex partitioning scenarios, such as heterogeneous sources or list partitioning will require the use of a <xref linkend="partitioned_union"/></para> - <para>In some scenarios, the source_name column can be manually added to the physical metadata in the Designer tool so that virtual layer logic can be multi-source aware. - It is important to understand that a column or IN procedure parameter named source_name will always be treated as the explicit form of the multi-source source_name column - and will no longer be treated as an actual physical column or procedure parameter.</para> - <section> - <title>Multi-source SELECTs</title> - <para>A multi-source SELECT may use the source_name column anywhere a column reference is allowed. As a final stage of planning, a source query will be generated against each source and each instance of the source_name column replaced by the appropriate value. - If the resulting query still needs executed, it is sent to the source. If the WHERE clause evaluates to always false, then the query is pruned from the result. All results are then unioned together and returned as the full result. - </para> - </section> - <section> - <title>Multi-source INSERTs</title> - <para>A multi-source INSERT may use the source_name column as an insert target column to specify which source should be targeted by the INSERT. Only a INSERT using the VALUES clause is supported and the source_name column value must be a literal. - If the source_name column is not part of the INSERT column, then the INSERT will be issued against every source. The sum of the update counts will be returned as the resultant update count.</para> - </section> - <section> - <title>Multi-source UPDATEs</title> - <para>A multi-source delete functions just like SELECT, however it is not possible to use the source_name column as a target column in the change set. Any other usage of the source_name column will be the appropriate value for each source. - If the WHERE clause evaluates to always false, then no update will be issued to the source. The sum of the update counts will be returned as the resultant update count.</para> - </section> - <section> - <title>Multi-source DELETEs</title> - <para>A multi-source delete functions just like SELECT. Any usage of the source_name column will be the appropriate value for each source. - If the WHERE clause evaluates to always false, then no delete will be issued to the source. The sum of the update counts will be returned as the resultant update count.</para> - </section> - <section> - <title>Multi-source Stored Procedures</title> - <para>A physical stored procedures requires the manual addition of a string source_name parameter to allow for specifying which source the procedure is executed on. - If the source_name parameter is not added or if named parameters are used and the source_name parameter is allowed to default to a null value, then the procedure will be executed on - each source and the results unioned together.</para> - <para>It is not possible to execute procedures that required to return IN/OUT, OUT, or RETURN parameters values on more than 1 source at a time.</para> - </section> - <section> - <title>Additional Concerns</title> - <para>When running under a transaction of in a mode that detects the need for a transation and multiple updates are performed, an attempt will be made to enlist each source in the same XA transaction.</para> - </section> -</chapter> \ No newline at end of file Modified: branches/as7/documentation/reference/src/main/docbook/en-US/content/scalar_functions.xml =================================================================== --- branches/as7/documentation/reference/src/main/docbook/en-US/content/scalar_functions.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/reference/src/main/docbook/en-US/content/scalar_functions.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -1864,7 +1864,7 @@ <title>COMMANDPAYLOAD</title> <para>Retrieve a string from the command payload or null if no command payload was specified. The command - payload is set by a method on the Teiid JDBC API + payload is set by the <code>TeiidStatement.setPayload</code> method on the Teiid JDBC API extensions on a per-query basis.</para> <para><synopsis>COMMANDPAYLOAD([key])</synopsis></para> <para>If the key parameter is provided, the command payload object is cast to a @@ -1877,7 +1877,7 @@ <para><synopsis>ENV(key)</synopsis></para> <para>The only key specific to the current session is 'sessionid'. However the preferred mechanism for getting the session id is with the session_id() function. - To prevent untrusted access to system properties, the use of this function must be specifically enabled in the &jboss-beans; file.</para> + To prevent untrusted access to system properties, this function is not enabled by default. The ENV function may be enabled via the allowEnvFunction property in the &teiid-deployer-beans; file.</para> <para>key, return value are strings</para> </section> <section> @@ -1967,10 +1967,13 @@ <para id="xmlnamespaces">XMLNAMESPACES is used provide namespace information. NO DEFAULT is equivalent to defining the default namespace to the null uri - xmlns="". Only one DEFAULT or NO DEFAULT namespace item may be specified. The namespace prefixes xmlns and xml are reserved.</para> <para>If a attribute name is not supplied, the expression must be a column reference, in which case the attribute name will be the column name. Null attribute values are ignored.</para> - <para>Name, prefix are identifiers. uri is a string literal. content can be any type. Return value is xml. The return value is valid for use in places where a document is expected.</para> - <para><emphasis>Example</emphasis>: with an xml_value of &lt;doc/&gt;, <programlisting>xmlelement('elem', 1, '&lt;2/&gt;', xml_value)</programlisting> + <para>Name, prefix are identifiers. uri is a string literal. content can be any type. Return value is xml. The return value is valid for use in places where a document is expected.</para> + <example> + <title>XMLELEMENT of mixed values</title> + <para>with an xml_value of &lt;doc/&gt;, <programlisting>XMLELEMENT(NAME "elem", 1, '&lt;2/&gt;', xml_value)</programlisting> Returns: <code>&lt;elem&gt;1&amp;lt;2/&amp;gt;&lt;doc/&gt;&lt;elem/&gt;</code> </para> + </example> </section> <section> <title>XMLFOREST</title> @@ -2053,10 +2056,12 @@ with the security system.</para> <section> <title>HASROLE</title> - <para>Whether the current caller has the role roleName.</para> + <para>Whether the current caller has the Teiid data role roleName.</para> <para><synopsis>hasRole([roleType,] roleName)</synopsis></para> <para>roleName must be a string, the return type is boolean.</para> - <para>The two argument form is provided for backwards compatibility. roleType is a string and must be 'data'</para> + <para>The two argument form is provided for backwards compatibility. roleType is a string and must be 'data'.</para> + <para>Role names are case-sensitive and only match Teiid <xref linkend="dataroles"/>. + JAAS roles/groups names are not valid for this function - unless there is corresponding data role with the same name.</para> </section> </section> <section> Modified: branches/as7/documentation/reference/src/main/docbook/en-US/content/translators.xml =================================================================== --- branches/as7/documentation/reference/src/main/docbook/en-US/content/translators.xml 2011-11-01 20:16:59 UTC (rev 3600) +++ branches/as7/documentation/reference/src/main/docbook/en-US/content/translators.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -239,6 +239,11 @@ </listitem> <listitem> <para> + <emphasis>access</emphasis> - for use with Microsoft Access 2003 or later. + </para> + </listitem> + <listitem> + <para> <emphasis>db2</emphasis> - for use with DB2 8 or later. </para> </listitem> @@ -317,6 +322,12 @@ A rownum colum should have a name in source of <code>rownum</code>. These rownum columns do not have the same semantics as the Oracle rownum construct so care must be taken in their usage. </para> + <para>Oracle specific execution properties:</para> + <itemizedlist> + <listitem> + <para><emphasis>OracleSuppliedDriver</emphasis> - indicates that the Oracle supplied driver (typically prefixed by ojdbc) is being used. Defaults to true. Set to false when using DataDirect or other Oracle JDBC drivers.</para> + </listitem> + </itemizedlist> </listitem> <listitem> <para> @@ -509,6 +520,22 @@ </section> <section> + <title>Native Queries</title> + <para>Both physical tables and procedures may optionally have native queries associated with them. No validation of the native query is performed, it is simply used in a straight-forward manner to generate the source SQL. + For a physical table setting the teiid:native-query extension metadata to the desired query string will have Teiid execute the native query as an inline view in the source query. + This feature should only be used against sources that support inline views. For example on a physical table y with nameInSource=x and teiid:native-query=select c from g, the Teiid source query + "SELECT c FROM y" would generate the SQL query "SELECT c FROM (select c from g) as x". Note that the column names in the native query must match the nameInSource of the physical table columns for the resulting SQL + to be valid.</para> + <para>For physical procedures you may also set the teiid:native-query extension metadata to a desired query string with the added ability to positionally reference IN parameters. A parameter reference has the form + $integer, e.g. $1. Note that 1 based indexing is used and that only IN parameters may be referenced. Dollar-sign ($) is reserved in physical procedure native queries. To use a $ directly, it must be escaped with another $, e.g. $$. + By default bind values will be used for parameter values. In some situations you may wish to bind values directly into the resulting SQL. The teiid:non-prepared extension metadata property may be set to false to turn off + parameter binding. Note this option should be used with caution as inbound may allow for SQL injection attacks if not properly validated. The native query does not need to call a stored procedure. Any SQL that returns + a result set positionally matching the result set expected by the physical stored procedure metadata will work. For example on a stored procedure x with teiid:native-query=select c from g where c1 = $1 and c2 = '$$', the Teiid source query + "CALL x(?)" would generate the SQL query "select c from g where c1 = ? and c2 = '$'". Note that ? in this example will be replaced with the actual value bound to parameter 1. + </para> + </section> + + <section> <title>JCA Resource Adapter</title> <para>The resource adapter for this translator provided through data source in JBoss AS, Refer to Admin Guide for "JDBC Data Sources" configuration section.</para> @@ -555,6 +582,11 @@ <entry>Use a PagedResultsControl to page through large results. This is not supported by all directory servers.</entry> <entry>false</entry> </row> + <row> + <entry>ExceptionOnSizeLimitExceeded</entry> + <entry>Set to true to throw an exception when a SizeLimitExceededException is received and a LIMIT is not properly enforced.</entry> + <entry>false</entry> + </row> </tbody> </tgroup> </table> @@ -1196,293 +1228,5 @@ </table> </section> </section> - - <section id="dynamic_vdbs"> - <title>Dynamic VDBs</title> - <para> - Teiid integration is available via a "Dynamic VDB" without the need for Teiid Designer - tooling. While this mode of operation does not yet allow for the creation of view - layers, the underlying sources can still be queried as if they are a single source. See - the kit's "teiid-example/dynamicvdb-*" for working examples. - </para> - <para> - To build a dynamic VDB, you'll need to create a - <filename><replaceable>SOME-NAME</replaceable>-vdb.xml</filename> file. The XML file captures - information about the VDB, the sources it integrate, and preferences for importing metadata. - </para> - - <note> - <para> - VDB name pattern must adhere to "-vdb.xml" for the Teiid VDB deployer to - recognize this file as a dynamic VDB. - </para> - </note> - - <para> - my-vdb.xml: (The vdb-deployer.xml schema for this file is available in the schema - folder under the docs with the Teiid distribution.) - </para> - - <programlisting role="XML" language="XML"><![CDATA[<vdb name="${vdb-name}" version="${vdb-version}"> - - <property name="UseConnectorMetadata" value="..." /> - - <!-- define a model fragment for each data source --> - <model name="${model-name}"> - - <property name="..." value="..." /> - ... - - <source name="${source-name}" translator-name="${translator-name}" - - connection-jndi-name="${deployed-jndi-name}"> - ... - </model> - - <!-- create translator instances that override default properties --> - - <translator name="${translator-name}" type="${translator-type}" /> - - <property name="..." value="..." /> - ... - - </translator> -</vdb>]]></programlisting> - - <section> - <title>VDB Element</title> - <itemizedlist> - <title>Attributes</title> - <listitem> - <para> - <emphasis>name</emphasis> - </para> - <para> - The name of the VDB. The VDB name - referenced through the driver or datasource during the connection time. - </para> - </listitem> - <listitem> - <para> - <emphasis>version</emphasis> - </para> - <para> - The version of the VDB (should be an - positive integer). This determines the deployed directory location - (see Name), and provides an explicit versioning mechanism to the VDB - name. - </para> - </listitem> - </itemizedlist> - - <itemizedlist> - <title>Property Elements</title> - <listitem> - <para> - <emphasis>UseConnectorMetadata</emphasis> - </para> - <para> - Setting to use connector - supplied metadata. Can be "true" or "cached". "true" will obtain - metadata once for every launch of Teiid. "cached" will save a file - containing the metadata into the - <filename><replaceable>PROFILE</replaceable>/data/teiid</filename> directory - </para> - </listitem> - </itemizedlist> - - </section> - - <section> - <title>Model Element</title> - <itemizedlist> - <title>Attributes</title> - <listitem> - <para> - <emphasis>name</emphasis> - </para> - <para> - The name of the model is used as a - top level schema name for all of the metadata imported from the - connector. The name should be unique among all Models in the VDB and - should not contain the '.' character. - </para> - </listitem> - <listitem> - <para> - <emphasis>version</emphasis> - </para> - <para> - The version of the VDB (should be an - positive integer). This determines the deployed directory location - (see Name), and provides an explicit versioning mechanism to the VDB - name. - </para> - </listitem> - </itemizedlist> - - <itemizedlist> - <title>Source Element</title> - <listitem> - <para> - <emphasis>name</emphasis> - </para> - <para> - The name of the source to use for this - model. This can be any name you like, but will typically be the same - as the model name. Having a name different than the model name is - only useful in multi-source scenarios. - </para> - </listitem> - <listitem> - <para> - <emphasis>translator-name</emphasis> - </para> - <para> - The name or type of the Teiid Translator to use. Possible values include - the built-in types (ws, file, ldap, oracle, sqlserver, db2, derby, etc.) - and translators defined in the translators section. - </para> - </listitem> - <listitem> - <para> - <emphasis>connection-jndi-name</emphasis> - </para> - <para> - The JNDI name of this source's connection factory. There should be a - corresponding "-ds.xml" file that defines the connection factory in - the JBoss AS. Check out the deploying VDB dependencies section for - info. You also need to deploy these connection factories before you - can deploy the VDB. - </para> - </listitem> - </itemizedlist> - - <itemizedlist> - <title>Property Elements</title> - <listitem> - <para> - <emphasis>importer.&lt;propertyname&gt;</emphasis> - </para> - <para> - Property to be used by the connector importer for the model for purposes - importing metadata. See possible property name/values in the - Translator specific section. Note that using these properties you - can narrow or widen the data elements available for integration. - </para> - </listitem> - </itemizedlist> - - </section> - <section> - <title>Translator Element</title> - <itemizedlist> - <title>Attributes</title> - <listitem> - <para> - <emphasis>name</emphasis> - </para> - <para> - The name of the the Translator. Referenced by the source element. - </para> - </listitem> - <listitem> - <para> - <emphasis>type</emphasis> - </para> - <para> - The base type of the Translator. Can be one of the built-in types (ws, - file, ldap, oracle, sqlserver, db2, derby, etc.). - </para> - </listitem> - </itemizedlist> - - <itemizedlist> - <title>Property Elements</title> - <listitem> - <para> - Set a value that overrides a translator default property. See - possible property name/values in the Translator specific section. - </para> - </listitem> - </itemizedlist> - </section> - - </section> - <section> - <title>Multi-Source Models and VDB</title> - <para> - When you have multiple instances of data that are using identical schema - (horizontal sharding), Teiid can help you aggregate data across all the - instances, using "multi-source" models. In this scenario, instead of - creating/importing a model for every data source, user needs to define one - source model that represents the schema and configure multiple data "sources" - underneath it. During runtime, when a query issued against this model, the query - engine analyzes the information and gathers the required data from all the - sources configured and aggregates the results and provides in a single result set. - </para> - - <para> - To mark a model as multi-source, the user needs to supply property called - <property>supports-multi-source-bindings</property>, in the "vdb.xml" file. - Also, the user needs to define multiple sources. Here is code example showing dynamic vdb with single model with - multiple sources defined. - </para> - - <programlisting role="XML" language="XML"><![CDATA[<vdb name="vdbname" version="1"> - <model visible="true" type="PHYSICAL" name="Customers" path="/Test/Customers.xmi"> - <property name="supports-multi-source-bindings" value="true"/> - <source name="chicago" - translator-name="oracle" connection-jndi-name="chicago-customers"/> - <source name="newyork" - translator-name="oracle" connection-jndi-name="newyork-customers"/> - <source name="la" - translator-name="oracle" connection-jndi-name="la-customers"/> - </model> -</vdb>]]></programlisting> - - <para> - In the above example, the VDB defined has single model called <literal>Customers</literal>, - that has multiple sources (<literal>chicago</literal>, <literal>newyork</literal>, - and <literal>la</literal>) that define different instances of data. Every - time a model is marked as "multi-source", the - runtime engine adds a additional column called "SOURCE_NAME" to every table in - that model. This column maps to the source's name from the XML. In - the above XML code that would be <literal>chicago</literal>, <literal>la</literal>, - <literal>newyork</literal>. This allows queries like the following: - </para> - - <programlisting language="SQL"><![CDATA[select * from table where SOURCE_NAME = 'newyork' -update table column=value where SOURCE_NAME='chicago' -delete from table where column = x and SOURCE_NAME='la' -insert into table (column, SOURCE_NAME) VALUES ('value', 'newyork')]]></programlisting> - - <para> - Note that when user do not supply the "SOURCE_NAME" in the criteria, the command applies - to all the sources. If SOURCE_NAME supplied, the query is executed only aginst the source specified. - Another useful feature along with this feature is - "partial results" to skip unavailable sources if they are down. - </para> - - <note> - <para> - Currently the tooling support for managing the multi-source feature is - limited, so if you need to use this feature build the VDB as usual in - the Teiid Designer and then edit the "vdb.xml" file in the VDB archive - using a Text editor to add the additional sources as defined above. - You must deploy a separate data source for each source defined in the xml file. - </para> - </note> - - <note> - <para> - If you would like to use "SOURCE_NAME" in your transformations to control which sources are accessed or updated, - you would manually need to add this extra column on your view table in - the Designer. This column will not be automatically added on the source table, when you import - the medata from source. - </para> - </note> - </section> - </chapter> \ No newline at end of file Copied: branches/as7/documentation/reference/src/main/docbook/en-US/content/vdbs.xml (from rev 3597, trunk/documentation/reference/src/main/docbook/en-US/content/vdbs.xml) =================================================================== --- branches/as7/documentation/reference/src/main/docbook/en-US/content/vdbs.xml (rev 0) +++ branches/as7/documentation/reference/src/main/docbook/en-US/content/vdbs.xml 2011-11-02 15:15:47 UTC (rev 3601) @@ -0,0 +1,354 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +<!ENTITY % CustomDTD SYSTEM "../../../../../../docbook/custom.dtd"> +%CustomDTD; +]> +<chapter id="vdbs"> + <title>VDBs</title> + <section> + <title>VDB Definition</title> + <para>A VDB or virtual database definition is contained in an XML file. + For .vdb archive files created in the design tool, this file is embedded in the archive and most field can be updated through tooling. + The XML schema for this file can be found in the teiid-docs/schema directory.</para> + <example> + <title>Example VDB XML</title> + <programlisting role="XML" language="XML"><![CDATA[<vdb name="${vdb-name}" version="${vdb-version}"> + + <!-- VDB properties --> + <property name="UseConnectorMetadata" value="..." /> + ... + + <!-- define a model fragment for each data source --> + <model name="${model-name}"> + + <property name="..." value="..." /> + ... + + <source name="${source-name}" translator-name="${translator-name}" + + connection-jndi-name="${deployed-jndi-name}"> + ... + </model> + + <!-- create translator instances that override default properties --> + + <translator name="${translator-name}" type="${translator-type}" /> + + <property name="..." value="..." /> + ... + + </translator> +</vdb>]]></programlisting> +</example> + + <section> + <title>VDB Element</title> + <itemizedlist> + <title>Attributes</title> + <listitem> + <para> + <emphasis>name</emphasis> + </para> + <para> + The name of the VDB. The VDB name + referenced through the driver or datasource during the connection time. + </para> + </listitem> + <listitem> + <para> + <emphasis>version</emphasis> + </para> + <para> + The version of the VDB (should be an + positive integer). This determines the deployed directory location + (see Name), and provides an explicit versioning mechanism to the VDB + name. + </para> + </listitem> + </itemizedlist> + + <itemizedlist> + <title>Property Elements</title> + <listitem> + <para> + <emphasis>UseConnectorMetadata</emphasis> + </para> + <para> + Setting to use connector + supplied metadata. Can be "true" or "cached". "true" will obtain + metadata once for every launch of Teiid. "cached" will save a file + containing the metadata into the + <filename><replaceable>PROFILE</replaceable>/data/teiid</filename> directory + </para> + </listitem> + <listitem> + <para> + <emphasis>query-timeout</emphasis> + </para> + <para> + Sets the default query timeout in milliseconds for queries executed against this VDB. 0 indicates that the server default query timeout should be used. Defaults to 0. Will have no effect if the server default query timeout is set to a lesser value. Note that clients can still set their own timeouts that will be managed on the client side. + </para> + </listitem> + </itemizedlist> + + </section> + + <section> + <title>Model Element</title> + <itemizedlist> + <title>Attributes</title> + <listitem> + <para> + <emphasis>name</emphasis> + </para> + <para> + The name of the model is used as a + top level schema name for all of the metadata imported from the + connector. The name should be unique among all Models in the VDB and + should not contain the '.' character. + </para> + </listitem> + <listitem> + <para> + <emphasis>version</emphasis> + </para> + <para> + The version of the VDB (should be an + positive integer). This determines the deployed directory location + (see Name), and provides an explicit versioning mechanism to the VDB + name. + </para> + </listitem> + </itemizedlist> + + <itemizedlist> + <title>Source Element</title> + <listitem> + <para> + <emphasis>name</emphasis> + </para> + <para> + The name of the source to use for this + model. This can be any name you like, but will typically be the same + as the model name. Having a name different than the model name is + only useful in multi-source scenarios. + </para> + </listitem> + <listitem> + <para> + <emphasis>translator-name</emphasis> + </para> + <para> + The name or type of the Teiid Translator to use. Possible values include + the built-in types (ws, file, ldap, oracle, sqlserver, db2, derby, etc.) + and transl