db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject svn commit: r383358 [1/5] - in /db/ojb/trunk: lib/ src/doc/forrest/src/documentation/content/xdocs/docu/guides/ src/xdoclet/java/src/xdoclet/modules/ojb/ src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ src/xdoclet/java/src/xdoclet/modules/ojb/mod...
Date Sun, 05 Mar 2006 17:31:12 GMT
Author: tomdz
Date: Sun Mar  5 09:31:00 2006
New Revision: 383358

URL: http://svn.apache.org/viewcvs?rev=383358&view=rev
Log:
Fixed copyright dates
Added new XDoclet attributes foreignkey-name, foreignkey-on-delete and foreignkey-on-update (and corresponding remote- variants) which fixes OJB-73 and OJB-100

Modified:
    db/ojb/trunk/lib/xdoclet-ojb-module-1.2.3.jar
    db/ojb/trunk/src/doc/forrest/src/documentation/content/xdocs/docu/guides/xdoclet-module.xml
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/CommaListIterator.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/LogHelper.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbDocletTask.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbMemberTagsHandler.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbSubTask.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbTagsHandler.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/TorqueSubTask.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/XDocletModulesOjbMessages.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ClassDescriptorConstraints.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/CollectionDescriptorConstraints.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ConstraintException.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ConstraintsBase.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/FeatureDescriptorConstraints.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/FieldDescriptorConstraints.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/InheritanceHelper.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/JdbcTypeHelper.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ModelConstraints.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ReferenceDescriptorConstraints.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ClassDescriptorDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/CollectionDescriptorDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ColumnDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ColumnWithIdComparator.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/DefBase.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/DefBaseComparator.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FeatureDescriptorDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FieldDescriptorDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FieldWithIdComparator.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ForeignkeyDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/IndexDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/IndexDescriptorDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ModelDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/NestedDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ObjectCacheDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ProcedureArgumentDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ProcedureDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/PropertyHelper.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ReferenceDescriptorDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/TableDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/TorqueModelDef.java
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/resources/intermediate-representation.xdt
    db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/resources/torque_xml.xdt
    db/ojb/trunk/src/xdoclet/test/xdoclet/junit/FileHandling.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletClassLoader.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletRunner.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletTestBase.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/AnonymousFieldTagTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/AnonymousReferenceTagTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagAcceptLocksAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagAttributesAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagDetermineExtendsAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagDocumentationAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagFactoryClassAndMethodAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagGenerateRepositoryInfoAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagGenerateTableInfoAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagIncludeInheritedAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagInitializationMethodAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagIsolationLevelAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagProxyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagRefreshAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagRowReaderAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagSimpleTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagTableAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagTableDocumentationAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagAttributesAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagAutoDeleteAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagAutoRetrieveAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagAutoUpdateAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagCollectionClassAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagDocumentationAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagElementClassRefAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagForeignkeyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagIndirectionTableAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagIndirectionTableDocumentationAttributesTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagIndirectionTablePrimarykeysAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagOrderbyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagOtmDependentAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagProxyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagQueryCustomizerAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagRefreshAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/CollectionTagSimpleTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/DeleteProcedureTagTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ExtentClassTagTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagAccessAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagAttributesAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagAutoincrementAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagColumnAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagColumnDocumentationAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagConversionAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagDefaultFetchAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagDocumentationAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagIdAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagIndexedAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagJdbcTypeAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagLengthAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagLockingAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagNameAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagNullableAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagPrecisionAndScaleAttributesTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagPrimarykeyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagSequenceNameAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagSimpleTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/FieldTagUpdateLockAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/IndexTagTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/InsertProcedureTagTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagAccessAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagAttributesAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagAutoDeleteAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagAutoIncrementAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagAutoRetrieveAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagAutoUpdateAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagClassRefAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagCollectionClassAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagColumnAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagColumnDocumentationAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagConversionAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagDatabaseForeignkeyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagDefaultFetchAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagDocumentationAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagElementClassRefAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagForeignkeyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagIdAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagIgnoreAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagJdbcTypeAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagLengthAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagLockingAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagNullableAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagOrderbyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagOtmDependentAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagPrecisionAndScaleAttributesTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagPrimarykeyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagProxyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagQueryCustomizerAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagRefreshAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagSequenceNameAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagSimpleTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyInheritedTagUpdateLockAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ModifyNestedTagSimpleTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/NestedTagSimpleTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ObjectCacheTagTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/OjbTestBase.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ProcedureArgumentTagTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ReferenceTagAttributesAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ReferenceTagAutoDeleteAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ReferenceTagAutoRetrieveAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ReferenceTagAutoUpdateAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ReferenceTagClassRefAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ReferenceTagDatabaseForeignkeyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ReferenceTagDocumentationAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ReferenceTagForeignkeyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ReferenceTagOtmDependentAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ReferenceTagProxyAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ReferenceTagRefreshAttributeTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/RunAllTests.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/TestClass.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/TestCollectionClass.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/TestConversionClass.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/TestFactoryClass.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/TestObjectCache.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/TestQueryCustomizer.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/TestRowReader.java
    db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/UpdateProcedureTagTests.java

