Use code includes and tabs in connections.adoc

See gh-22171

framework-docs/framework-docs.gradle

@@ -60,12 +60,15 @@ repositories {
 
 dependencies {
 	api(project(":spring-context"))
+	api(project(":spring-jdbc"))
 	api(project(":spring-jms"))
 	api(project(":spring-web"))
 
 	api("org.jetbrains.kotlin:kotlin-stdlib")
 	api("jakarta.jms:jakarta.jms-api")
 	api("jakarta.servlet:jakarta.servlet-api")
+	api("org.apache.commons:commons-dbcp2:2.11.0")
+	api("com.mchange:c3p0:0.9.5.5")
 
 	implementation(project(":spring-core-test"))
 	implementation("org.assertj:assertj-core")

framework-docs/modules/ROOT/pages/data-access/jdbc/connections.adoc

@@ -46,47 +46,9 @@ To configure a `DriverManagerDataSource`:
   for the correct value.)
 . Provide a username and a password to connect to the database.
 
-The following example shows how to configure a `DriverManagerDataSource` in Java:
+The following example shows how to configure a `DriverManagerDataSource`:
 
-[tabs]
+include-code::./DriverManagerDataSourceConfiguration[tag=dataSourceBean,indent=0]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes",role="primary"]
-----
-	DriverManagerDataSource dataSource = new DriverManagerDataSource();
-	dataSource.setDriverClassName("org.hsqldb.jdbcDriver");
-	dataSource.setUrl("jdbc:hsqldb:hsql://localhost:");
-	dataSource.setUsername("sa");
-	dataSource.setPassword("");
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
-----
-	val dataSource = DriverManagerDataSource().apply {
-		setDriverClassName("org.hsqldb.jdbcDriver")
-		url = "jdbc:hsqldb:hsql://localhost:"
-		username = "sa"
-		password = ""
-	}
-----
-======
-
-The following example shows the corresponding XML configuration:
-
-[source,xml,indent=0,subs="verbatim,quotes"]
-----
-	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-		<property name="driverClassName" value="${jdbc.driverClassName}"/>
-		<property name="url" value="${jdbc.url}"/>
-		<property name="username" value="${jdbc.username}"/>
-		<property name="password" value="${jdbc.password}"/>
-	</bean>
-
-	<context:property-placeholder location="jdbc.properties"/>
-----
 
 The next two examples show the basic connectivity and configuration for DBCP and C3P0.
 To learn about more options that help control the pooling features, see the product
@@ -94,32 +56,11 @@ documentation for the respective connection pooling implementations.
 
 The following example shows DBCP configuration:
 
-[source,xml,indent=0,subs="verbatim,quotes"]
+include-code::./BasicDataSourceConfiguration[tag=dataSourceBean,indent=0]
-----
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-		<property name="driverClassName" value="${jdbc.driverClassName}"/>
-		<property name="url" value="${jdbc.url}"/>
-		<property name="username" value="${jdbc.username}"/>
-		<property name="password" value="${jdbc.password}"/>
-	</bean>
-
-	<context:property-placeholder location="jdbc.properties"/>
-----
 
 The following example shows C3P0 configuration:
 
-[source,xml,indent=0,subs="verbatim,quotes"]
+include-code::./ComboPooledDataSourceConfiguration[tag=dataSourceBean,indent=0]
-----
-	<bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
-		<property name="driverClass" value="${jdbc.driverClassName}"/>
-		<property name="jdbcUrl" value="${jdbc.url}"/>
-		<property name="user" value="${jdbc.username}"/>
-		<property name="password" value="${jdbc.password}"/>
-	</bean>
-
-	<context:property-placeholder location="jdbc.properties"/>
-----
-
 
 [[jdbc-DataSourceUtils]]
 == Using `DataSourceUtils`

framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.dataaccess.jdbc.jdbcdatasource;
+
+import org.apache.commons.dbcp2.BasicDataSource;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+class BasicDataSourceConfiguration {
+
+	// tag::dataSourceBean[]
+	@Bean(destroyMethod = "close")
+	BasicDataSource dataSource() {
+		BasicDataSource dataSource = new BasicDataSource();
+		dataSource.setDriverClassName("org.hsqldb.jdbcDriver");
+		dataSource.setUrl("jdbc:hsqldb:hsql://localhost:");
+		dataSource.setUsername("sa");
+		dataSource.setPassword("");
+		return dataSource;
+	}
+	// end::dataSourceBean[]
+
+}

framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.docs.dataaccess.jdbc.jdbcdatasource;
+
+import java.beans.PropertyVetoException;
+
+import com.mchange.v2.c3p0.ComboPooledDataSource;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+class ComboPooledDataSourceConfiguration {
+
+	// tag::dataSourceBean[]
+	@Bean(destroyMethod = "close")
+	ComboPooledDataSource dataSource() throws PropertyVetoException {
+		ComboPooledDataSource dataSource = new ComboPooledDataSource();
+		dataSource.setDriverClass("org.hsqldb.jdbcDriver");
+		dataSource.setJdbcUrl("jdbc:hsqldb:hsql://localhost:");
+		dataSource.setUser("sa");
+		dataSource.setPassword("");
+		return dataSource;
+	}
+	// end::dataSourceBean[]
+
+}

framework-docs/src/main/java/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.dataaccess.jdbc.jdbcdatasource;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+
+@Configuration
+class DriverManagerDataSourceConfiguration {
+
+	// tag::dataSourceBean[]
+	@Bean
+	DriverManagerDataSource dataSource() {
+		DriverManagerDataSource dataSource = new DriverManagerDataSource();
+		dataSource.setDriverClassName("org.hsqldb.jdbcDriver");
+		dataSource.setUrl("jdbc:hsqldb:hsql://localhost:");
+		dataSource.setUsername("sa");
+		dataSource.setPassword("");
+		return dataSource;
+	}
+	// end::dataSourceBean[]
+
+}

framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.kt

@@ -0,0 +1,21 @@
+package org.springframework.docs.dataaccess.jdbc.jdbcdatasource
+
+import org.apache.commons.dbcp2.BasicDataSource
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class BasicDataSourceConfiguration {
+
+	// tag::dataSourceBean[]
+	@Bean(destroyMethod = "close")
+	fun dataSource(): BasicDataSource {
+		val dataSource = BasicDataSource()
+		dataSource.driverClassName = "org.hsqldb.jdbcDriver"
+		dataSource.url = "jdbc:hsqldb:hsql://localhost:"
+		dataSource.username = "sa"
+		dataSource.password = ""
+		return dataSource
+	}
+	// end::dataSourceBean[]
+}

framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.kt

@@ -0,0 +1,22 @@
+package org.springframework.docs.dataaccess.jdbc.jdbcdatasource
+
+import com.mchange.v2.c3p0.ComboPooledDataSource
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+internal class ComboPooledDataSourceConfiguration {
+
+	// tag::dataSourceBean[]
+	@Bean(destroyMethod = "close")
+	fun dataSource(): ComboPooledDataSource {
+		val dataSource = ComboPooledDataSource()
+		dataSource.driverClass = "org.hsqldb.jdbcDriver"
+		dataSource.jdbcUrl = "jdbc:hsqldb:hsql://localhost:"
+		dataSource.user = "sa"
+		dataSource.password = ""
+		return dataSource
+	}
+	// end::dataSourceBean[]
+
+}

framework-docs/src/main/kotlin/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2002-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.docs.dataaccess.jdbc.jdbcdatasource
+
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.jdbc.datasource.DriverManagerDataSource
+
+@Configuration
+class DriverManagerDataSourceConfiguration {
+
+	// tag::dataSourceBean[]
+	@Bean
+	fun dataSource() = DriverManagerDataSource().apply {
+		setDriverClassName("org.hsqldb.jdbcDriver")
+		url = "jdbc:hsqldb:hsql://localhost:"
+		username = "sa"
+		password = ""
+	}
+	// end::dataSourceBean[]
+
+}

framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/BasicDataSourceConfiguration.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:context="http://www.springframework.org/schema/context">
+
+	<!-- tag::dataSourceBean[] -->
+	<bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
+		<property name="driverClassName" value="${jdbc.driverClassName}"/>
+		<property name="url" value="${jdbc.url}"/>
+		<property name="username" value="${jdbc.username}"/>
+		<property name="password" value="${jdbc.password}"/>
+	</bean>
+
+	<context:property-placeholder location="jdbc.properties"/>
+	<!-- end::dataSourceBean[] -->
+</beans>

framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/ComboPooledDataSourceConfiguration.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:context="http://www.springframework.org/schema/context">
+
+	<!-- tag::dataSourceBean[] -->
+	<bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
+		<property name="driverClass" value="${jdbc.driverClassName}"/>
+		<property name="jdbcUrl" value="${jdbc.url}"/>
+		<property name="user" value="${jdbc.username}"/>
+		<property name="password" value="${jdbc.password}"/>
+	</bean>
+
+	<context:property-placeholder location="jdbc.properties"/>
+	<!-- end::dataSourceBean[] -->
+</beans>

framework-docs/src/main/resources/org/springframework/docs/dataaccess/jdbc/jdbcdatasource/DriverManagerDataSourceConfiguration.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:context="http://www.springframework.org/schema/context">
+
+	<!-- tag::dataSourceBean[] -->
+	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+		<property name="driverClassName" value="${jdbc.driverClassName}"/>
+		<property name="url" value="${jdbc.url}"/>
+		<property name="username" value="${jdbc.username}"/>
+		<property name="password" value="${jdbc.password}"/>
+	</bean>
+
+	<context:property-placeholder location="jdbc.properties"/>
+	<!-- end::dataSourceBean[] -->
+</beans>