Skip to content

Commit f58d0f6

Browse files
jhoellerjhoeller
committed
Consistent namespace element declarations
1 parent c1b6bfb commit f58d0f6

8 files changed

+36
-36
lines changed

‎spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-default-and-anonymous-datasource.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd">
66

77
<jdbc:embedded-database>
8-
<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql" />
9-
<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
8+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
9+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
1010
</jdbc:embedded-database>
1111

1212
</beans>

‎spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-explicit.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans:beans xmlns:beans="http://www.springframework.org/schema/beans" xmlns="http://www.springframework.org/schema/jdbc"
2+
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
55
http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd">
66

7-
<embedded-database id="dataSource" database-name="customDbName">
8-
<script location="classpath:org/springframework/jdbc/config/db-schema.sql" />
9-
<script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
10-
</embedded-database>
7+
<jdbc:embedded-database id="dataSource" database-name="customDbName">
8+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
9+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
10+
</jdbc:embedded-database>
1111

12-
</beans:beans>
12+
</beans>

‎spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-generated.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans:beans xmlns:beans="http://www.springframework.org/schema/beans" xmlns="http://www.springframework.org/schema/jdbc"
2+
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
55
http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd">
66

7-
<embedded-database id="dataSource" database-name="shouldBeOverriddenByGeneratedName" generate-name="true">
8-
<script location="classpath:org/springframework/jdbc/config/db-schema.sql" />
9-
<script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
10-
</embedded-database>
7+
<jdbc:embedded-database id="dataSource" database-name="shouldBeOverriddenByGeneratedName" generate-name="true">
8+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
9+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
10+
</jdbc:embedded-database>
1111

12-
</beans:beans>
12+
</beans>

‎spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-implicit.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans:beans xmlns:beans="http://www.springframework.org/schema/beans" xmlns="http://www.springframework.org/schema/jdbc"
2+
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
55
http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd">
66

7-
<embedded-database id="dataSource">
8-
<script location="classpath:org/springframework/jdbc/config/db-schema.sql" />
9-
<script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
10-
</embedded-database>
7+
<jdbc:embedded-database id="dataSource">
8+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
9+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
10+
</jdbc:embedded-database>
1111

12-
</beans:beans>
12+
</beans>

‎spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
xsi:schemaLocation="http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
66
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
77

8-
<jdbc:embedded-database id="firstDataSource" />
9-
<jdbc:embedded-database id="secondDataSource" />
8+
<jdbc:embedded-database id="firstDataSource"/>
9+
10+
<jdbc:embedded-database id="secondDataSource"/>
1011

1112
</beans>

‎spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd">
66

77
<jdbc:embedded-database id="dataSource" type="HSQL">
8-
<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql" />
9-
<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
8+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
9+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
1010
</jdbc:embedded-database>
1111

1212
<jdbc:embedded-database id="h2DataSource" type="H2">
13-
<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql" />
14-
<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
13+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema.sql"/>
14+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
1515
</jdbc:embedded-database>
1616

1717
<jdbc:embedded-database id="derbyDataSource" type="DERBY">
18-
<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema-derby.sql" />
19-
<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql" />
18+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-schema-derby.sql"/>
19+
<jdbc:script location="classpath:org/springframework/jdbc/config/db-test-data.sql"/>
2020
</jdbc:embedded-database>
2121

2222
</beans>

‎spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-expression-config.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
66
http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.1.xsd">
77

8-
<jdbc:embedded-database id="dataSource" type="HSQL" />
8+
<jdbc:embedded-database id="dataSource" type="HSQL"/>
99

1010
<jdbc:initialize-database data-source="dataSource" enabled="#{properties['data.source.init']}">
11-
<jdbc:script location="#{properties['schema.scripts']}" />
12-
<jdbc:script location="#{properties['insert.scripts']}" />
11+
<jdbc:script location="#{properties['schema.scripts']}"/>
12+
<jdbc:script location="#{properties['insert.scripts']}"/>
1313
</jdbc:initialize-database>
1414

1515
<util:properties id="properties">

‎spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-initialize-placeholder-config.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
55
http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
66

7-
<jdbc:embedded-database id="dataSource" type="HSQL" />
7+
<jdbc:embedded-database id="dataSource" type="HSQL"/>
88

99
<jdbc:initialize-database data-source="dataSource" enabled="${data.source.init}">
10-
<jdbc:script location="${schema.scripts}" />
11-
<jdbc:script location="${insert.scripts}" />
10+
<jdbc:script location="${schema.scripts}"/>
11+
<jdbc:script location="${insert.scripts}"/>
1212
</jdbc:initialize-database>
1313

14-
<bean
15-
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
14+
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
1615
<property name="properties">
1716
<value>
1817
schema.scripts=classpath:org/springframework/jdbc/config/db-schema.sql

0 commit comments

Comments
 (0)