Modified: db/ojb/trunk/lib/xdoclet-ojb-module-1.2.3.jar
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/lib/xdoclet-ojb-module-1.2.3.jar?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
Binary files - no diff available.

Modified: db/ojb/trunk/src/doc/forrest/src/documentation/content/xdocs/docu/guides/xdoclet-module.xml
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/doc/forrest/src/documentation/content/xdocs/docu/guides/xdoclet-module.xml?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/doc/forrest/src/documentation/content/xdocs/docu/guides/xdoclet-module.xml (original)
+++ db/ojb/trunk/src/doc/forrest/src/documentation/content/xdocs/docu/guides/xdoclet-module.xml Sun Mar  5 09:31:00 2006
@@ -635,8 +635,10 @@
                     <link href="#ojb.collection">ojb.collection</link> (with
                     the exception of the attributes related to indirection tables (
                     <strong>indirection-table</strong>, <strong>remote-foreignkey</strong>,
-                    <strong>indirection-table-primarykeys</strong>, <strong>indirection-table-documentation</strong>,
-                    <strong>foreignkey-documentation</strong>, <strong>remote-foreignkey-documentation</strong>),
+                    <strong>remote-foreignkey-name</strong>, <strong>remote-foreignkey-on-delete</strong>,
+                    <strong>remote-foreignkey-on-update</strong>, <strong>indirection-table-primarykeys</strong>,
+                    <strong>indirection-table-documentation</strong>, <strong>foreignkey-documentation</strong>,
+                    <strong>remote-foreignkey-documentation</strong>),
                     and also:
                 </p>
                 <dl>
@@ -2150,6 +2152,56 @@
                         implement the association, i.e. contains the values of the primarykeys of the referenced object.
                         <br/>
                     </dd>
