db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [db-jdo] branch master updated: JDO-786: spring 4.3.28.RELEASE -> 5.2.9.RELEASE
Date Sun, 18 Oct 2020 13:50:56 GMT
This is an automated email from the ASF dual-hosted git repository.

mbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/db-jdo.git


The following commit(s) were added to refs/heads/master by this push:
     new 982e5ee  JDO-786: spring 4.3.28.RELEASE -> 5.2.9.RELEASE
982e5ee is described below

commit 982e5ee79b51b024e002b6b2cf1cab60e469225e
Author: Michael Bouschen <mbo@apache.org>
AuthorDate: Sun Oct 18 15:50:47 2020 +0200

    JDO-786: spring 4.3.28.RELEASE -> 5.2.9.RELEASE
---
 exectck/pom.xml                                    |   4 -
 parent-pom/pom.xml                                 |   7 +-
 tck/pom.xml                                        |   4 -
 .../jdo/tck/pc/company/company1-1Relationships.xml |  28 +++---
 .../jdo/tck/pc/company/company1-MRelationships.xml |  62 ++++++------
 .../jdo/tck/pc/company/companyAllRelationships.xml | 102 +++++++++----------
 .../apache/jdo/tck/pc/company/companyEmbedded.xml  |  48 ++++-----
 .../tck/pc/company/companyForNavigationTests.xml   |  18 ++--
 .../jdo/tck/pc/company/companyForQueryTests.xml    | 109 ++++++++++----------
 .../tck/pc/company/companyForSampleQueriesTest.xml | 110 +++++++++++----------
 .../tck/pc/company/companyForSubqueriesTests.xml   |  74 +++++++-------
 .../jdo/tck/pc/company/companyM-MRelationships.xml |  70 ++++++-------
 .../jdo/tck/pc/company/companyNoRelationships.xml  |  36 +++----
 .../companyListWithoutJoin.xml                     |  40 ++++----
 .../companyMapWithoutJoin.xml                      |  38 +++----
 .../apache/jdo/tck/pc/mylib/mylibForQueryTests.xml |  18 ++--
 .../testdata/org/apache/jdo/tck/pc/order/order.xml |  16 +--
 17 files changed, 399 insertions(+), 385 deletions(-)

diff --git a/exectck/pom.xml b/exectck/pom.xml
index 58a675e..1648fe4 100644
--- a/exectck/pom.xml
+++ b/exectck/pom.xml
@@ -100,10 +100,6 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
         </dependency>
         <dependency>
diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml
index 5aef202..bd0cd4d 100644
--- a/parent-pom/pom.xml
+++ b/parent-pom/pom.xml
@@ -108,13 +108,8 @@ Requests (JSR 12 and 243) under the auspices of the Java Community Process.</des
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>4.3.28.RELEASE</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>4.3.28.RELEASE</version>
+        <version>5.2.9.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>commons-collections</groupId>
diff --git a/tck/pom.xml b/tck/pom.xml
index 744e9e6..28a9dfb 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -226,10 +226,6 @@
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
         </dependency>
         <dependency>
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml
index 3f11ed7..8e4ac08 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml
@@ -15,25 +15,27 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<beans>
     <description>Company instances for CompletenessTest with 1-1 relationships</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="company1"/>
-                <ref local="dept1"/>
-                <ref local="dept2"/>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
-                <ref local="proj1"/>
-                <ref local="proj2"/>
-                <ref local="proj3"/>
+                <ref bean="company1"/>
+                <ref bean="dept1"/>
+                <ref bean="dept2"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
+                <ref bean="proj1"/>
+                <ref bean="proj2"/>
+                <ref bean="proj3"/>
             </list>
         </constructor-arg>
     </bean>
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml
index d55a294..81848e8 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml
@@ -15,22 +15,24 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<beans>
     <description>Company instances for CompletenessTest with 1-m relationships</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="company1"/>
-                <ref local="medicalIns1"/>
-                <ref local="medicalIns2"/>
-                <ref local="medicalIns3"/>
-                <ref local="dentalIns1"/>
-                <ref local="proj1"/>
-                <ref local="proj2"/>
-                <ref local="proj3"/>
+                <ref bean="company1"/>
+                <ref bean="medicalIns1"/>
+                <ref bean="medicalIns2"/>
+                <ref bean="medicalIns3"/>
+                <ref bean="dentalIns1"/>
+                <ref bean="proj1"/>
+                <ref bean="proj2"/>
+                <ref bean="proj3"/>
             </list>
         </constructor-arg>
     </bean>
