Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit b7d69e6

Browse files
author
Jim Vance
committed
Fixed table width issues
1 parent a495c57 commit b7d69e6

11 files changed

Lines changed: 180 additions & 182 deletions

docs/connect/jdbc/always-encrypted-api-reference-for-the-jdbc-driver.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ manager: "jhubbard"
6363

6464
|Name|Description|
6565
|----------|-----------------|
66-
|public SQLServerColumnEncryptionJavaKeyStoreProvider(String keyStoreLocation, char[] keyStoreSecret)|Key store provider for the Java Key Store.|
66+
|public SQLServerColumnEncryptionJavaKeyStoreProvider (String keyStoreLocation, char[] keyStoreSecret)|Key store provider for the Java Key Store.|
6767

6868
Methods
6969

7070
|Name|Description|
7171
|----------|-----------------|
72-
|public byte[] decryptColumnEncryptionKey(String masterKeyPath, String encryptionAlgorithm, byte[] encryptedColumnEncryptionKey)|Decrypts the specified encrypted value of a column encryption key. The encrypted value is expected to be encrypted using the certificate with the specified key path and using the specified algorithm.<br /><br /> **The format of the key path should be one of the following:**<br /><br /> Thumbprint:<certificate_thumbprint><br /><br /> Alias:<certificate_alias><br /><br /> (Overrides SQLServerColumnEncryptionKeyStoreProvider.decryptColumnEncryptionKey(String, String, Byte[]).)|
73-
|public byte[] encryptColumnEncryptionKey(String masterKeyPath, String encryptionAlgorithm, byte[] plainTextColumnEncryptionKey)|Encrypts a column encryption key using the certificate with the specified key path and using the specified algorithm.<br /><br /> **The format of the key path should be one of the following:**<br /><br /> Thumbprint:<certificate_thumbprint><br /><br /> Alias:<certificate_alias><br /><br /> (Overrides SQLServerColumnEncryptionKeyStoreProvider.encryptColumnEncryptionKey(String, String, Byte[]).)|
74-
|public void setName(String name)|Sets the name of this key store provider.|
75-
|public String getName()|Gets the name of this key store provider.|
72+
|public byte[] decryptColumnEncryptionKey (String masterKeyPath, String encryptionAlgorithm, byte[] encryptedColumnEncryptionKey)|Decrypts the specified encrypted value of a column encryption key. The encrypted value is expected to be encrypted using the certificate with the specified key path and using the specified algorithm.<br /><br /> **The format of the key path should be one of the following:**<br /><br /> Thumbprint:<certificate_thumbprint><br /><br /> Alias:<certificate_alias><br /><br /> (Overrides SQLServerColumnEncryptionKeyStoreProvider. decryptColumnEncryptionKey(String, String, Byte[]).)|
73+
|public byte[] encryptColumnEncryptionKey (String masterKeyPath, String encryptionAlgorithm, byte[] plainTextColumnEncryptionKey)|Encrypts a column encryption key using the certificate with the specified key path and using the specified algorithm.<br /><br /> **The format of the key path should be one of the following:**<br /><br /> Thumbprint:<certificate_thumbprint><br /><br /> Alias:<certificate_alias><br /><br /> (Overrides SQLServerColumnEncryptionKeyStoreProvider. encryptColumnEncryptionKey(String, String, Byte[]).)|
74+
|public void setName (String name)|Sets the name of this key store provider.|
75+
|public String getName ()|Gets the name of this key store provider.|
7676

7777
**SQLServerColumnEncryptionAzureKeyVaultProvider Class**
7878

@@ -82,16 +82,16 @@ manager: "jhubbard"
8282

8383
|Name|Description|
8484
|----------|-----------------|
85-
|public SQLServerColumnEncryptionAzureKeyVaultProvider(SQLServerKeyVaultAuthenticationCallback authenticationCallback, ExecutorService executorService)|Key store provider for Azure Key Vault. You need to provide an implementation for the SQLServerKeyVaultAuthenticationCallback interface to retrieve an access token for the key in Azure Key Vault.|
85+
|public SQLServerColumnEncryptionAzureKeyVaultProvider (SQLServerKeyVaultAuthenticationCallback authenticationCallback, ExecutorService executorService)|Key store provider for Azure Key Vault. You need to provide an implementation for the SQLServerKeyVaultAuthenticationCallback interface to retrieve an access token for the key in Azure Key Vault.|
8686

8787
Methods
8888