+
+                    <dt>
+                        <strong>foreignkey-name</strong>
+                    </dt>
+                    <dd>
+                        Specifies the name of the foreignkey in the database. If this attribute is not specified,
+                        then the tool generating the database, will generate one automatically. Note that the value of
+                        this attribute is ignored by OJB.
+                        <br/>
+                    </dd>
+
+                    <dt>
+                        <strong>foreignkey-on-delete : cascade | setnull | restrict | none (default)</strong>
+                    </dt>
+                    <dd>
+                        Specifies what the database shall do, when the referencing object is deleted. Note that
+                        it is database dependent whether the created database actually honors these specification.
+                        Also, OJB completely ignores the value of this attribute, so be careful when mixing it
+                        with the <code>auto-</code> attributes.<br/>
+                        The typical interpretation of these values by a database are:<br/>
+                        <ul>
+                            <li><strong>cascade</strong>:&nbsp;All child rows are deleted as well.</li>
+                            <li><strong>setnull</strong>:&nbsp;The child rows are updated so that the columns in the foreignkey
+                                 are set to the SQL <code>NULL</code> value.</li>
+                            <li><strong>restrict</strong>:&nbsp;The parent row can only be deleted if it is the single
+                                parent row of all its child rows, i.e. that now child row has multiple parent rows.</li>
+                            <li><strong>none</strong>:&nbsp;Nothing will happen to the child rows.</li>
+                        </ul>
+                        <br/>
+                    </dd>
+
+                    <dt>
+                        <strong>foreignkey-on-update : cascade | setnull | restrict | none (default)</strong>
+                    </dt>
+                    <dd>
+                        Specifies what the database shall do, when the referencing object, or more precisely the 
+                        foreignky columns in the parent row, are updated. Note that it is database dependent whether
+                        the created database actually honors these specification. Also, OJB completely ignores the
+                        value of this attribute, so be careful when mixing it with the <code>auto-</code> attributes.<br/>
+                        The typical interpretation of these values by a database are:<br/>
+                        <ul>
+                            <li><strong>cascade</strong>:&nbsp;All child rows are updated as well.</li>
+                            <li><strong>setnull</strong>:&nbsp;The child rows are updated so that the columns in the foreignkey
+                                 are set to the SQL <code>NULL</code> value.</li>
+                            <li><strong>restrict</strong>:&nbsp;The parent row can only be updated if it is the single
+                                parent row of all its child rows, i.e. that now child row has multiple parent rows.</li>
+                            <li><strong>none</strong>:&nbsp;Nothing will happen to the child rows.</li>
+                        </ul>
+                        <br/>
+                    </dd>
                 </dl>
                 <p>
                     Other supported attributes (see
@@ -2257,11 +2309,8 @@
                     Persistent collections which implement 1:n or m:n associations are denoted by the
                     <strong>ojb.collection</strong> tag. If the collection is an array, then the XDoclet OJB module can determine
                     the element type automatically (analogous to references). Otherwise the type must be specified using
-                    the
-                    <strong>element-class-ref</strong> attribute. m:n associations are also supported (collections on both
-                    sides) via the
-                    <strong>indirection-table</strong>,
-                    <strong>foreignkey</strong> and
+                    the <strong>element-class-ref</strong> attribute. m:n associations are also supported (collections on both
+                    sides) via the <strong>indirection-table</strong>, <strong>foreignkey</strong> and
                     <strong>remote-foreignkey</strong> attributes.
                 </p>
                 <p>
@@ -2355,6 +2404,56 @@
                     </dd>
 
                     <dt>
+                        <strong>foreignkey-name</strong>
+                    </dt>
+                    <dd>
+                        Specifies the name of the foreignkey in the database. If this attribute is not specified,
+                        then the tool generating the database, will generate one automatically. Note that the value of
+                        this attribute is ignored by OJB.
+                        <br/>
+                    </dd>
+
+                    <dt>
+                        <strong>foreignkey-on-delete : cascade | setnull | restrict | none (default)</strong>
+                    </dt>
+                    <dd>
+                        Specifies what the database shall do, when the element object is deleted. Note that
+                        it is database dependent whether the created database actually honors these specification.
+                        Also, OJB completely ignores the value of this attribute, so be careful when mixing it
+                        with the <code>auto-</code> attributes.<br/>
+                        The typical interpretation of these values by a database are:<br/>
+                        <ul>
+                            <li><strong>cascade</strong>:&nbsp;All child rows are deleted as well.</li>
+                            <li><strong>setnull</strong>:&nbsp;The child rows are updated so that the columns in the foreignkey
+                                 are set to the SQL <code>NULL</code> value.</li>
+                            <li><strong>restrict</strong>:&nbsp;The parent row can only be deleted if it is the single
+                                parent row of all its child rows, i.e. that now child row has multiple parent rows.</li>
+                            <li><strong>none</strong>:&nbsp;Nothing will happen to the child rows.</li>
+                        </ul>
+                        <br/>
+                    </dd>
+
+                    <dt>
+                        <strong>foreignkey-on-update : cascade | setnull | restrict | none (default)</strong>
+                    </dt>
+                    <dd>
+                        Specifies what the database shall do, when the element object, or more precisely the 
+                        foreignky columns in the parent row, are updated. Note that it is database dependent whether
+                        the created database actually honors these specification. Also, OJB completely ignores the
+                        value of this attribute, so be careful when mixing it with the <code>auto-</code> attributes.<br/>
+                        The typical interpretation of these values by a database are:<br/>
+                        <ul>
+                            <li><strong>cascade</strong>:&nbsp;All child rows are updated as well.</li>
+                            <li><strong>setnull</strong>:&nbsp;The child rows are updated so that the columns in the foreignkey
+                                 are set to the SQL <code>NULL</code> value.</li>
+                            <li><strong>restrict</strong>:&nbsp;The parent row can only be updated if it is the single
+                                parent row of all its child rows, i.e. that now child row has multiple parent rows.</li>
+                            <li><strong>none</strong>:&nbsp;Nothing will happen to the child rows.</li>
+                        </ul>
+                        <br/>
+                    </dd>
+
+                    <dt>
                         <strong>indirection-table</strong>
                     </dt>
                     <dd>
@@ -2437,6 +2536,57 @@
                         that point to the element type. This value can be used when the element type has no
                         corresponding collection (i.e. remote-foreignkey is specified) or if the corresponding
                         collection does not specify the <code>foreignkey-documentation</code> attribute.
+                        <br/>
+                    </dd>
+
+
+                    <dt>
+                        <strong>remote-foreignkey-name</strong>
+                    </dt>
+                    <dd>
+                        Specifies the name of the foreignkey in the indirection table in the database which points to
+                        the elements. If this attribute is not specified, then the tool generating the database, will
+                        generate one automatically. Note that the value of this attribute is ignored by OJB.
+                        <br/>
+                    </dd>
+
+                    <dt>
+                        <strong>remote-foreignkey-on-delete : cascade | setnull | restrict | none (default)</strong>
+                    </dt>
+                    <dd>
+                        Specifies what the database shall do, when the element object is deleted. Note that
+                        it is database dependent whether the created database actually honors these specification.
+                        Also, OJB completely ignores the value of this attribute, so be careful when mixing it
+                        with the <code>auto-</code> attributes.<br/>
+                        The typical interpretation of these values by a database are:<br/>
+                        <ul>
+                            <li><strong>cascade</strong>:&nbsp;All child rows are deleted as well.</li>
+                            <li><strong>setnull</strong>:&nbsp;The child rows are updated so that the columns in the foreignkey
+                                 are set to the SQL <code>NULL</code> value.</li>
+                            <li><strong>restrict</strong>:&nbsp;The parent row can only be deleted if it is the single
+                                parent row of all its child rows, i.e. that now child row has multiple parent rows.</li>
+                            <li><strong>none</strong>:&nbsp;Nothing will happen to the child rows.</li>
+                        </ul>
+                        <br/>
+                    </dd>
+
+                    <dt>
+                        <strong>remote-foreignkey-on-update : cascade | setnull | restrict | none (default)</strong>
+                    </dt>
+                    <dd>
+                        Specifies what the database shall do, when the element object, or more precisely the 
+                        foreignky columns in the parent row, are updated. Note that it is database dependent whether
+                        the created database actually honors these specification. Also, OJB completely ignores the
+                        value of this attribute, so be careful when mixing it with the <code>auto-</code> attributes.<br/>
+                        The typical interpretation of these values by a database are:<br/>
+                        <ul>
+                            <li><strong>cascade</strong>:&nbsp;All child rows are updated as well.</li>
+                            <li><strong>setnull</strong>:&nbsp;The child rows are updated so that the columns in the foreignkey
+                                 are set to the SQL <code>NULL</code> value.</li>
+                            <li><strong>restrict</strong>:&nbsp;The parent row can only be updated if it is the single
+                                parent row of all its child rows, i.e. that now child row has multiple parent rows.</li>
+                            <li><strong>none</strong>:&nbsp;Nothing will happen to the child rows.</li>
+                        </ul>
                         <br/>
                     </dd>
                 </dl>

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/CommaListIterator.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/CommaListIterator.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/CommaListIterator.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/CommaListIterator.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/LogHelper.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/LogHelper.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/LogHelper.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/LogHelper.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbDocletTask.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbDocletTask.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbDocletTask.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbDocletTask.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbMemberTagsHandler.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbMemberTagsHandler.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbMemberTagsHandler.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbMemberTagsHandler.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbSubTask.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbSubTask.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbSubTask.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbSubTask.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbTagsHandler.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbTagsHandler.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbTagsHandler.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/OjbTagsHandler.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/TorqueSubTask.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/TorqueSubTask.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/TorqueSubTask.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/TorqueSubTask.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/XDocletModulesOjbMessages.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/XDocletModulesOjbMessages.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/XDocletModulesOjbMessages.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/XDocletModulesOjbMessages.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ClassDescriptorConstraints.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ClassDescriptorConstraints.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ClassDescriptorConstraints.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ClassDescriptorConstraints.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.constraints;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/CollectionDescriptorConstraints.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/CollectionDescriptorConstraints.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/CollectionDescriptorConstraints.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/CollectionDescriptorConstraints.java Sun Mar  5 09:31:00 2006
@@ -7,7 +7,7 @@
 import xdoclet.modules.ojb.model.ModelDef;
 import xdoclet.modules.ojb.model.PropertyHelper;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ConstraintException.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ConstraintException.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ConstraintException.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ConstraintException.java Sun Mar  5 09:31:00 2006
@@ -1,4 +1,4 @@
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ConstraintsBase.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ConstraintsBase.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ConstraintsBase.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ConstraintsBase.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.constraints;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/FeatureDescriptorConstraints.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/FeatureDescriptorConstraints.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/FeatureDescriptorConstraints.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/FeatureDescriptorConstraints.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.constraints;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/FieldDescriptorConstraints.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/FieldDescriptorConstraints.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/FieldDescriptorConstraints.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/FieldDescriptorConstraints.java Sun Mar  5 09:31:00 2006
@@ -6,7 +6,7 @@
 import xdoclet.modules.ojb.model.FieldDescriptorDef;
 import xdoclet.modules.ojb.model.PropertyHelper;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/InheritanceHelper.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/InheritanceHelper.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/InheritanceHelper.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/InheritanceHelper.java Sun Mar  5 09:31:00 2006
@@ -6,7 +6,7 @@
 import xdoclet.modules.ojb.model.*;
 import xjavadoc.XClass;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/JdbcTypeHelper.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/JdbcTypeHelper.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/JdbcTypeHelper.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/JdbcTypeHelper.java Sun Mar  5 09:31:00 2006
@@ -2,7 +2,7 @@
 
 import java.util.HashMap;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ModelConstraints.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ModelConstraints.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ModelConstraints.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ModelConstraints.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.constraints;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,8 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.apache.commons.collections.SequencedHashMap;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.map.ListOrderedMap;
 
 import xdoclet.modules.ojb.CommaListIterator;
 import xdoclet.modules.ojb.LogHelper;
@@ -35,7 +36,7 @@
  * Checks constraints that span deal with parts of the model, not just with one class.
  * This for instance means relationships (collections, references).
  *
- * @author <a href="mailto:tomdz@users.sourceforge.net">Thomas Dudziak (tomdz@users.sourceforge.net)</a>
+ * @author Thomas Dudziak
  */
 public class ModelConstraints extends ConstraintsBase
 {
@@ -52,6 +53,7 @@
         checkReferenceForeignkeys(modelDef, checkLevel);
         checkCollectionForeignkeys(modelDef, checkLevel);
         checkKeyModifications(modelDef, checkLevel);
+        checkAutoIncrementedPKs(modelDef);
     }
 
     /**
@@ -202,7 +204,7 @@
         ClassDescriptorDef elementClassDef  = modelDef.getClass(elementClassName);
         String             fkFieldNames     = collDef.getProperty(PropertyHelper.OJB_PROPERTY_FOREIGNKEY);
         ArrayList          missingFields    = new ArrayList();
-        SequencedHashMap   fkFields         = new SequencedHashMap();
+        ListOrderedMap     fkFields         = new ListOrderedMap();
 
         // first we gather all field names
         for (CommaListIterator it = new CommaListIterator(fkFieldNames); it.hasNext();)
@@ -256,13 +258,12 @@
      */
     private void ensurePKsFromHierarchy(ClassDescriptorDef classDef) throws ConstraintException
     {
-        SequencedHashMap pks = new SequencedHashMap();
+        ListOrderedMap pks = new ListOrderedMap();
 
         for (Iterator it = classDef.getAllExtentClasses(); it.hasNext();)
         {
             ClassDescriptorDef subTypeDef = (ClassDescriptorDef)it.next();
-
-            ArrayList subPKs = subTypeDef.getPrimaryKeys();
+            ArrayList          subPKs     = subTypeDef.getPrimaryKeys();
 
             // check against already present PKs
             for (Iterator pkIt = subPKs.iterator(); pkIt.hasNext();)
@@ -288,7 +289,84 @@
 
         ensureFields(classDef, pks.values());
     }
-    
+
+    /**
+     * Checks that the autoincrement status of a pk field within a hierarchy of class descriptors
+     * connected by super-references over the primary key fields does not change from 'ojb' to some
+     * other value.
+     * 
+     * @param classDef The root of the hierarchy
+     * @throws ConstraintException If there is autoincrement change in a hierarchy 
+     */
+    private void checkAutoIncrementedPKs(ModelDef modelDef) throws ConstraintException
+    {
+        for (Iterator it = modelDef.getClasses(); it.hasNext();)
+        {
+            checkAutoIncrementedPKs((ClassDescriptorDef)it.next());
+        }
+    }
+
+    /**
+     * Checks that the autoincrement status of a pk field within a hierarchy of class descriptors
+     * connected by super-references over the primary key fields does not change from 'ojb' to some
+     * other value.
+     * 
+     * @param classDef The root of the hierarchy
+     * @throws ConstraintException If there is autoincrement change in the hierarchy 
+     */
+    private void checkAutoIncrementedPKs(ClassDescriptorDef classDef) throws ConstraintException
+    {
+        ArrayList pks = classDef.getPrimaryKeys();
+
+        for (Iterator it = pks.iterator(); it.hasNext();)
+        {
+            FieldDescriptorDef fieldDef = (FieldDescriptorDef)it.next();
+            String             autoIncr = fieldDef.getProperty(PropertyHelper.OJB_PROPERTY_AUTOINCREMENT);
+
+            if (!"ojb".equals(autoIncr))
+            {
+                it.remove();
+            }
+        }
+        if (!pks.isEmpty())
+        {
+            ArrayList queue = new ArrayList();
+
+            CollectionUtils.addAll(queue, classDef.getExtentClasses());
+            while (!queue.isEmpty())
+            {
+                ClassDescriptorDef subTypeDef = (ClassDescriptorDef)queue.get(0);
+
+                queue.remove(0);
+                if (subTypeDef.getReference("super") != null)
+                {
+                    if (subTypeDef.getBooleanProperty(PropertyHelper.OJB_PROPERTY_GENERATE_REPOSITORY_INFO, true))
+                    {
+                        // sub type has a repository mapping, so check its the pk fields
+                        for (Iterator pkIt = pks.iterator(); pkIt.hasNext();)
+                        {
+                            FieldDescriptorDef baseFieldDef = (FieldDescriptorDef)pkIt.next();
+                            FieldDescriptorDef subFieldDef  = subTypeDef.getField(baseFieldDef.getName());
+
+                            if ((subFieldDef != null) && (subFieldDef.getOriginal() == null))
+                            {
+                                String autoIncr = subFieldDef.getProperty(PropertyHelper.OJB_PROPERTY_AUTOINCREMENT);
+
+                                if ("ojb".equals(autoIncr))
+                                {
+                                    throw new ConstraintException("Both the base type "+classDef.getQualifiedName()+" and its subtype "+
+                                                                  subTypeDef.getQualifiedName()+" specify 'ojb' for the autoincrement primary key field "+
+                                                                  baseFieldDef.getName()+" which will lead to problems. Please remove the specification at the subtype.");
+                                }
+                            }
+                        }
+                    }
+                    CollectionUtils.addAll(queue, subTypeDef.getExtentClasses());
+                }
+            }
+        }
+    }
+
     /**
      * Ensures that the specified fields are present in the given class.
      * 
@@ -524,7 +602,7 @@
                            "checkCollectionForeignkeys",
                            "For the collection "+collDef.getName()+" in class "+collDef.getOwner().getName()+", a remote foreignkey was specified though it is a 1:n, not a m:n collection");
         }
-
+        
         ClassDescriptorDef ownerClass       = (ClassDescriptorDef)collDef.getOwner();
         ArrayList          primFields       = ownerClass.getPrimaryKeys();
         String             elementClassName = collDef.getProperty(PropertyHelper.OJB_PROPERTY_ELEMENT_CLASS_REF);

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ReferenceDescriptorConstraints.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ReferenceDescriptorConstraints.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ReferenceDescriptorConstraints.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/constraints/ReferenceDescriptorConstraints.java Sun Mar  5 09:31:00 2006
@@ -6,7 +6,7 @@
 import xdoclet.modules.ojb.model.PropertyHelper;
 import xdoclet.modules.ojb.model.ReferenceDescriptorDef;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ClassDescriptorDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ClassDescriptorDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ClassDescriptorDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ClassDescriptorDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/CollectionDescriptorDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/CollectionDescriptorDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/CollectionDescriptorDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/CollectionDescriptorDef.java Sun Mar  5 09:31:00 2006
@@ -4,7 +4,7 @@
 
 import xdoclet.modules.ojb.CommaListIterator;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ColumnDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ColumnDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ColumnDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ColumnDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ColumnWithIdComparator.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ColumnWithIdComparator.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ColumnWithIdComparator.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ColumnWithIdComparator.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/DefBase.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/DefBase.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/DefBase.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/DefBase.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/DefBaseComparator.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/DefBaseComparator.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/DefBaseComparator.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/DefBaseComparator.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FeatureDescriptorDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FeatureDescriptorDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FeatureDescriptorDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FeatureDescriptorDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FieldDescriptorDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FieldDescriptorDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FieldDescriptorDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FieldDescriptorDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FieldWithIdComparator.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FieldWithIdComparator.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FieldWithIdComparator.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/FieldWithIdComparator.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,8 +52,8 @@
      */
     public int compare(Object objA, Object objB)
     {
-        String idAStr = ((FieldDescriptorDef)_fields.get((String)objA)).getProperty("id");
-        String idBStr = ((FieldDescriptorDef)_fields.get((String)objB)).getProperty("id");
+        String idAStr = ((FieldDescriptorDef)_fields.get(objA)).getProperty("id");
+        String idBStr = ((FieldDescriptorDef)_fields.get(objB)).getProperty("id");
         int    idA;
         int    idB;
 

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ForeignkeyDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ForeignkeyDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ForeignkeyDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ForeignkeyDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/IndexDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/IndexDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/IndexDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/IndexDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/IndexDescriptorDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/IndexDescriptorDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/IndexDescriptorDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/IndexDescriptorDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ModelDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ModelDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ModelDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ModelDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/NestedDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/NestedDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/NestedDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/NestedDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ObjectCacheDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ObjectCacheDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ObjectCacheDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ObjectCacheDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ProcedureArgumentDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ProcedureArgumentDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ProcedureArgumentDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ProcedureArgumentDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ProcedureDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ProcedureDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ProcedureDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ProcedureDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/PropertyHelper.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/PropertyHelper.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/PropertyHelper.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/PropertyHelper.java Sun Mar  5 09:31:00 2006
@@ -2,7 +2,7 @@
 
 import java.util.HashMap;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,6 +54,9 @@
     public static final String OJB_PROPERTY_FIELDS                      = "fields";
     public static final String OJB_PROPERTY_FOREIGNKEY                  = "foreignkey";
     public static final String OJB_PROPERTY_FOREIGNKEY_DOCUMENTATION        = "foreignkey-documentation";
+    public static final String OJB_PROPERTY_FOREIGNKEY_NAME                 = "foreignkey-name";
+    public static final String OJB_PROPERTY_FOREIGNKEY_ON_DELETE            = "foreignkey-on-delete";
+    public static final String OJB_PROPERTY_FOREIGNKEY_ON_UPDATE            = "foreignkey-on-update";
     public static final String OJB_PROPERTY_GENERATE_REPOSITORY_INFO        = "generate-repository-info";
     public static final String OJB_PROPERTY_GENERATE_TABLE_INFO         = "generate-table-info";
     public static final String OJB_PROPERTY_ID                          = "id";
@@ -83,6 +86,9 @@
     public static final String OJB_PROPERTY_REFRESH                     = "refresh";
     public static final String OJB_PROPERTY_REMOTE_FOREIGNKEY           = "remote-foreignkey";
     public static final String OJB_PROPERTY_REMOTE_FOREIGNKEY_DOCUMENTATION = "remote-foreignkey-documentation";
+    public static final String OJB_PROPERTY_REMOTE_FOREIGNKEY_NAME          = "remote-foreignkey-name";
+    public static final String OJB_PROPERTY_REMOTE_FOREIGNKEY_ON_DELETE     = "remote-foreignkey-on-delete";
+    public static final String OJB_PROPERTY_REMOTE_FOREIGNKEY_ON_UPDATE     = "remote-foreignkey-on-update";
     public static final String OJB_PROPERTY_RETURN_FIELD_REF            = "return-field-ref";
     public static final String OJB_PROPERTY_ROW_READER                  = "row-reader";
     public static final String OJB_PROPERTY_SCALE                       = "scale";

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ReferenceDescriptorDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ReferenceDescriptorDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ReferenceDescriptorDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/ReferenceDescriptorDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/TableDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/TableDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/TableDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/TableDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -125,8 +125,9 @@
      * @param remoteTable   The referenced table
      * @param localColumns  The local columns
      * @param remoteColumns The remote columns
+     * @return The foreignkey which might be new or already existing
      */
-    public void addForeignkey(String relationName, String remoteTable, List localColumns, List remoteColumns)
+    public ForeignkeyDef addForeignkey(String relationName, String remoteTable, List localColumns, List remoteColumns)
     {
         ForeignkeyDef foreignkeyDef = new ForeignkeyDef(relationName, remoteTable);
 
@@ -145,11 +146,12 @@
             def = (ForeignkeyDef)it.next();
             if (foreignkeyDef.equals(def))
             {
-                return;
+                return def;
             }
         }
         foreignkeyDef.setOwner(this);
         _foreignkeys.add(foreignkeyDef);
+        return foreignkeyDef;
     }
 
     /**

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/TorqueModelDef.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/TorqueModelDef.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/TorqueModelDef.java (original)
+++ db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/model/TorqueModelDef.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.model;
 
-/* Copyright 2004-2004 The Apache Software Foundation
+/* Copyright 2004-2006 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 
 /**
  * Represents the model used for generating the torque database schema.
+ *
+ * @author Thomas Dudziak
  */
 public class TorqueModelDef extends DefBase
 {
@@ -227,8 +229,20 @@
             String    name         = refDef.getName();
             ArrayList localFields  = ownerClassDef.getFields(refDef.getProperty(PropertyHelper.OJB_PROPERTY_FOREIGNKEY));
             ArrayList remoteFields = referencedClassDef.getPrimaryKeys();
+            ForeignkeyDef fkDef        = tableDef.addForeignkey(name, tableName, getColumns(localFields), getColumns(remoteFields));
 
-            tableDef.addForeignkey(name, tableName, getColumns(localFields), getColumns(remoteFields));
+            copyPropertyIfDefined(refDef,
+                                  PropertyHelper.OJB_PROPERTY_FOREIGNKEY_NAME,
+                                  fkDef,
+                                  PropertyHelper.OJB_PROPERTY_FOREIGNKEY_NAME);
+            copyPropertyIfDefined(refDef,
+                                  PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_DELETE,
+                                  fkDef,
+                                  PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_DELETE);
+            copyPropertyIfDefined(refDef,
+                                  PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_UPDATE,
+                                  fkDef,
+                                  PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_UPDATE);
         }
         catch (NoSuchFieldException ex)
         {
@@ -318,7 +332,21 @@
                         elementTableDef = new TableDef(elementTableName);
                         addTable(elementTableDef);
                     }
-                    elementTableDef.addForeignkey(name, tableDef.getName(), getColumns(localFields), getColumns(remoteFields));
+
+                    ForeignkeyDef fkDef = elementTableDef.addForeignkey(name, tableDef.getName(), getColumns(localFields), getColumns(remoteFields));
+
+                    copyPropertyIfDefined(collDef,
+                                          PropertyHelper.OJB_PROPERTY_FOREIGNKEY_NAME,
+                                          fkDef,
+                                          PropertyHelper.OJB_PROPERTY_FOREIGNKEY_NAME);
+                    copyPropertyIfDefined(collDef,
+                                          PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_DELETE,
+                                          fkDef,
+                                          PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_DELETE);
+                    copyPropertyIfDefined(collDef,
+                                          PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_UPDATE,
+                                          fkDef,
+                                          PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_UPDATE);
                     processedTables.put(elementTableName, null);
                 }
             }
