1.1 --- a/xml/config.rnc Mon May 18 00:36:23 2015 +0200
1.2 +++ b/xml/config.rnc Sun May 24 17:35:37 2015 +0200
1.3 @@ -24,6 +24,7 @@
1.4 element url { text },
1.5 element userName { text }?,
1.6 element password { text }?,
1.7 + element driver { text }?,
1.8 element property {
1.9 attribute name { text },
1.10 text
2.1 --- a/xml/config.xml Mon May 18 00:36:23 2015 +0200
2.2 +++ b/xml/config.xml Sun May 24 17:35:37 2015 +0200
2.3 @@ -9,6 +9,7 @@
2.4 <url>jdbc:postgresql://localhost:5432/database_name</url>
2.5 <userName>dbuser</userName>
2.6 <password>dbpass</password>
2.7 + <driver>org.postgresql.Driver</driver>
2.8 </database>
2.9
2.10 <database>
2.11 @@ -16,6 +17,7 @@
2.12 <url>jdbc:mysql://localhost:3306/database_name</url>
2.13 <userName>dbuser</userName>
2.14 <password>dbpass</password>
2.15 + <driver>com.mysql.jdbc.Driver</driver>
2.16 </database>
2.17
2.18 <database>
3.1 --- a/xml/config.xsd Mon May 18 00:36:23 2015 +0200
3.2 +++ b/xml/config.xsd Sun May 24 17:35:37 2015 +0200
3.3 @@ -39,6 +39,7 @@
3.4 <xs:element ref="c:url"/>
3.5 <xs:element minOccurs="0" ref="c:userName"/>
3.6 <xs:element minOccurs="0" ref="c:password"/>
3.7 + <xs:element minOccurs="0" ref="c:driver"/>
3.8 <xs:element minOccurs="0" maxOccurs="unbounded" ref="c:property"/>
3.9 </xs:sequence>
3.10 </xs:complexType>
3.11 @@ -48,6 +49,7 @@
3.12 <xs:element name="url" type="xs:string"/>
3.13 <xs:element name="userName" type="xs:string"/>
3.14 <xs:element name="password" type="xs:string"/>
3.15 + <xs:element name="driver" type="xs:string"/>
3.16
3.17 <xs:element name="property">
3.18 <xs:complexType mixed="true">
4.1 --- a/xml/config.xsl Mon May 18 00:36:23 2015 +0200
4.2 +++ b/xml/config.xsl Sun May 24 17:35:37 2015 +0200
4.3 @@ -103,6 +103,13 @@
4.4 li {
4.5 padding: 0px;
4.6 }
4.7 +
4.8 + .notes {
4.9 + font-size: 66%;
4.10 + }
4.11 + .notes p {
4.12 + margin-bottom: 0px;
4.13 + }
4.14 </style>
4.15 </head>
4.16 <body>
4.17 @@ -126,6 +133,7 @@
4.18 <td>name</td>
4.19 <td>username</td>
4.20 <td>url</td>
4.21 + <td>JDBC driver</td>
4.22 <td>properties</td>
4.23 </tr>
4.24 </thead>
4.25 @@ -135,6 +143,7 @@
4.26 <td><xsl:value-of select="c:name"/></td>
4.27 <td><xsl:value-of select="c:userName"/></td>
4.28 <td><xsl:value-of select="c:url"/></td>
4.29 + <td><xsl:value-of select="c:driver"/></td>
4.30 <td><ul><xsl:apply-templates select="c:property"/></ul></td>
4.31 </tr>
4.32 </xsl:for-each>
4.33 @@ -144,7 +153,13 @@
4.34 <xsl:otherwise><p>no databases are configured</p></xsl:otherwise>
4.35 </xsl:choose>
4.36
4.37 - <p>(passwords are hidden in this output)</p>
4.38 + <div class="notes">
4.39 + <p>Notes:</p>
4.40 + <ul>
4.41 + <li>passwords are hidden in this output</li>
4.42 + <li>JDBC drivers are not mandatory – not needed in SQL-DK, but sometimes useful when <code>jdbc-dk-driver</code> is used in other applications to load SQL-DK's database connections</li>
4.43 + </ul>
4.44 + </div>
4.45
4.46
4.47 <h2>Output formatters</h2>