@@ -41,8 +43,8 @@
         <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
         <property name="departments">
             <set>
-                <ref local="dept1"/>
-                <ref local="dept2"/>
+                <ref bean="dept1"/>
+                <ref bean="dept2"/>
             </set>
         </property>
     </bean>
@@ -53,15 +55,15 @@
         <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
         <property name="fundedEmps">
             <set>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
     </bean>
@@ -72,15 +74,15 @@
         <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
         <property name="fundedEmps">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp1"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
     </bean>
@@ -113,10 +115,10 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="team">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp1"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
     </bean>
@@ -160,10 +162,10 @@
         <property name="manager"><ref bean="emp2"/></property>
         <property name="hradvisees">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
             </set>
         </property>
     </bean>
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml
index 8760988..6c19feb 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml
@@ -15,15 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+    
     <description>Company instances for CompletenessTest with all relationships</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="company1"/>
+                <ref bean="company1"/>
             </list>
         </constructor-arg>
     </bean>
@@ -32,11 +34,11 @@
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Sun Microsystems, Inc.</value></constructor-arg>
         <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
-        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr1"/></constructor-arg>
         <property name="departments">
             <set>
-                <ref local="dept1"/>
-                <ref local="dept2"/>
+                <ref bean="dept1"/>
+                <ref bean="dept2"/>
             </set>
         </property>
     </bean>
@@ -48,15 +50,15 @@
         <property name="employeeOfTheMonth"><ref bean="emp1"/></property>
         <property name="employees">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
         <property name="fundedEmps">
             <set>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
     </bean>
@@ -67,15 +69,15 @@
         <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
         <property name="fundedEmps">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp1"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
     </bean>
@@ -86,7 +88,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp1Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp1Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>10/Jun/1970</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr1"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jan/1999</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>20000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -106,12 +108,12 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="reviewedProjects">
             <set>
-                <ref local="proj3"/>
+                <ref bean="proj3"/>
             </set>
         </property>
         <property name="projects">
             <set>
-                <ref local="proj1"/>
+                <ref bean="proj1"/>
             </set>
         </property>
     </bean>
@@ -121,7 +123,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp2Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp2Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>22/Dec/1975</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr2"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr2"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jul/2003</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>10000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -140,16 +142,16 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="projects">
             <set>
-                <ref local="proj1"/>
-                <ref local="proj2"/>
+                <ref bean="proj1"/>
+                <ref bean="proj2"/>
             </set>
         </property>
         <property name="team">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp1"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
     </bean>
@@ -159,7 +161,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp3Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp3Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>15</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
@@ -179,8 +181,8 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="projects">
             <set>
-                <ref local="proj1"/>
-                <ref local="proj2"/>
+                <ref bean="proj1"/>
+                <ref bean="proj2"/>
             </set>
         </property>
     </bean>
@@ -190,7 +192,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp4Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp4Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>13</value></constructor-arg>
         <property name="medicalInsurance"><ref bean="medicalIns4"/></property>
@@ -209,12 +211,12 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="projects">
             <set>
-                <ref local="proj3"/>
+                <ref bean="proj3"/>
             </set>
         </property>
         <property name="reviewedProjects">
             <set>
-                <ref local="proj2"/>
+                <ref bean="proj2"/>
             </set>
         </property>
     </bean>
@@ -224,7 +226,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp5Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp5Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Jul/1962</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/1998</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>45000</value></constructor-arg>
         <property name="medicalInsurance"><ref bean="medicalIns5"/></property>
@@ -242,20 +244,20 @@
         <property name="protege"><ref bean="emp4"/></property>
         <property name="projects">
             <set>
-                <ref local="proj3"/>
+                <ref bean="proj3"/>
             </set>
         </property>
         <property name="reviewedProjects">
             <set>
-                <ref local="proj2"/>
+                <ref bean="proj2"/>
             </set>
         </property>
         <property name="hradvisees">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
             </set>
         </property>
     </bean>
@@ -361,9 +363,9 @@
         <constructor-arg index="2" type="java.math.BigDecimal"><value>2500000.99</value></constructor-arg>
         <property name="members">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
     </bean>
