db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r240114 - in /incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company: company1-MRelationships.xml companyAllRelationships.xml companyM-MRelationships.xml
Date Thu, 25 Aug 2005 18:30:25 GMT
Author: mbo
Date: Thu Aug 25 11:30:21 2005
New Revision: 240114

URL: http://svn.apache.org/viewcvs?rev=240114&view=rev
Log:
Fixed relationship settings in company testdata.
Changes provided by Michael Watzek.

Modified:
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml

Modified: incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml?rev=240114&r1=240113&r2=240114&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml
(original)
+++ incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml
Thu Aug 25 11:30:21 2005
@@ -34,6 +34,7 @@
     <bean id="dept1" class="org.apache.jdo.tck.pc.company.Department">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String" ><value>Development</value></constructor-arg>
+        <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
                 <ref local="emp1"/>
@@ -41,17 +42,31 @@
                 <ref local="emp3"/>
             </set>
         </property>
+        <property name="fundedEmps">
+            <set>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+            </set>
+        </property>
     </bean>
 
     <bean id="dept2" class="org.apache.jdo.tck.pc.company.Department">
         <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>
+        <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
                 <ref local="emp4"/>
                 <ref local="emp5"/>
             </set>
         </property>
+        <property name="fundedEmps">
+            <set>
+                <ref local="emp1"/>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </set>
+        </property>
     </bean>
 
     <bean id="emp1" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
@@ -77,7 +92,7 @@
         <constructor-arg index="5" type="java.util.Date"><value>1/Jul/2003</value></constructor-arg>
         <constructor-arg index="6" type="double"><value>10000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
-        <property name="department"><ref bean="dept2"/></property>
+        <property name="department"><ref bean="dept1"/></property>
         <property name="fundingDept"><ref bean="dept1"/></property>
         <property name="hradvisor"><ref bean="emp5"/></property>
         <property name="team">

Modified: incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml?rev=240114&r1=240113&r2=240114&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml
(original)
+++ incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml
Thu Aug 25 11:30:21 2005
@@ -28,6 +28,7 @@
     <bean id="dept1" class="org.apache.jdo.tck.pc.company.Department">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String" ><value>Development</value></constructor-arg>
+        <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
                 <ref local="emp1"/>
@@ -35,17 +36,31 @@
                 <ref local="emp3"/>
             </set>
         </property>
+        <property name="fundedEmps">
+            <set>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+            </set>
+        </property>
     </bean>
 
     <bean id="dept2" class="org.apache.jdo.tck.pc.company.Department">
         <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>
+        <property name="company"><ref bean="company1"/></property>
         <property name="employees">
             <set>
                 <ref local="emp4"/>
                 <ref local="emp5"/>
             </set>
         </property>
+        <property name="fundedEmps">
+            <set>
+                <ref local="emp1"/>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </set>
+        </property>
     </bean>
 
     <bean id="emp1" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
@@ -101,7 +116,7 @@
                 <entry key="work"><value>123456-2</value></entry>
             </map>
 	    </property>
-        <property name="department"><ref bean="dept2"/></property>
+        <property name="department"><ref bean="dept1"/></property>
         <property name="fundingDept"><ref bean="dept1"/></property>
         <property name="mentor"><ref bean="emp3"/></property>
         <property name="protege"><ref bean="emp1"/></property>
@@ -327,11 +342,6 @@
         <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>
-        <property name="reviewers">
-            <set>
-                <ref local="emp5"/>
-            </set>
-        </property>
         <property name="members">
             <set>
                 <ref local="emp1"/>
@@ -347,6 +357,7 @@
         <property name="reviewers">
             <set>
                 <ref local="emp4"/>
+                <ref local="emp5"/>
             </set>
         </property>
         <property name="members">

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=240114&r1=240113&r2=240114&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
Thu Aug 25 11:30:21 2005
@@ -183,11 +183,6 @@
         <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>
-        <property name="reviewers">
-            <set>
-                <ref local="emp5"/>
-            </set>
-        </property>
         <property name="members">
             <set>
                 <ref local="emp1"/>
@@ -203,6 +198,7 @@
         <property name="reviewers">
             <set>
                 <ref local="emp4"/>
+                <ref local="emp5"/>
             </set>
         </property>
         <property name="members">



Mime
View raw message