@@ -594,7 +622,20 @@
             relationName = collDef.getProperty(PropertyHelper.TORQUE_PROPERTY_RELATION_NAME);
             if ((relationName != null) && (ownerTable != null))
             {
-                tableDef.addForeignkey(relationName, ownerTable, localColumns, remoteColumns);
+                ForeignkeyDef fkDef = tableDef.addForeignkey(relationName, ownerTable, localColumns, remoteColumns);
+
+                copyPropertyIfDefined(collDef,
+                                      PropertyHelper.OJB_PROPERTY_FOREIGNKEY_NAME,
+                                      fkDef,
+                                      PropertyHelper.OJB_PROPERTY_FOREIGNKEY_NAME);
+                copyPropertyIfDefined(collDef,
+                                      PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_DELETE,
+                                      fkDef,
+                                      PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_DELETE);
+                copyPropertyIfDefined(collDef,
+                                      PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_UPDATE,
+                                      fkDef,
+                                      PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_UPDATE);
             }
         }
         localColumns.clear();
@@ -633,8 +674,37 @@
             relationName = collDef.getProperty(PropertyHelper.TORQUE_PROPERTY_INV_RELATION_NAME);
             if ((relationName != null) && (elementTable != null))
             {
-                tableDef.addForeignkey(relationName, elementTable, localColumns, remoteColumns);
+                ForeignkeyDef fkDef = tableDef.addForeignkey(relationName, elementTable, localColumns, remoteColumns);
+
+                copyPropertyIfDefined(collDef,
+                                      PropertyHelper.OJB_PROPERTY_REMOTE_FOREIGNKEY_NAME,
+                                      fkDef,
+                                      PropertyHelper.OJB_PROPERTY_FOREIGNKEY_NAME);
+                copyPropertyIfDefined(collDef,
+                                      PropertyHelper.OJB_PROPERTY_REMOTE_FOREIGNKEY_ON_DELETE,
+                                      fkDef,
+                                      PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_DELETE);
+                copyPropertyIfDefined(collDef,
+                                      PropertyHelper.OJB_PROPERTY_REMOTE_FOREIGNKEY_ON_UPDATE,
+                                      fkDef,
+                                      PropertyHelper.OJB_PROPERTY_FOREIGNKEY_ON_UPDATE);
+            }
+        }
             }