@@ -373,14 +375,14 @@
         <constructor-arg index="2" type="java.math.BigDecimal"><value>50000.00</value></constructor-arg>
         <property name="reviewers">
             <set>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
         <property name="members">
             <set>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
     </bean>
@@ -390,13 +392,13 @@
         <constructor-arg index="2" type="java.math.BigDecimal"><value>2000.99</value></constructor-arg>
         <property name="reviewers">
             <set>
-                <ref local="emp1"/>
+                <ref bean="emp1"/>
             </set>
         </property>
         <property name="members">
             <set>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
     </bean>
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml
index ed374e1..8d729bd 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml
@@ -15,29 +15,31 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<beans>
     <description>Company instances for CompletenessTest with embedded relationships</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="company1"/>
-                <ref local="dept1"/>
-                <ref local="dept2"/>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
-                <ref local="medicalIns1"/>
-                <ref local="medicalIns2"/>
-                <ref local="medicalIns3"/>
-                <ref local="dentalIns1"/>
-                <ref local="proj1"/>
-                <ref local="proj2"/>
-                <ref local="proj3"/>
+                <ref bean="company1"/>
+                <ref bean="dept1"/>
+                <ref bean="dept2"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
+                <ref bean="medicalIns1"/>
+                <ref bean="medicalIns2"/>
+                <ref bean="medicalIns3"/>
+                <ref bean="dentalIns1"/>
+                <ref bean="proj1"/>
+                <ref bean="proj2"/>
+                <ref bean="proj3"/>
             </list>
         </constructor-arg>
     </bean>
@@ -46,7 +48,7 @@
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Sun Microsystems, Inc.</value></constructor-arg>
         <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
-        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr1"/></constructor-arg>
     </bean>
 
     <bean id="dept1" factory-bean="companyFactory" factory-method="newDepartment">
@@ -65,7 +67,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp1Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp1Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>10/Jun/1970</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr1"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jan/1999</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>20000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -82,7 +84,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp2Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp2Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>22/Dec/1975</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr2"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr2"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jul/2003</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>10000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -99,7 +101,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp3Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp3Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>15</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
@@ -116,7 +118,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp4Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp4Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>13</value></constructor-arg>
         <property name="phoneNumbers">
@@ -132,7 +134,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp5Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp5Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Jul/1962</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/1998</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>45000</value></constructor-arg>
         <property name="phoneNumbers">
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForNavigationTests.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForNavigationTests.xml
index 9155fb2..3a1354e 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForNavigationTests.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForNavigationTests.xml
@@ -15,17 +15,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<beans>
     <description>Company instances for navigation query testing</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="company1"/>
-                <ref local="medicalIns98"/>
-                <ref local="dentalIns99"/>
+                <ref bean="company1"/>
+                <ref bean="medicalIns98"/>
+                <ref bean="dentalIns99"/>
             </list>
         </constructor-arg>
     </bean>
@@ -34,11 +36,11 @@
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Sun Microsystems, Inc.</value></constructor-arg>
         <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
-        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr1"/></constructor-arg>
         <property name="departments">
             <set>
-                <ref local="dept1"/>
-                <ref local="dept2"/>
+                <ref bean="dept1"/>
+                <ref bean="dept2"/>
             </set>
         </property>
     </bean>
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml
index 2da0d76..5282530 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml
@@ -15,16 +15,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+ <beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<beans>
     <description>Company instances for query testing</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="company1"/>
-                <ref local="dentalIns99"/>
+                <ref bean="company1"/>
+                <ref bean="dentalIns99"/>
             </list>
         </constructor-arg>
     </bean>
@@ -33,11 +35,11 @@
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Sun Microsystems, Inc.</value></constructor-arg>
         <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
-        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr1"/></constructor-arg>
         <property name="departments">
             <set>
-                <ref local="dept1"/>
-                <ref local="dept2"/>
+                <ref bean="dept1"/>
+                <ref bean="dept2"/>
             </set>
         </property>
     </bean>
@@ -61,22 +63,22 @@
         <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
         <property name="fundedEmps">
             <set>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
         <property name="meetingRooms">
             <list>
-                <ref local="room1"/>
-                <ref local="room2"/>
-                <ref local="room3"/>
+                <ref bean="room1"/>
+                <ref bean="room2"/>
+                <ref bean="room3"/>
             </list>
         </property>
     </bean>
@@ -87,15 +89,15 @@
         <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
         <property name="fundedEmps">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp1"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
         <property name="meetingRooms">