8989
|Name|Description|
9090
|----------|-----------------|
91-
|public byte[] decryptColumnEncryptionKey(String masterKeyPath, String encryptionAlgorithm, byte[] encryptedColumnEncryptionKey)|Decrypts the specified encrypted value of a column encryption key. The encrypted value is expected to be encrypted using the specified column key IDmaster key and using the specified algorithm. <br />(Overrides SQLServerColumnEncryptionKeyStoreProvider.decryptColumnEncryptionKey(String, String, Byte[]).)|
92-
|public byte[] encryptColumnEncryptionKey(String masterKeyPath, String encryptionAlgorithm, byte[] columnEncryptionKey)|Encrypts a column encryption key using the specified column master key and using the specified algorithm. <br />(Overrides SQLServerColumnEncryptionKeyStoreProvider.encryptColumnEncryptionKey(String, String, Byte[]).)|
93-
|public void setName(String name)|Sets the name of this key store provider.|
94-
|public String getName()|Gets the name of this key store provider.|
91+
|public byte[] decryptColumnEncryptionKey (String masterKeyPath, String encryptionAlgorithm, byte[] encryptedColumnEncryptionKey)|Decrypts the specified encrypted value of a column encryption key. The encrypted value is expected to be encrypted using the specified column key IDmaster key and using the specified algorithm. <br />(Overrides SQLServerColumnEncryptionKeyStoreProvider. decryptColumnEncryptionKey(String, String, Byte[]).)|
92+
|public byte[] encryptColumnEncryptionKey (String masterKeyPath, String encryptionAlgorithm, byte[] columnEncryptionKey)|Encrypts a column encryption key using the specified column master key and using the specified algorithm. <br />(Overrides SQLServerColumnEncryptionKeyStoreProvider. encryptColumnEncryptionKey(String, String, Byte[]).)|
93+
|public void setName (String name)|Sets the name of this key store provider.|
94+
|public String getName ()|Gets the name of this key store provider.|
9595

9696

9797
**SQLServerKeyVaultAuthenticationCallback Interface**
@@ -110,7 +110,7 @@ manager: "jhubbard"
110110

111111
|Name|Description|
112112
|----------|-----------------|
113-
|SQLServerColumnEncryptionKeyStoreProvider|Base class for all key store providers. A custom provider must derive from this class and override its member functions and then register it using SQLServerConnection.registerColumnEncryptionKeyStoreProviders().|
113+
|SQLServerColumnEncryptionKeyStoreProvider|Base class for all key store providers. A custom provider must derive from this class and override its member functions and then register it using SQLServerConnection. registerColumnEncryptionKeyStoreProviders().|
114114

115115
Methods
116116

docs/connect/jdbc/connecting-to-an-azure-sql-database.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ manager: "jhubbard"
4343

4444
|Registry Setting|Recommended Value|
4545
|----------------------|-----------------------|
46-
|HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\KeepAliveTime|30000|
47-
|HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\KeepAliveInterval|1000|
48-
|HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\TcpMaxDataRetransmissions|10|
46+
|HKEY_LOCAL_MACHINE \ SYSTEM \ CurrentControlSet \ Services \ Tcpip \ Parameters \ KeepAliveTime|30000|
47+
|HKEY_LOCAL_MACHINE \ SYSTEM \ CurrentControlSet \ Services \ Tcpip \ Parameters \ KeepAliveInterval|1000|
48+
|HKEY_LOCAL_MACHINE \ SYSTEM \ CurrentControlSet \ Services \ Tcpip \ Parameters \ TcpMaxDataRetransmissions|10|
4949

5050
You must then restart the computer for the registry settings to take effect.
5151

docs/connect/jdbc/microsoft-jdbc-driver-for-sql-server-support-matrix.md

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,18 @@ manager: "jhubbard"
4949

5050
## SQL Version Compatibility
5151

52-
|||||||||||
53-
|-|-|-|-|-|-|-|-|-|-|
54-
|Driver Version|SQL Server 2000|SQL Server 2005|SQL Server 2008|SQL Server 2008R2|SQL Server 2012|Azure SQL Database|PDW 2008R2 AU3<sup>4</sup>|SQL Server 2014|SQL Server 2016|
55-
|6.0|N|Y|Y|Y|Y|Y|Y|Y|Y|
56-
|4.2|N|N|Y|Y|Y|Y|Y|Y|Y|
57-
|4.1|N|N|Y|Y|Y|Y|Y|Y|Y|
58-
|4.0|N|Y|Y|Y|Y|Y|Y|Y|Y|
59-
|3.0|Y|Y|Y|Y|Y<sup>1</sup>|Y<sup>2</sup>|N|Y<sup>5</sup>|N|
60-
|2.0|Y|Y|Y<sup>3</sup>|Y<sup>3</sup>|N|N|N|N|N|
61-
|1.2|Y|Y|Y<sup>3</sup>|N|N|N|N|N|N|
62-
|1.1|Y|Y|N|N|N|N|N|N|N|
63-
|1.0|Y|Y|N|N|N|N|N|N|N|
64-
|2000|Y|N|N|N|N|N|N|N|N|
52+
|Driver Version|SQL Server 2008|SQL Server 2008R2|SQL Server 2012|Azure SQL Database|PDW 2008R2 AU3<sup>4</sup>|SQL Server 2014|SQL Server 2016|
53+
|-|-|-|-|-|-|-|-|
54+
|6.0|Y|Y|Y|Y|Y|Y|Y|
55+
|4.2|Y|Y|Y|Y|Y|Y|Y|
56+
|4.1|Y|Y|Y|Y|Y|Y|Y|
57+
|4.0|Y|Y|Y|Y|Y|Y|Y|
58+
|3.0|Y|Y|Y<sup>1</sup>|Y<sup>2</sup>|N|Y<sup>5</sup>|N|
59+
|2.0|Y<sup>3</sup>|Y<sup>3</sup>|N|N|N|N|N|
60+
|1.2|Y<sup>3</sup>|N|N|N|N|N|N|
61+
|1.1|N|N|N|N|N|N|N|
62+
|1.0|N|N|N|N|N|N|N|
63+
|2000|N|N|N|N|N|N|N|
6564

