arminw 2005/08/27 05:46:15
Modified: src/schema ojbcore-schema.xml ojbtest-schema.xml
src/test/org/apache/ojb cache.ccf OJB-logging.properties
OJB.properties repository.dtd repository.xml
repository_database.xml repository_internal.xml
repository_junit.xml repository_junit_cache.xml
repository_junit_odmg.xml
repository_junit_reference.xml
repository_perf_test.xml Test_ClassDescriptor.xml
Test_ConnectionDescriptor.xml Test_Repository.xml
Added: src/test/org/apache/ojb oscache.properties
repository_junit_inheritance.xml
Log:
merge 1.x trunk with 1.0.x branch
Revision Changes Path
1.10 +1 -10 db-ojb/src/schema/ojbcore-schema.xml
http://cvs.apache.org/viewcvs/db-ojb/src/schema/ojbcore-schema.xml.diff?r1=1.9&r2=1.10
1.98 +162 -15 db-ojb/src/schema/ojbtest-schema.xml
http://cvs.apache.org/viewcvs/db-ojb/src/schema/ojbtest-schema.xml.diff?r1=1.97&r2=1.98
1.4 +7 -6 db-ojb/src/test/org/apache/ojb/cache.ccf
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/cache.ccf.diff?r1=1.3&r2=1.4
1.5 +11 -1 db-ojb/src/test/org/apache/ojb/OJB-logging.properties
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/OJB-logging.properties.diff?r1=1.4&r2=1.5
1.82 +86 -71 db-ojb/src/test/org/apache/ojb/OJB.properties
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/OJB.properties.diff?r1=1.81&r2=1.82
1.62 +38 -31 db-ojb/src/test/org/apache/ojb/repository.dtd
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/repository.dtd.diff?r1=1.61&r2=1.62
1.31 +3 -1 db-ojb/src/test/org/apache/ojb/repository.xml
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/repository.xml.diff?r1=1.30&r2=1.31
1.27 +81 -43 db-ojb/src/test/org/apache/ojb/repository_database.xml
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/repository_database.xml.diff?r1=1.26&r2=1.27
1.18 +15 -34 db-ojb/src/test/org/apache/ojb/repository_internal.xml
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/repository_internal.xml.diff?r1=1.17&r2=1.18
1.134 +241 -1037 db-ojb/src/test/org/apache/ojb/repository_junit.xml
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/repository_junit.xml.diff?r1=1.133&r2=1.134
1.3 +3 -34 db-ojb/src/test/org/apache/ojb/repository_junit_cache.xml
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/repository_junit_cache.xml.diff?r1=1.2&r2=1.3
1.18 +2137 -1535db-ojb/src/test/org/apache/ojb/repository_junit_odmg.xml
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/repository_junit_odmg.xml.diff?r1=1.17&r2=1.18
1.24 +5 -1
db-ojb/src/test/org/apache/ojb/repository_junit_reference.xml
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/repository_junit_reference.xml.diff?r1=1.23&r2=1.24
1.2 +72 -3 db-ojb/src/test/org/apache/ojb/repository_perf_test.xml
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/repository_perf_test.xml.diff?r1=1.1&r2=1.2
1.6 +32 -12 db-ojb/src/test/org/apache/ojb/Test_ClassDescriptor.xml
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/Test_ClassDescriptor.xml.diff?r1=1.5&r2=1.6
1.9 +21 -21
db-ojb/src/test/org/apache/ojb/Test_ConnectionDescriptor.xml
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/Test_ConnectionDescriptor.xml.diff?r1=1.8&r2=1.9
1.6 +7 -7 db-ojb/src/test/org/apache/ojb/Test_Repository.xml
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/Test_Repository.xml.diff?r1=1.5&r2=1.6
1.1 db-ojb/src/test/org/apache/ojb/oscache.properties
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/oscache.properties?rev=1.1
1.2 +989 -0
db-ojb/src/test/org/apache/ojb/repository_junit_inheritance.xml
http://cvs.apache.org/viewcvs/db-ojb/src/test/org/apache/ojb/repository_junit_inheritance.xml.diff?r1=1.1&r2=1.2
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]