@@ -110,7 +112,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp1Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp1Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>10/Jun/1970</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr1"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jan/1999</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>20000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -130,12 +132,12 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="reviewedProjects">
             <set>
-                <ref local="proj3"/>
+                <ref bean="proj3"/>
             </set>
         </property>
         <property name="projects">
             <set>
-                <ref local="proj1"/>
+                <ref bean="proj1"/>
             </set>
         </property>
     </bean>
@@ -145,7 +147,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp2Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp2Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>22/Dec/1975</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr2"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr2"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jul/2003</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>10000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -164,16 +166,16 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="projects">
             <set>
-                <ref local="proj1"/>
-                <ref local="proj2"/>
+                <ref bean="proj1"/>
+                <ref bean="proj2"/>
             </set>
         </property>
         <property name="team">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp1"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
     </bean>
@@ -183,7 +185,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp3Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp3Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>15</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
@@ -203,8 +205,8 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="projects">
             <set>
-                <ref local="proj1"/>
-                <ref local="proj2"/>
+                <ref bean="proj1"/>
+                <ref bean="proj2"/>
             </set>
         </property>
     </bean>
@@ -214,7 +216,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp4Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp4Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>13</value></constructor-arg>
         <property name="medicalInsurance"><ref bean="medicalIns4"/></property>
@@ -233,12 +235,12 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="projects">
             <set>
-                <ref local="proj3"/>
+                <ref bean="proj3"/>
             </set>
         </property>
         <property name="reviewedProjects">
             <set>
-                <ref local="proj2"/>
+                <ref bean="proj2"/>
             </set>
         </property>
     </bean>
@@ -248,7 +250,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp5Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp5Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Jul/1962</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/1998</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>45000</value></constructor-arg>
         <property name="medicalInsurance"><ref bean="medicalIns5"/></property>
@@ -266,20 +268,20 @@
         <property name="protege"><ref bean="emp4"/></property>
         <property name="projects">
             <set>
-                <ref local="proj3"/>
+                <ref bean="proj3"/>
             </set>
         </property>
         <property name="reviewedProjects">
             <set>
-                <ref local="proj2"/>
+                <ref bean="proj2"/>
             </set>
         </property>
         <property name="hradvisees">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
             </set>
         </property>
     </bean>
@@ -391,9 +393,9 @@
         <constructor-arg index="2" type="java.math.BigDecimal"><value>2500000.99</value></constructor-arg>
         <property name="members">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
     </bean>
@@ -403,14 +405,14 @@
         <constructor-arg index="2" type="java.math.BigDecimal"><value>50000.00</value></constructor-arg>
         <property name="reviewers">
             <set>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
         <property name="members">
             <set>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
     </bean>
@@ -420,15 +422,16 @@
         <constructor-arg index="2" type="java.math.BigDecimal"><value>2000.99</value></constructor-arg>
         <property name="reviewers">
             <set>
-                <ref local="emp1"/>
+                <ref bean="emp1"/>
             </set>
         </property>
         <property name="members">
             <set>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
     </bean>
+
 </beans>
 
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForSampleQueriesTest.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForSampleQueriesTest.xml
index 729a966..66ec3cd 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForSampleQueriesTest.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForSampleQueriesTest.xml
@@ -15,16 +15,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<beans>
     <description>Company instances for query testing</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="company1"/>
-                <ref local="dentalIns99"/>
+                <ref bean="company1"/>
+                <ref bean="dentalIns99"/>
             </list>
         </constructor-arg>
     </bean>
@@ -33,12 +35,12 @@
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Sun Microsystems, Inc.</value></constructor-arg>
         <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
-        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr1"/></constructor-arg>
         <property name="departments">
             <set>
-                <ref local="dept1"/>
-                <ref local="dept2"/>
-                <ref local="dept3"/>
+                <ref bean="dept1"/>
+                <ref bean="dept2"/>
+                <ref bean="dept3"/>
             </set>
         </property>
     </bean>
@@ -62,22 +64,22 @@
         <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
         <property name="fundedEmps">
             <set>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
         <property name="meetingRooms">
             <list>
-                <ref local="room1"/>
-                <ref local="room2"/>
-                <ref local="room3"/>
+                <ref bean="room1"/>
+                <ref bean="room2"/>
+                <ref bean="room3"/>
             </list>
         </property>
     </bean>
