db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r279234 [2/2] - in /incubator/jdo/trunk/tck20/test: java/org/apache/jdo/tck/mapping/ java/org/apache/jdo/tck/pc/company/ testdata/org/apache/jdo/tck/pc/company/
Date Wed, 07 Sep 2005 04:00:23 GMT
Modified: incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml?rev=279234&r1=279233&r2=279234&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml
(original)
+++ incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml
Tue Sep  6 21:00:18 2005
@@ -23,23 +23,23 @@
         </constructor-arg>
     </bean>
 
-    <bean id="company1" class="org.apache.jdo.tck.pc.company.Company">
+    <bean id="company1" factory-bean="companyFactory" factory-method="newCompany">
         <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>
     </bean>
 
-    <bean id="dept1" class="org.apache.jdo.tck.pc.company.Department">
+    <bean id="dept1" factory-bean="companyFactory" factory-method="newDepartment">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String" ><value>Development</value></constructor-arg>
     </bean>
 
-    <bean id="dept2" class="org.apache.jdo.tck.pc.company.Department">
+    <bean id="dept2" factory-bean="companyFactory" factory-method="newDepartment">
         <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String" ><value>Human Resources</value></constructor-arg>
     </bean>
 
-    <bean id="emp1" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
+    <bean id="emp1" factory-bean="companyFactory" factory-method="newFullTimeEmployee">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>emp1First</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>emp1Last</value></constructor-arg>
@@ -59,7 +59,7 @@
             </set>
         </property>
     </bean>
-    <bean id="emp2" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
+    <bean id="emp2" factory-bean="companyFactory" factory-method="newFullTimeEmployee">
         <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>emp2First</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>emp2Last</value></constructor-arg>
@@ -75,7 +75,7 @@
             </set>
         </property>
     </bean>
-    <bean id="emp3" class="org.apache.jdo.tck.pc.company.PartTimeEmployee">
+    <bean id="emp3" factory-bean="companyFactory" factory-method="newPartTimeEmployee">
         <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>emp3First</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>emp3Last</value></constructor-arg>
@@ -91,7 +91,7 @@
             </set>
         </property>
     </bean>
-    <bean id="emp4" class="org.apache.jdo.tck.pc.company.PartTimeEmployee">
+    <bean id="emp4" factory-bean="companyFactory" factory-method="newPartTimeEmployee">
         <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>emp4First</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>emp4Last</value></constructor-arg>
@@ -110,7 +110,7 @@
             </set>
         </property>
     </bean>
-    <bean id="emp5" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
+    <bean id="emp5" factory-bean="companyFactory" factory-method="newFullTimeEmployee">
         <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>emp5First</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>emp5Last</value></constructor-arg>
@@ -130,7 +130,7 @@
         </property>
     </bean>
 
-    <bean id="addr1" class="org.apache.jdo.tck.pc.company.Address">
+    <bean id="addr1" factory-bean="companyFactory" factory-method="newAddress">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Unter den Linden
1</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>Berlin</value></constructor-arg>
@@ -138,7 +138,7 @@
         <constructor-arg index="4" type="java.lang.String"><value>12345</value></constructor-arg>
         <constructor-arg index="5" type="java.lang.String"><value>Germany</value></constructor-arg>
     </bean>
-    <bean id="addr2" class="org.apache.jdo.tck.pc.company.Address">
+    <bean id="addr2" factory-bean="companyFactory" factory-method="newAddress">
         <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Broadway 1</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>New York</value></constructor-arg>
@@ -146,7 +146,7 @@
         <constructor-arg index="4" type="java.lang.String"><value>10000</value></constructor-arg>
         <constructor-arg index="5" type="java.lang.String"><value>USA</value></constructor-arg>
     </bean>
-    <bean id="addr3" class="org.apache.jdo.tck.pc.company.Address">
+    <bean id="addr3" factory-bean="companyFactory" factory-method="newAddress">
         <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Market St.</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>San Francisco</value></constructor-arg>
@@ -155,31 +155,31 @@
         <constructor-arg index="5" type="java.lang.String"><value>USA</value></constructor-arg>
     </bean>
 
-    <bean id="medicalIns1" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+    <bean id="medicalIns1" factory-bean="companyFactory" factory-method="newMedicalInsurance">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Carrier1</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>PPO</value></constructor-arg>
     </bean>
 
-    <bean id="medicalIns2" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+    <bean id="medicalIns2" factory-bean="companyFactory" factory-method="newMedicalInsurance">
         <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
     </bean>
 
-    <bean id="medicalIns3" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+    <bean id="medicalIns3" factory-bean="companyFactory" factory-method="newMedicalInsurance">
         <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
     </bean>
 
-    <bean id="dentalIns1" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+    <bean id="dentalIns1" factory-bean="companyFactory" factory-method="newDentalInsurance">
         <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
         <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
     </bean>
 
-    <bean id="proj1" class="org.apache.jdo.tck.pc.company.Project">
+    <bean id="proj1" factory-bean="companyFactory" factory-method="newProject">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>orange</value></constructor-arg>
         <constructor-arg index="2" type="java.math.BigDecimal"><value>2500000.99</value></constructor-arg>
@@ -191,7 +191,7 @@
             </set>
         </property>
     </bean>