6665
<sup>1</sup>Microsoft SQL Server JDBC Driver version 3.0 can connect to SQL Server 2012 as a down-level client.
6766

docs/connect/jdbc/understanding-java-ee-support.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
---
2-
title: "Understanding Java EE Support | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "01/19/2017"
5-
ms.prod: "sql-non-specified"
6-
ms.reviewer: ""
7-
ms.suite: ""
8-
ms.technology:
9-
- "drivers"
10-
ms.tgt_pltfrm: ""
11-
ms.topic: "article"
12-
ms.assetid: a9448b80-b7a3-49cf-8bb4-322c73676005
13-
caps.latest.revision: 26
14-
author: "MightyPen"
15-
ms.author: "genemi"
16-
manager: "jhubbard"
17-
---
18-
# Understanding Java EE Support
19-
[!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
20-
1+
---
2+
title: "Understanding Java EE Support | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "01/19/2017"
5+
ms.prod: "sql-non-specified"
6+
ms.reviewer: ""
7+
ms.suite: ""
8+
ms.technology:
9+
- "drivers"
10+
ms.tgt_pltfrm: ""
11+
ms.topic: "article"
12+
ms.assetid: a9448b80-b7a3-49cf-8bb4-322c73676005
13+
caps.latest.revision: 26
14+
author: "MightyPen"
15+
ms.author: "genemi"
16+
manager: "jhubbard"
17+
---
18+
# Understanding Java EE Support
19+
[!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
20+
2121
The following sections document how the [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)] provides support for the Java Platform, Enterprise Edition (Java EE) and JDBC 3.0 optional API features. The source code examples provided in this Help system provide a good reference for getting started with these features.
2222

2323
First, make sure that your Java environment (JDK, JRE) includes the javax.sql package. This is a required package for any JDBC application that uses the optional API. JDK 1.5 and later versions already contain this package, so you do not have to install it separately.
@@ -33,11 +33,11 @@ manager: "jhubbard"
3333
### Datasource Names
3434
You can make database connections by using data sources. The data sources available with JDBC driver are described in the following table:
3535

36-
|DataSource Type|Class Name|Description|
37-
|---------------------|----------------|-----------------|
38-
|DataSource|com.microsoft.sqlserver.jdbc.SQLServerDataSource|The non pooling data source.|
39-
|ConnectionPoolDataSource|com.microsoft.sqlserver.jdbc.SQLServerConnectionPoolDataSource|The data source to configure JAVA EE application server connection pools. Typically used when the application runs within a JAVA EE application server.|
40-
|XADataSource|com.microsoft.sqlserver.jdbc.SQLServerXADataSource|The data source to configure JAVA EE XA data sources. Typically used when the application runs within a JAVA EE application server and an XA transaction manager.|
36+
|DataSource Type|Class Name and Description|
37+
|---------------|--------------------------|
38+
|DataSource|com.microsoft.sqlserver.jdbc.SQLServerDataSource <br/> <br/> The non pooling data source.|
39+
|ConnectionPoolDataSource|com.microsoft.sqlserver.jdbc.SQLServerConnectionPoolDataSource <br/> <br/> The data source to configure JAVA EE application server connection pools. Typically used when the application runs within a JAVA EE application server.|
40+
|XADataSource|com.microsoft.sqlserver.jdbc.SQLServerXADataSource <br/> <br/> The data source to configure JAVA EE XA data sources. Typically used when the application runs within a JAVA EE application server and an XA transaction manager.|
4141

4242
### Data Source Properties
4343
All data sources support the ability to set and get any property that is associated with the underlying driver's property set.

docs/connect/jdbc/using-connection-pooling.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
---
2-
title: "Using Connection Pooling | Microsoft Docs"
3-
ms.custom: ""
4-
ms.date: "01/19/2017"
5-
ms.prod: "sql-non-specified"
6-
ms.reviewer: ""
7-
ms.suite: ""
8-
ms.technology:
9-
- "drivers"
10-
ms.tgt_pltfrm: ""
11-
ms.topic: "article"
12-
ms.assetid: 699d4e8a-34bf-4c60-b0d5-4a10dad6084a
13-
caps.latest.revision: 30
14-
author: "MightyPen"
15-
ms.author: "genemi"
16-
manager: "jhubbard"
17-
---
18-
# Using Connection Pooling
19-
[!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
20-
1+
---
2+
title: "Using Connection Pooling | Microsoft Docs"
3+
ms.custom: ""
4+
ms.date: "01/19/2017"
5+
ms.prod: "sql-non-specified"
6+
ms.reviewer: ""
7+
ms.suite: ""
8+
ms.technology:
9+
- "drivers"
10+
ms.tgt_pltfrm: ""
11+
ms.topic: "article"
12+
ms.assetid: 699d4e8a-34bf-4c60-b0d5-4a10dad6084a
13+
caps.latest.revision: 30
14+
author: "MightyPen"
15+
ms.author: "genemi"
16+
manager: "jhubbard"
17+
---
18+
# Using Connection Pooling
19+
[!INCLUDE[Driver_JDBC_Download](../../includes/driver_jdbc_download.md)]
20+
2121
The [!INCLUDE[jdbcNoVersion](../../includes/jdbcnoversion_md.md)] provides support for Java Platform, Enterprise Edition (Java EE) connection pooling. The JDBC driver implements the JDBC 3.0 required interfaces to enable the driver to participate in any connection-pooling implementation that is provided by middleware vendors and is JDBC 3.0-compliant. Middleware such as Java EE application servers frequently provides compliant connection-pooling facilities. The JDBC driver will participate in pooled connections in these environments.
2222

2323
> [!NOTE]
@@ -28,8 +28,8 @@ manager: "jhubbard"
2828

2929
|Class|Implements|Description|
3030
|-----------|----------------|-----------------|
31-
|com.microsoft.sqlserver.jdbc.SQLServerXADataSource|javax.sql.ConnectionPoolDataSource and javax.sql.XADataSource|We recommend that you use the [SQLServerXADataSource](../../connect/jdbc/reference/sqlserverxadatasource-class.md) class for all your Java EE server needs, because it implements all the JDBC 3.0 pooling and XA interfaces.|
32-
|com.microsoft.sqlserver.jdbc.SQLServerConnectionPoolDataSource|javax.sql.ConnectionPoolDataSource|This class is a connection factory that enables the Java EE application server to populate its connection pool with physical connections. If the configuration of your Java EE vendor requires a class that implements javax.sql.ConnectionPoolDataSource, specify the class name as [SQLServerConnectionPoolDataSource](../../connect/jdbc/reference/sqlserverconnectionpooldatasource-class.md). We generally recommend that you use the [SQLServerXADataSource](../../connect/jdbc/reference/sqlserverxadatasource-class.md) class instead, because it implements both pooling and XA interfaces, and has been verified in more Java EE server configurations.|
31+
|com.microsoft.sqlserver.jdbc. SQLServerXADataSource|javax.sql.ConnectionPoolDataSource and javax.sql.XADataSource|We recommend that you use the [SQLServerXADataSource](../../connect/jdbc/reference/sqlserverxadatasource-class.md) class for all your Java EE server needs, because it implements all the JDBC 3.0 pooling and XA interfaces.|
32+
|com.microsoft.sqlserver.jdbc. SQLServerConnectionPoolDataSource|javax.sql.ConnectionPoolDataSource|This class is a connection factory that enables the Java EE application server to populate its connection pool with physical connections. If the configuration of your Java EE vendor requires a class that implements javax.sql.ConnectionPoolDataSource, specify the class name as [SQLServerConnectionPoolDataSource](../../connect/jdbc/reference/sqlserverconnectionpooldatasource-class.md). We generally recommend that you use the [SQLServerXADataSource](../../connect/jdbc/reference/sqlserverxadatasource-class.md) class instead, because it implements both pooling and XA interfaces, and has been verified in more Java EE server configurations.|
3333

3434
JDBC application code should always close connections explicitly to derive the most benefit from pooling. When the application explicitly closes a connection, the pooling implementation can reuse the connection immediately. If the connection is not closed, other applications cannot reuse it. Applications can use the `finally` construct to make sure that pooled connections are closed even if an exception occurs.
3535

0 commit comments

Comments
 (0)