@@ -88,15 +90,15 @@
         <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
         <property name="fundedEmps">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp1"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
         <property name="meetingRooms">
@@ -129,7 +131,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>Bouschn</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value></value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>10/Jun/1970</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr1"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jan/1999</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>40000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -149,12 +151,12 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="reviewedProjects">
             <set>
-                <ref local="proj3"/>
+                <ref bean="proj3"/>
             </set>
         </property>
         <property name="projects">
             <set>
-                <ref local="proj1"/>
+                <ref bean="proj1"/>
             </set>
         </property>
     </bean>
@@ -164,7 +166,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>L.</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>Russell</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>22/Dec/1975</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr2"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr2"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jul/2003</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>50000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -183,16 +185,16 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="projects">
             <set>
-                <ref local="proj1"/>
-                <ref local="proj2"/>
+                <ref bean="proj1"/>
+                <ref bean="proj2"/>
             </set>
         </property>
         <property name="team">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp1"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
     </bean>
@@ -202,7 +204,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>Doe</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value></value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>15</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
@@ -222,8 +224,8 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="projects">
             <set>
-                <ref local="proj1"/>
-                <ref local="proj2"/>
+                <ref bean="proj1"/>
+                <ref bean="proj2"/>
             </set>
         </property>
     </bean>
@@ -233,7 +235,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>Roe</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value></value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>13</value></constructor-arg>
         <property name="medicalInsurance"><ref bean="medicalIns4"/></property>
@@ -252,12 +254,12 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="projects">
             <set>
-                <ref local="proj3"/>
+                <ref bean="proj3"/>
             </set>
         </property>
         <property name="reviewedProjects">
             <set>
-                <ref local="proj2"/>
+                <ref bean="proj2"/>
             </set>
         </property>
     </bean>
@@ -267,7 +269,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>Zäschke</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value></value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Jul/1979</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/1999</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>45000</value></constructor-arg>
         <property name="medicalInsurance"><ref bean="medicalIns5"/></property>
@@ -285,20 +287,20 @@
         <property name="protege"><ref bean="emp4"/></property>
         <property name="projects">
             <set>
-                <ref local="proj3"/>
+                <ref bean="proj3"/>
             </set>
         </property>
         <property name="reviewedProjects">
             <set>
-                <ref local="proj2"/>
+                <ref bean="proj2"/>
             </set>
         </property>
         <property name="hradvisees">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
             </set>
         </property>
     </bean>
@@ -410,9 +412,9 @@
         <constructor-arg index="2" type="java.math.BigDecimal"><value>2500000.99</value></constructor-arg>
         <property name="members">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
     </bean>
@@ -422,14 +424,14 @@
         <constructor-arg index="2" type="java.math.BigDecimal"><value>50000.00</value></constructor-arg>
         <property name="reviewers">
             <set>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
         <property name="members">
             <set>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
     </bean>
@@ -439,13 +441,13 @@
         <constructor-arg index="2" type="java.math.BigDecimal"><value>2000.99</value></constructor-arg>
         <property name="reviewers">
             <set>
-                <ref local="emp1"/>
+                <ref bean="emp1"/>
             </set>
         </property>
         <property name="members">
             <set>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
     </bean>
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml
index 0fd109a..fcfcc51 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyForSubqueriesTests.xml
@@ -15,15 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<beans>
     <description>Company instances for query testing</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="company1"/>
+                <ref bean="company1"/>
             </list>
         </constructor-arg>
     </bean>
@@ -32,11 +34,11 @@
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Sun Microsystems, Inc.</value></constructor-arg>
         <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
-        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr1"/></constructor-arg>
         <property name="departments">
             <set>
-                <ref local="dept1"/>
-                <ref local="dept2"/>
+                <ref bean="dept1"/>
+                <ref bean="dept2"/>
             </set>
         </property>
     </bean>
@@ -60,18 +62,18 @@
         <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
-                <ref local="emp6"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
+                <ref bean="emp6"/>
             </set>
         </property>
         <property name="meetingRooms">
             <list>
-                <ref local="room1"/>
-                <ref local="room2"/>
+                <ref bean="room1"/>
+                <ref bean="room2"/>
             </list>
         </property>
     </bean>
@@ -82,15 +84,15 @@
         <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