+
+    /**
+     * Copies the value of the specified source property to the foreignkey if it is defined at the source.
+     * 
+     * @param sourceDef      The source definition containing the property
+     * @param sourcePropName The name of the property at the source object
+     * @param fkDef          The foreignkey to copy the property to
+     * @param targetPropName The name of the property at the foreignkey
+     */
+    private void copyPropertyIfDefined(DefBase sourceDef, String sourcePropName, ForeignkeyDef fkDef, String targetPropName)
+    {
+        if (sourceDef.hasProperty(sourcePropName))
+        {
+            fkDef.setProperty(targetPropName, sourceDef.getProperty(sourcePropName));
         }
     }
 

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/resources/intermediate-representation.xdt
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/resources/intermediate-representation.xdt?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
Binary files - no diff available.

Modified: db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/resources/torque_xml.xdt
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/java/src/xdoclet/modules/ojb/resources/torque_xml.xdt?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
Binary files - no diff available.

Modified: db/ojb/trunk/src/xdoclet/test/xdoclet/junit/FileHandling.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/test/xdoclet/junit/FileHandling.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/test/xdoclet/junit/FileHandling.java (original)
+++ db/ojb/trunk/src/xdoclet/test/xdoclet/junit/FileHandling.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.junit;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletClassLoader.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletClassLoader.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletClassLoader.java (original)
+++ db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletClassLoader.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.junit;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletRunner.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletRunner.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletRunner.java (original)
+++ db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletRunner.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.junit;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletTestBase.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletTestBase.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletTestBase.java (original)
+++ db/ojb/trunk/src/xdoclet/test/xdoclet/junit/XDocletTestBase.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.junit;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/AnonymousFieldTagTests.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/AnonymousFieldTagTests.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/AnonymousFieldTagTests.java (original)
+++ db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/AnonymousFieldTagTests.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.tests;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/AnonymousReferenceTagTests.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/AnonymousReferenceTagTests.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/AnonymousReferenceTagTests.java (original)
+++ db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/AnonymousReferenceTagTests.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.tests;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagAcceptLocksAttributeTests.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagAcceptLocksAttributeTests.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagAcceptLocksAttributeTests.java (original)
+++ db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagAcceptLocksAttributeTests.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.tests;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagAttributesAttributeTests.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagAttributesAttributeTests.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagAttributesAttributeTests.java (original)
+++ db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagAttributesAttributeTests.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.tests;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagDetermineExtendsAttributeTests.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagDetermineExtendsAttributeTests.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagDetermineExtendsAttributeTests.java (original)
+++ db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagDetermineExtendsAttributeTests.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.tests;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagDocumentationAttributeTests.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagDocumentationAttributeTests.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagDocumentationAttributeTests.java (original)
+++ db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagDocumentationAttributeTests.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.tests;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Modified: db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagFactoryClassAndMethodAttributeTests.java
URL: http://svn.apache.org/viewcvs/db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagFactoryClassAndMethodAttributeTests.java?rev=383358&r1=383357&r2=383358&view=diff
==============================================================================
--- db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagFactoryClassAndMethodAttributeTests.java (original)
+++ db/ojb/trunk/src/xdoclet/test/xdoclet/modules/ojb/tests/ClassTagFactoryClassAndMethodAttributeTests.java Sun Mar  5 09:31:00 2006
@@ -1,6 +1,6 @@
 package xdoclet.modules.ojb.tests;
 
-/* Copyright 2003-2004 The Apache Software Foundation
+/* Copyright 2003-2005 The Apache Software Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.



---------------------------------------------------------------------
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