db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject cvs commit: db-ojb/src/xdoclet/java/src/xdoclet/modules/ojb OjbTagsHandler.java
Date Mon, 07 Mar 2005 22:49:34 GMT
tomdz       2005/03/07 14:49:34

  Modified:    lib      Tag: OJB_1_0_RELEASE xdoclet-ojb-module-1.2.2.jar
               src/xdoclet/test/xdoclet/modules/ojb/tests Tag:
                        OJB_1_0_RELEASE RunAllTests.java
               src/xdoclet/java/src/xdoclet/modules/ojb/model Tag:
                        OJB_1_0_RELEASE TorqueModelDef.java
               src/xdoclet/java/src/xdoclet/modules/ojb/resources Tag:
                        OJB_1_0_RELEASE intermediate-representation.xdt
               src/xdoclet/java/src/xdoclet/modules/ojb Tag:
                        OJB_1_0_RELEASE OjbTagsHandler.java
  Added:       src/xdoclet/test/xdoclet/modules/ojb/tests Tag:
                        OJB_1_0_RELEASE
                        ModifyInheritedTagColumnDocumentationAttributeTests.java
  Log:
  Added column-documentation to ojb.modify-inherited and ojb.modify-nested
  Fixed bug where primarykeys were per default generated for indirection table columns
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.4   +115 -104  db-ojb/lib/Attic/xdoclet-ojb-module-1.2.2.jar
  
  	<<Binary file>>
  
  
  No                   revision
  No                   revision
  1.13.2.3  +5 -2      db-ojb/src/xdoclet/test/xdoclet/modules/ojb/tests/RunAllTests.java
  
  Index: RunAllTests.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/xdoclet/test/xdoclet/modules/ojb/tests/RunAllTests.java,v
  retrieving revision 1.13.2.2
  retrieving revision 1.13.2.3
  diff -u -r1.13.2.2 -r1.13.2.3
  --- RunAllTests.java	2 Mar 2005 22:44:13 -0000	1.13.2.2
  +++ RunAllTests.java	7 Mar 2005 22:49:34 -0000	1.13.2.3
  @@ -59,6 +59,7 @@
           suite.addTest(new TestSuite(ClassTagRefreshAttributeTests.class));
           suite.addTest(new TestSuite(ClassTagRowReaderAttributeTests.class));
           suite.addTest(new TestSuite(ClassTagTableAttributeTests.class));
  +        suite.addTest(new TestSuite(ClassTagTableDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(ExtentClassTagTests.class));
           suite.addTest(new TestSuite(ObjectCacheTagTests.class));
           suite.addTest(new TestSuite(IndexTagTests.class));
  @@ -67,6 +68,7 @@
           suite.addTest(new TestSuite(FieldTagAttributesAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagAutoincrementAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagColumnAttributeTests.class));
  +        suite.addTest(new TestSuite(FieldTagColumnDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagConversionAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagDefaultFetchAttributeTests.class));
  @@ -102,8 +104,8 @@
           suite.addTest(new TestSuite(CollectionTagCollectionClassAttributeTests.class));
           suite.addTest(new TestSuite(CollectionTagDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(CollectionTagElementClassRefAttributeTests.class));
  -        suite.addTest(new TestSuite(CollectionTagForeignkeyAttributeTests.class));
  -        suite.addTest(new TestSuite(CollectionTagIndirectionTableAttributeTests.class));
  +        suite.addTest(new TestSuite(CollectionTagForeignkeyAttributeTests.class));*/
  +        suite.addTest(new TestSuite(CollectionTagIndirectionTableAttributeTests.class));/*
           suite.addTest(new TestSuite(CollectionTagIndirectionTableDocumentationAttributesTests.class));
           suite.addTest(new TestSuite(CollectionTagIndirectionTablePrimarykeysAttributeTests.class));
           suite.addTest(new TestSuite(CollectionTagOrderbyAttributeTests.class));
  @@ -121,6 +123,7 @@
           suite.addTest(new TestSuite(ModifyInheritedTagClassRefAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagCollectionClassAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagColumnAttributeTests.class));
  +        suite.addTest(new TestSuite(ModifyInheritedTagColumnDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagConversionAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagDefaultFetchAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagDocumentationAttributeTests.class));
  
  
  
  No                   revision
  
  Index: RunAllTests.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/xdoclet/test/xdoclet/modules/ojb/tests/RunAllTests.java,v
  retrieving revision 1.13.2.2
  retrieving revision 1.13.2.3
  diff -u -r1.13.2.2 -r1.13.2.3
  --- RunAllTests.java	2 Mar 2005 22:44:13 -0000	1.13.2.2
  +++ RunAllTests.java	7 Mar 2005 22:49:34 -0000	1.13.2.3
  @@ -59,6 +59,7 @@
           suite.addTest(new TestSuite(ClassTagRefreshAttributeTests.class));
           suite.addTest(new TestSuite(ClassTagRowReaderAttributeTests.class));
           suite.addTest(new TestSuite(ClassTagTableAttributeTests.class));
  +        suite.addTest(new TestSuite(ClassTagTableDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(ExtentClassTagTests.class));
           suite.addTest(new TestSuite(ObjectCacheTagTests.class));
           suite.addTest(new TestSuite(IndexTagTests.class));
  @@ -67,6 +68,7 @@
           suite.addTest(new TestSuite(FieldTagAttributesAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagAutoincrementAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagColumnAttributeTests.class));
  +        suite.addTest(new TestSuite(FieldTagColumnDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagConversionAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagDefaultFetchAttributeTests.class));
  @@ -102,8 +104,8 @@
           suite.addTest(new TestSuite(CollectionTagCollectionClassAttributeTests.class));
           suite.addTest(new TestSuite(CollectionTagDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(CollectionTagElementClassRefAttributeTests.class));
  -        suite.addTest(new TestSuite(CollectionTagForeignkeyAttributeTests.class));
  -        suite.addTest(new TestSuite(CollectionTagIndirectionTableAttributeTests.class));
  +        suite.addTest(new TestSuite(CollectionTagForeignkeyAttributeTests.class));*/
  +        suite.addTest(new TestSuite(CollectionTagIndirectionTableAttributeTests.class));/*
           suite.addTest(new TestSuite(CollectionTagIndirectionTableDocumentationAttributesTests.class));
           suite.addTest(new TestSuite(CollectionTagIndirectionTablePrimarykeysAttributeTests.class));
           suite.addTest(new TestSuite(CollectionTagOrderbyAttributeTests.class));
  @@ -121,6 +123,7 @@
           suite.addTest(new TestSuite(ModifyInheritedTagClassRefAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagCollectionClassAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagColumnAttributeTests.class));
  +        suite.addTest(new TestSuite(ModifyInheritedTagColumnDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagConversionAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagDefaultFetchAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagDocumentationAttributeTests.class));
  
  
  
  No                   revision
  
  Index: RunAllTests.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/xdoclet/test/xdoclet/modules/ojb/tests/RunAllTests.java,v
  retrieving revision 1.13.2.2
  retrieving revision 1.13.2.3
  diff -u -r1.13.2.2 -r1.13.2.3
  --- RunAllTests.java	2 Mar 2005 22:44:13 -0000	1.13.2.2
  +++ RunAllTests.java	7 Mar 2005 22:49:34 -0000	1.13.2.3
  @@ -59,6 +59,7 @@
           suite.addTest(new TestSuite(ClassTagRefreshAttributeTests.class));
           suite.addTest(new TestSuite(ClassTagRowReaderAttributeTests.class));
           suite.addTest(new TestSuite(ClassTagTableAttributeTests.class));
  +        suite.addTest(new TestSuite(ClassTagTableDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(ExtentClassTagTests.class));
           suite.addTest(new TestSuite(ObjectCacheTagTests.class));
           suite.addTest(new TestSuite(IndexTagTests.class));
  @@ -67,6 +68,7 @@
           suite.addTest(new TestSuite(FieldTagAttributesAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagAutoincrementAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagColumnAttributeTests.class));
  +        suite.addTest(new TestSuite(FieldTagColumnDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagConversionAttributeTests.class));
           suite.addTest(new TestSuite(FieldTagDefaultFetchAttributeTests.class));
  @@ -102,8 +104,8 @@
           suite.addTest(new TestSuite(CollectionTagCollectionClassAttributeTests.class));
           suite.addTest(new TestSuite(CollectionTagDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(CollectionTagElementClassRefAttributeTests.class));
  -        suite.addTest(new TestSuite(CollectionTagForeignkeyAttributeTests.class));
  -        suite.addTest(new TestSuite(CollectionTagIndirectionTableAttributeTests.class));
  +        suite.addTest(new TestSuite(CollectionTagForeignkeyAttributeTests.class));*/
  +        suite.addTest(new TestSuite(CollectionTagIndirectionTableAttributeTests.class));/*
           suite.addTest(new TestSuite(CollectionTagIndirectionTableDocumentationAttributesTests.class));
           suite.addTest(new TestSuite(CollectionTagIndirectionTablePrimarykeysAttributeTests.class));
           suite.addTest(new TestSuite(CollectionTagOrderbyAttributeTests.class));
  @@ -121,6 +123,7 @@
           suite.addTest(new TestSuite(ModifyInheritedTagClassRefAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagCollectionClassAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagColumnAttributeTests.class));
  +        suite.addTest(new TestSuite(ModifyInheritedTagColumnDocumentationAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagConversionAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagDefaultFetchAttributeTests.class));
           suite.addTest(new TestSuite(ModifyInheritedTagDocumentationAttributeTests.class));
  
  
  
  1.1.2.1   +394 -0    db-ojb/src/xdoclet/test/xdoclet/modules/ojb/tests/Attic/ModifyInheritedTagColumnDocumentationAttributeTests.java
  
  
  
  
  No                   revision
  No                   revision
  1.6.2.4   +1 -1      db-ojb/src/xdoclet/java/src/xdoclet/modules/ojb/model/TorqueModelDef.java
  
  Index: TorqueModelDef.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/xdoclet/java/src/xdoclet/modules/ojb/model/TorqueModelDef.java,v
  retrieving revision 1.6.2.3
  retrieving revision 1.6.2.4
  diff -u -r1.6.2.3 -r1.6.2.4
  --- TorqueModelDef.java	6 Mar 2005 18:53:32 -0000	1.6.2.3
  +++ TorqueModelDef.java	7 Mar 2005 22:49:34 -0000	1.6.2.4
  @@ -380,7 +380,7 @@
           CommaListIterator  remoteKeyDocs    = new CommaListIterator(collDef.getProperty(PropertyHelper.OJB_PROPERTY_REMOTE_FOREIGNKEY_DOCUMENTATION));
           ArrayList          localColumns     = new ArrayList();
           ArrayList          remoteColumns    = new ArrayList();
  -        boolean            asPrimarykeys    = collDef.getBooleanProperty(PropertyHelper.OJB_PROPERTY_INDIRECTION_TABLE_PRIMARYKEYS,
true);
  +        boolean            asPrimarykeys    = collDef.getBooleanProperty(PropertyHelper.OJB_PROPERTY_INDIRECTION_TABLE_PRIMARYKEYS,
false);
           FieldDescriptorDef fieldDef;
           ColumnDef          columnDef;
           String             relationName;
  
  
  
  No                   revision
  No                   revision
  1.8.2.4   +12 -0     db-ojb/src/xdoclet/java/src/xdoclet/modules/ojb/resources/intermediate-representation.xdt
  
  Index: intermediate-representation.xdt
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/xdoclet/java/src/xdoclet/modules/ojb/resources/intermediate-representation.xdt,v
  retrieving revision 1.8.2.3
  retrieving revision 1.8.2.4
  diff -u -r1.8.2.3 -r1.8.2.4
  --- intermediate-representation.xdt	6 Mar 2005 18:53:32 -0000	1.8.2.3
  +++ intermediate-representation.xdt	7 Mar 2005 22:49:34 -0000	1.8.2.4
  @@ -216,6 +216,12 @@
                           column="<XDtClass:classTagValue tagName='ojb.modify-inherited'
paramName='column'/>"
                       />
                   </XDtClass:ifHasClassTag>
  +                <XDtClass:ifHasClassTag tagName='ojb.modify-inherited' paramName='column-documentation'>
  +                    <XDtOjb:processModification
  +                        name="<XDtClass:classTagValue tagName='ojb.modify-inherited'
paramName='name' superclasses='false'/>"
  +                        column-documentation="<XDtClass:classTagValue tagName='ojb.modify-inherited'
paramName='column-documentation'/>"
  +                    />
  +                </XDtClass:ifHasClassTag>
                   <XDtClass:ifHasClassTag tagName='ojb.modify-inherited' paramName='conversion'>
                       <XDtOjb:processModification
                           name="<XDtClass:classTagValue tagName='ojb.modify-inherited'
paramName='name' superclasses='false'/>"
  @@ -505,6 +511,12 @@
   	                        column="<XDtOjbMember:memberTagValue tagName='ojb.modify-nested'
paramName='column'/>"
   	                    />
   	                </XDtOjbMember:ifHasMemberTag>
  +	                <XDtOjbMember:ifHasMemberTag tagName='ojb.modify-nested' paramName='column-documentation'>
  +	                    <XDtOjb:processNestedModification
  +	                        name="<XDtOjbMember:memberTagValue tagName='ojb.modify-nested'
paramName='name'/>"
  +	                        column-documentation="<XDtOjbMember:memberTagValue tagName='ojb.modify-nested'
paramName='column-documentation'/>"
  +	                    />
  +	                </XDtOjbMember:ifHasMemberTag>
   	                <XDtOjbMember:ifHasMemberTag tagName='ojb.modify-nested' paramName='conversion'>
   	                    <XDtOjb:processNestedModification
   	                        name="<XDtOjbMember:memberTagValue tagName='ojb.modify-nested'
paramName='name'/>"
  
  
  
  No                   revision
  No                   revision
  1.13.2.5  +2 -0      db-ojb/src/xdoclet/java/src/xdoclet/modules/ojb/OjbTagsHandler.java
  
  Index: OjbTagsHandler.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/xdoclet/java/src/xdoclet/modules/ojb/OjbTagsHandler.java,v
  retrieving revision 1.13.2.4
  retrieving revision 1.13.2.5
  diff -u -r1.13.2.4 -r1.13.2.5
  --- OjbTagsHandler.java	6 Mar 2005 18:53:33 -0000	1.13.2.4
  +++ OjbTagsHandler.java	7 Mar 2005 22:49:34 -0000	1.13.2.5
  @@ -1146,6 +1146,7 @@
        * @doc.param                   name="collection-class" optional="true" description="The
type of the collection if not a
        * java.util type or an array"
        * @doc.param                   name="column" optional="true" description="The column
for the field"
  +     * @doc.param                   name="column-documentation" optional="true" description="Documentation
on the column"
        * @doc.param                   name="conversion" optional="true" description="The
fully qualified name of the
        *      conversion for the field"
        * @doc.param                   name="default-fetch" optional="true" description="The
default-fetch setting"
  @@ -1227,6 +1228,7 @@
        * @doc.param                   name="collection-class" optional="true" description="The
type of the collection if not a
        * java.util type or an array"
        * @doc.param                   name="column" optional="true" description="The column
for the field"
  +     * @doc.param                   name="column-documentation" optional="true" description="Documentation
on the column"
        * @doc.param                   name="conversion" optional="true" description="The
fully qualified name of the
        *      conversion for the field"
        * @doc.param                   name="default-fetch" optional="true" description="The
default-fetch setting"
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message