-                <ref local="emp7"/>
-                <ref local="emp8"/>
-                <ref local="emp9"/>
-                <ref local="emp10"/>
+                <ref bean="emp7"/>
+                <ref bean="emp8"/>
+                <ref bean="emp9"/>
+                <ref bean="emp10"/>
             </set>
         </property>
         <property name="meetingRooms">
             <list>
-                <ref local="room3"/>
+                <ref bean="room3"/>
             </list>
         </property>
     </bean>
@@ -101,7 +103,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp1Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp1Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>10/Jun/1970</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr1"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jan/1999</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>30000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -109,9 +111,9 @@
         <property name="manager"><null/></property>
         <property name="team">
             <set>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-                <ref local="emp10"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
+                <ref bean="emp10"/>
             </set>
         </property>
     </bean>
@@ -121,7 +123,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp2Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp2Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>22/Dec/1975</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr2"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr2"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jul/2003</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>20000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -135,7 +137,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp3Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp3Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>10000</value></constructor-arg>
         <property name="weeklyhours"><value>25</value></property>
@@ -149,7 +151,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp4Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp4Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr2"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr2"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>25000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -157,8 +159,8 @@
         <property name="manager"><null/></property>
         <property name="team">
             <set>
-                <ref local="emp5"/>
-                <ref local="emp6"/>
+                <ref bean="emp5"/>
+                <ref bean="emp6"/>
             </set>
         </property>
     </bean>
@@ -168,7 +170,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp5Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp5Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Jul/1962</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr2"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr2"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Nov/2002</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>18000</value></constructor-arg>
         <property name="weeklyhours"><value>35</value></property>
@@ -182,7 +184,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp6Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp6Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>10/Jun/1969</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jun/2002</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>22000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -196,7 +198,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp7Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp7Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>10/Jun/1970</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr1"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr1"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Jan/2000</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>40000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
@@ -204,8 +206,8 @@
         <property name="manager"><null/></property>
         <property name="team">
             <set>
-                <ref local="emp8"/>
-                <ref local="emp9"/>
+                <ref bean="emp8"/>
+                <ref bean="emp9"/>
             </set>
         </property>
     </bean>
@@ -215,7 +217,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp8Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp8Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>22/Dec/1975</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr2"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr2"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Aug/2003</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>10000</value></constructor-arg>
         <property name="weeklyhours"><value>15</value></property>
@@ -229,7 +231,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp9Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp9Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/May/2002</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>12000</value></constructor-arg>
         <property name="weeklyhours"><value>20</value></property>
@@ -243,7 +245,7 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp10Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp10Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref local="addr3"/></constructor-arg>
+        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.IAddress"><ref bean="addr3"/></constructor-arg>
         <constructor-arg index="6" type="java.util.Date"><value>1/Oct/2002</value></constructor-arg>
         <constructor-arg index="7" type="double"><value>24000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml
index 088e391..76cb8fa 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml
@@ -15,26 +15,28 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<beans>
     <description>Company instances for CompletenessTest with m-m relationships</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="company1"/>
-                <ref local="dept1"/>
-                <ref local="dept2"/>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
-                <ref local="medicalIns1"/>
-                <ref local="medicalIns2"/>
-                <ref local="medicalIns3"/>
-                <ref local="dentalIns1"/>
+                <ref bean="company1"/>
+                <ref bean="dept1"/>
+                <ref bean="dept2"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
+                <ref bean="medicalIns1"/>
+                <ref bean="medicalIns2"/>
+                <ref bean="medicalIns3"/>
+                <ref bean="dentalIns1"/>
             </list>
         </constructor-arg>
     </bean>
@@ -66,12 +68,12 @@
         <property name="weeklyhours"><value>40</value></property>
         <property name="reviewedProjects">
             <set>
-                <ref local="proj3"/>
+                <ref bean="proj3"/>
             </set>
         </property>
         <property name="projects">
             <set>
-                <ref local="proj1"/>
+                <ref bean="proj1"/>
             </set>
         </property>
     </bean>
@@ -86,8 +88,8 @@
         <property name="weeklyhours"><value>40</value></property>
         <property name="projects">
             <set>
-                <ref local="proj1"/>
-                <ref local="proj2"/>
+                <ref bean="proj1"/>
+                <ref bean="proj2"/>
             </set>
         </property>
     </bean>
@@ -102,8 +104,8 @@
         <property name="weeklyhours"><value>19</value></property>
         <property name="projects">
             <set>