-    <bean id="proj2" class="org.apache.jdo.tck.pc.company.Project">
+    <bean id="proj2" factory-bean="companyFactory" factory-method="newProject">
         <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>blue</value></constructor-arg>
         <constructor-arg index="2" type="java.math.BigDecimal"><value>50000.00</value></constructor-arg>
@@ -208,7 +208,7 @@
             </set>
         </property>
     </bean>
-    <bean id="proj3" class="org.apache.jdo.tck.pc.company.Project">
+    <bean id="proj3" factory-bean="companyFactory" factory-method="newProject">
         <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>green</value></constructor-arg>
         <constructor-arg index="2" type="java.math.BigDecimal"><value>2000.99</value></constructor-arg>
@@ -225,3 +225,4 @@
         </property>
     </bean>
 </beans>
+

Modified: incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml?rev=279234&r1=279233&r2=279234&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml
(original)
+++ incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml
Tue Sep  6 21:00:18 2005
@@ -26,23 +26,23 @@
         </constructor-arg>
     </bean>
 
-    <bean id="company1" class="org.apache.jdo.tck.pc.company.Company">
+    <bean id="company1" factory-bean="companyFactory" factory-method="newCompany">
         <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>
     </bean>
 
-    <bean id="dept1" class="org.apache.jdo.tck.pc.company.Department">
+    <bean id="dept1" factory-bean="companyFactory" factory-method="newDepartment">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String" ><value>Development</value></constructor-arg>
     </bean>
 
-    <bean id="dept2" class="org.apache.jdo.tck.pc.company.Department">
+    <bean id="dept2" factory-bean="companyFactory" factory-method="newDepartment">
         <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String" ><value>Human Resources</value></constructor-arg>
     </bean>
 
-    <bean id="emp1" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
+    <bean id="emp1" factory-bean="companyFactory" factory-method="newFullTimeEmployee">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>emp1First</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>emp1Last</value></constructor-arg>
@@ -52,7 +52,7 @@
         <constructor-arg index="6" type="double"><value>20000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
     </bean>
-    <bean id="emp2" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
+    <bean id="emp2" factory-bean="companyFactory" factory-method="newFullTimeEmployee">
         <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>emp2First</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>emp2Last</value></constructor-arg>
@@ -62,7 +62,7 @@
         <constructor-arg index="6" type="double"><value>10000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
     </bean>
-    <bean id="emp3" class="org.apache.jdo.tck.pc.company.PartTimeEmployee">
+    <bean id="emp3" factory-bean="companyFactory" factory-method="newPartTimeEmployee">
         <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>emp3First</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>emp3Last</value></constructor-arg>
@@ -72,7 +72,7 @@
         <constructor-arg index="6" type="double"><value>15000</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
     </bean>
-    <bean id="emp4" class="org.apache.jdo.tck.pc.company.PartTimeEmployee">
+    <bean id="emp4" factory-bean="companyFactory" factory-method="newPartTimeEmployee">
         <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>emp4First</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>emp4Last</value></constructor-arg>
@@ -81,7 +81,7 @@
         <constructor-arg index="5" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
         <constructor-arg index="6" type="double"><value>13000</value></constructor-arg>
     </bean>
-    <bean id="emp5" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
+    <bean id="emp5" factory-bean="companyFactory" factory-method="newFullTimeEmployee">
         <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>emp5First</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>emp5Last</value></constructor-arg>
@@ -91,43 +91,44 @@
         <constructor-arg index="6" type="double"><value>45000</value></constructor-arg>
     </bean>
 
-    <bean id="medicalIns1" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+    <bean id="medicalIns1" factory-bean="companyFactory" factory-method="newMedicalInsurance">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Carrier1</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>PPO</value></constructor-arg>
     </bean>
 
-    <bean id="medicalIns2" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+    <bean id="medicalIns2" factory-bean="companyFactory" factory-method="newMedicalInsurance">
         <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
     </bean>
 
-    <bean id="medicalIns3" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+    <bean id="medicalIns3" factory-bean="companyFactory" factory-method="newMedicalInsurance">
         <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
         <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
     </bean>
 
-    <bean id="dentalIns1" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+    <bean id="dentalIns1" factory-bean="companyFactory" factory-method="newDentalInsurance">
         <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
         <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
     </bean>
 
-    <bean id="proj1" class="org.apache.jdo.tck.pc.company.Project">
+    <bean id="proj1" factory-bean="companyFactory" factory-method="newProject">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>orange</value></constructor-arg>
         <constructor-arg index="2" type="java.math.BigDecimal"><value>2500000.99</value></constructor-arg>
     </bean>
-    <bean id="proj2" class="org.apache.jdo.tck.pc.company.Project">
+    <bean id="proj2" factory-bean="companyFactory" factory-method="newProject">
         <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>blue</value></constructor-arg>
         <constructor-arg index="2" type="java.math.BigDecimal"><value>50000.00</value></constructor-arg>
     </bean>
-    <bean id="proj3" class="org.apache.jdo.tck.pc.company.Project">
+    <bean id="proj3" factory-bean="companyFactory" factory-method="newProject">
         <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>green</value></constructor-arg>
         <constructor-arg index="2" type="java.math.BigDecimal"><value>2000.99</value></constructor-arg>
     </bean>
 </beans>
+



Mime
View raw message