arminw      2005/08/27 05:16:56

  Modified:    src/java/org/apache/ojb/broker/metadata/fieldaccess
                        PersistentField.java
                        PersistentFieldAutoProxyImpl.java
                        PersistentFieldBase.java
                        PersistentFieldDirectImpl.java
                        PersistentFieldDynaBeanImpl.java
                        PersistentFieldFactory.java
                        PersistentFieldIntrospectorImpl.java
                        PersistentFieldPrivilegedImpl.java
               src/java/org/apache/ojb/broker/metadata/torque
                        TorqueRepositoryGenerator.java
               src/java/org/apache/ojb/broker/metadata
                        ArgumentDescriptor.java AttributeContainer.java
                        AttributeDescriptorBase.java BatchDescriptor.java
                        ClassDescriptor.java
                        ConnectionDescriptorXmlHandler.java
                        ConnectionFactoryDescriptor.java
                        ConnectionRepository.java DescriptorBase.java
                        DescriptorRepository.java
                        DiscriminatorFieldDescriptor.java
                        FieldDescriptor.java IsolationLevels.java
                        JdbcConnectionDescriptor.java JdbcType.java
                        MetadataManager.java ObjectCacheDescriptor.java
                        ObjectReferenceDescriptor.java
                        RepositoryElements.java RepositoryTags.java
                        RepositoryXmlHandler.java
                        SelectByFKProcedureDescriptor.java
  Added:       src/java/org/apache/ojb/broker/metadata FieldType.java
                        FieldTypeClasses.java JdbcTypesHelper.java
                        SuperReferenceDescriptor.java
  Removed:     src/java/org/apache/ojb/broker/metadata/fieldaccess
                        AnonymousPersistentFieldForInheritance.java
                        AnonymousPersistentFieldHelper.java
  Log:
  merge 1.0.x branch with 1.x trunk
  
  Revision  Changes    Path
  1.9       +5 -4      
db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentField.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentField.java.diff?r1=1.8&r2=1.9
  
  
  1.14      +5 -6      
db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldAutoProxyImpl.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldAutoProxyImpl.java.diff?r1=1.13&r2=1.14
  
  
  1.7       +21 -18    
db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldBase.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldBase.java.diff?r1=1.6&r2=1.7
  
  
  1.3       +16 -13    
db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldDirectImpl.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldDirectImpl.java.diff?r1=1.2&r2=1.3
  
  
  1.9       +3 -5      
db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldDynaBeanImpl.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldDynaBeanImpl.java.diff?r1=1.8&r2=1.9
  
  
  1.15      +43 -30    
db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldFactory.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldFactory.java.diff?r1=1.14&r2=1.15
  
  
  1.15      +8 -9      
db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldIntrospectorImpl.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldIntrospectorImpl.java.diff?r1=1.14&r2=1.15
  
  
  1.15      +3 -5      
db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldPrivilegedImpl.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/fieldaccess/PersistentFieldPrivilegedImpl.java.diff?r1=1.14&r2=1.15
  
  
  1.11      +1 -1      
db-ojb/src/java/org/apache/ojb/broker/metadata/torque/TorqueRepositoryGenerator.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/torque/TorqueRepositoryGenerator.java.diff?r1=1.10&r2=1.11
  
  
  1.11      +3 -3      
db-ojb/src/java/org/apache/ojb/broker/metadata/ArgumentDescriptor.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ArgumentDescriptor.java.diff?r1=1.10&r2=1.11
  
  
  1.8       +6 -0      
db-ojb/src/java/org/apache/ojb/broker/metadata/AttributeContainer.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/AttributeContainer.java.diff?r1=1.7&r2=1.8
  
  
  1.20      +3 -3      
db-ojb/src/java/org/apache/ojb/broker/metadata/AttributeDescriptorBase.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/AttributeDescriptorBase.java.diff?r1=1.19&r2=1.20
  
  
  1.3       +9 -33     