-                <ref local="proj1"/>
-                <ref local="proj2"/>
+                <ref bean="proj1"/>
+                <ref bean="proj2"/>
             </set>
         </property>
     </bean>
@@ -117,12 +119,12 @@
         <constructor-arg index="6" type="double"><value>13</value></constructor-arg>
         <property name="projects">
             <set>
-                <ref local="proj3"/>
+                <ref bean="proj3"/>
             </set>
         </property>
         <property name="reviewedProjects">
             <set>
-                <ref local="proj2"/>
+                <ref bean="proj2"/>
             </set>
         </property>
     </bean>
@@ -136,12 +138,12 @@
         <constructor-arg index="6" type="double"><value>45000</value></constructor-arg>
         <property name="projects">
             <set>
-                <ref local="proj3"/>
+                <ref bean="proj3"/>
             </set>
         </property>
         <property name="reviewedProjects">
             <set>
-                <ref local="proj2"/>
+                <ref bean="proj2"/>
             </set>
         </property>
     </bean>
@@ -201,9 +203,9 @@
         <constructor-arg index="2" type="java.math.BigDecimal"><value>2500000.99</value></constructor-arg>
         <property name="members">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
     </bean>
@@ -213,14 +215,14 @@
         <constructor-arg index="2" type="java.math.BigDecimal"><value>50000.00</value></constructor-arg>
         <property name="reviewers">
             <set>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
         <property name="members">
             <set>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </set>
         </property>
     </bean>
@@ -230,13 +232,13 @@
         <constructor-arg index="2" type="java.math.BigDecimal"><value>2000.99</value></constructor-arg>
         <property name="reviewers">
             <set>
-                <ref local="emp1"/>
+                <ref bean="emp1"/>
             </set>
         </property>
         <property name="members">
             <set>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
     </bean>
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml
index 8a7ad76..8e107ab 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml
@@ -15,29 +15,31 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<beans>
     <description>Company instances for CompletenessTest with no relationships</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="company1"/>
-                <ref local="dept1"/>
-                <ref local="dept2"/>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
-                <ref local="medicalIns1"/>
-                <ref local="medicalIns2"/>
-                <ref local="medicalIns3"/>
-                <ref local="dentalIns1"/>
-                <ref local="proj1"/>
-                <ref local="proj2"/>
-                <ref local="proj3"/>
+                <ref bean="company1"/>
+                <ref bean="dept1"/>
+                <ref bean="dept2"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
+                <ref bean="medicalIns1"/>
+                <ref bean="medicalIns2"/>
+                <ref bean="medicalIns3"/>
+                <ref bean="dentalIns1"/>
+                <ref bean="proj1"/>
+                <ref bean="proj2"/>
+                <ref bean="proj3"/>
             </list>
         </constructor-arg>
     </bean>
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/companyListWithoutJoin/companyListWithoutJoin.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/companyListWithoutJoin/companyListWithoutJoin.xml
index 5067f21..1742da2 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/companyListWithoutJoin/companyListWithoutJoin.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/companyListWithoutJoin/companyListWithoutJoin.xml
@@ -15,15 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+    
     <description>Company instances for CompletenessTest with Map without join table</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="company1"/>
+                <ref bean="company1"/>
             </list>
         </constructor-arg>
     </bean>
@@ -34,8 +36,8 @@
         <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
         <property name="departments">
             <set>
-                <ref local="dept1"/>
-                <ref local="dept2"/>
+                <ref bean="dept1"/>
+                <ref bean="dept2"/>
             </set>
         </property>
     </bean>
@@ -46,9 +48,9 @@
         <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <list>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
             </list>
         </property>
     </bean>
@@ -59,8 +61,8 @@
         <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <list>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </list>
         </property>
     </bean>
@@ -93,10 +95,10 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="team">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp1"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
     </bean>
@@ -140,10 +142,10 @@
         <property name="manager"><ref bean="emp2"/></property>
         <property name="hradvisees">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
             </set>
         </property>
     </bean>
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/companyMapWithoutJoin/companyMapWithoutJoin.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/companyMapWithoutJoin/companyMapWithoutJoin.xml
index eb6f611..3404f22 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/companyMapWithoutJoin/companyMapWithoutJoin.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/companyMapWithoutJoin/companyMapWithoutJoin.xml
@@ -15,15 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<beans>
     <description>Company instances for CompletenessTest with Map without join table</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="company1"/>
+                <ref bean="company1"/>
             </list>
         </constructor-arg>
     </bean>
@@ -34,8 +36,8 @@
         <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
         <property name="departments">
             <set>
-                <ref local="dept1"/>
-                <ref local="dept2"/>
+                <ref bean="dept1"/>
+                <ref bean="dept2"/>
             </set>
         </property>
     </bean>
@@ -47,13 +49,13 @@
         <property name="roles">
             <map>
                 <entry key="role1">
-                    <ref local="emp1"/>
+                    <ref bean="emp1"/>
                 </entry>
                 <entry key="role2">
-                    <ref local="emp2"/>
+                    <ref bean="emp2"/>
                 </entry>
                 <entry key="role3">
-                    <ref local="emp3"/>
+                    <ref bean="emp3"/>
                 </entry>
             </map>
         </property>
@@ -66,10 +68,10 @@
         <property name="roles">
             <map>
                 <entry key="role4">
-                    <ref local="emp4"/>
+                    <ref bean="emp4"/>
                 </entry>
                 <entry key="role5">
-                    <ref local="emp5"/>
+                    <ref bean="emp5"/>
                 </entry>
             </map>
         </property>
@@ -105,10 +107,10 @@
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="team">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
-                <ref local="emp5"/>
+                <ref bean="emp1"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
+                <ref bean="emp5"/>
             </set>
         </property>
     </bean>
@@ -155,10 +157,10 @@
         <property name="manager"><ref bean="emp2"/></property>
         <property name="hradvisees">
             <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-                <ref local="emp4"/>
+                <ref bean="emp1"/>
+                <ref bean="emp2"/>
+                <ref bean="emp3"/>
+                <ref bean="emp4"/>
             </set>
         </property>
     </bean>
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/mylib/mylibForQueryTests.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/mylib/mylibForQueryTests.xml
index fe56b99..f79c2e4 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/mylib/mylibForQueryTests.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/mylib/mylibForQueryTests.xml
@@ -15,19 +15,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-    <description>Mylib instances for query testing</description>
+ <beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="primitiveTypesPositive"/>
-                <ref local="primitiveTypesNegative"/>
-                <ref local="pcClass1"/>
-                <ref local="pcClass2"/>
-                <ref local="primitiveTypesCharacterStringLiterals"/>
+                <ref bean="primitiveTypesPositive"/>
+                <ref bean="primitiveTypesNegative"/>
+                <ref bean="pcClass1"/>
+                <ref bean="pcClass2"/>
+                <ref bean="primitiveTypesCharacterStringLiterals"/>
             </list>
         </constructor-arg>
     </bean>
diff --git a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/order/order.xml b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/order/order.xml
index 0dd7ab6..82d0a6a 100644
--- a/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/order/order.xml
+++ b/tck/src/main/resources/testdata/org/apache/jdo/tck/pc/order/order.xml
@@ -15,15 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<beans>
     <description>Order instances for CompletenessTest of compound identity</description>
 
     <bean id="root" class="java.util.ArrayList">
         <constructor-arg index="0">
             <list>
-                <ref local="order1"/>
+                <ref bean="order1"/>
             </list>
         </constructor-arg>
     </bean>
@@ -33,15 +35,15 @@
         <constructor-arg index="1" type="long"><value>3</value></constructor-arg>
         <property name="items">
             <set>
-                <ref local="item1"/>
-                <ref local="item2"/>
+                <ref bean="item1"/>
+                <ref bean="item2"/>
             </set>
         </property>
     </bean>
 
     <bean id="item1" factory-bean="orderFactory" factory-method="newOrderItem">
         <constructor-arg index="0" type="org.apache.jdo.tck.pc.order.Order">
-            <ref local="order1"/></constructor-arg>
+            <ref bean="order1"/></constructor-arg>
         <constructor-arg index="1" type="long" ><value>1</value>
         </constructor-arg>
         <constructor-arg index="2" type="java.lang.String" >
@@ -52,7 +54,7 @@
 
     <bean id="item2" factory-bean="orderFactory" factory-method="newOrderItem">
         <constructor-arg index="0" type="org.apache.jdo.tck.pc.order.Order">
-            <ref local="order1"/></constructor-arg>
+            <ref bean="order1"/></constructor-arg>
         <constructor-arg index="1" type="long" ><value>1</value>
         </constructor-arg>
         <constructor-arg index="2" type="java.lang.String" >


Mime
View raw message