db-ojb/src/java/org/apache/ojb/broker/metadata/BatchDescriptor.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/BatchDescriptor.java.diff?r1=1.2&r2=1.3
  
  
  1.108     +218 -109  
db-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ClassDescriptor.java.diff?r1=1.107&r2=1.108
  
  
  1.17      +9 -2      
db-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionDescriptorXmlHandler.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionDescriptorXmlHandler.java.diff?r1=1.16&r2=1.17
  
  
  1.4       +118 -30   
db-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionFactoryDescriptor.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionFactoryDescriptor.java.diff?r1=1.3&r2=1.4
  
  
  1.17      +12 -11    
db-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionRepository.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionRepository.java.diff?r1=1.16&r2=1.17
  
  
  1.12      +32 -0     
db-ojb/src/java/org/apache/ojb/broker/metadata/DescriptorBase.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/DescriptorBase.java.diff?r1=1.11&r2=1.12
  
  
  1.63      +173 -21   
db-ojb/src/java/org/apache/ojb/broker/metadata/DescriptorRepository.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/DescriptorRepository.java.diff?r1=1.62&r2=1.63
  
  
  1.3       +1 -9      
db-ojb/src/java/org/apache/ojb/broker/metadata/DiscriminatorFieldDescriptor.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/DiscriminatorFieldDescriptor.java.diff?r1=1.2&r2=1.3
  
  
  1.39      +47 -7     
db-ojb/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/FieldDescriptor.java.diff?r1=1.38&r2=1.39
  
  
  1.7       +0 -0      
db-ojb/src/java/org/apache/ojb/broker/metadata/IsolationLevels.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/IsolationLevels.java.diff?r1=1.6&r2=1.7
  
  
  1.36      +7 -7      
db-ojb/src/java/org/apache/ojb/broker/metadata/JdbcConnectionDescriptor.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/JdbcConnectionDescriptor.java.diff?r1=1.35&r2=1.36
  
  
  1.7       +13 -1     
db-ojb/src/java/org/apache/ojb/broker/metadata/JdbcType.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/JdbcType.java.diff?r1=1.6&r2=1.7
  
  
  1.27      +39 -12    
db-ojb/src/java/org/apache/ojb/broker/metadata/MetadataManager.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/MetadataManager.java.diff?r1=1.26&r2=1.27
  
  
  1.10      +269 -51   
db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectCacheDescriptor.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectCacheDescriptor.java.diff?r1=1.9&r2=1.10
  
  
  1.46      +94 -28    
db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectReferenceDescriptor.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/ObjectReferenceDescriptor.java.diff?r1=1.45&r2=1.46
  
  
  1.42      +3 -1      
db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryElements.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryElements.java.diff?r1=1.41&r2=1.42
  
  
  1.42      +1 -0      
db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryTags.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryTags.java.diff?r1=1.41&r2=1.42
  
  
  1.70      +53 -90    
db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryXmlHandler.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/RepositoryXmlHandler.java.diff?r1=1.69&r2=1.70
  
  
  1.2       +30 -24    
db-ojb/src/java/org/apache/ojb/broker/metadata/SelectByFKProcedureDescriptor.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/SelectByFKProcedureDescriptor.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +69 -0     
db-ojb/src/java/org/apache/ojb/broker/metadata/FieldType.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/FieldType.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +450 -0    
db-ojb/src/java/org/apache/ojb/broker/metadata/FieldTypeClasses.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/FieldTypeClasses.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +1347 -0   
db-ojb/src/java/org/apache/ojb/broker/metadata/JdbcTypesHelper.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/JdbcTypesHelper.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +357 -0    
db-ojb/src/java/org/apache/ojb/broker/metadata/SuperReferenceDescriptor.java
  
  
http://cvs.apache.org/viewcvs/db-ojb/src/java/org/apache/ojb/broker/metadata/SuperReferenceDescriptor.java.diff?r1=1.1&r2=1.2
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to