You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by to...@apache.org on 2004/02/01 23:11:44 UTC
cvs commit: db-ojb build-torque.xml build.xml build.properties
tomdz 2004/02/01 14:11:44
Modified: src/schema ojbtest-data.xml ojbtest-data.dtd
. build-torque.xml build.xml build.properties
Log:
Updated to the build-torque.xml of Torque version 3.0.2 (the previous one was of an older version)
Changed build.xml and build.properties to make use of the new torque properties naming (i.e. starting with torque.)
Revision Changes Path
1.12 +14 -14 db-ojb/src/schema/ojbtest-data.xml
Index: ojbtest-data.xml
===================================================================
RCS file: /home/cvs/db-ojb/src/schema/ojbtest-data.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ojbtest-data.xml 23 May 2003 20:52:01 -0000 1.11
+++ ojbtest-data.xml 1 Feb 2004 22:11:44 -0000 1.12
@@ -144,17 +144,6 @@
<ConversionReferred Pk1="51" TestId="61"/>
<ConversionReferred Pk1="52" TestId="62"/>
- <SMMaxA id="120" name="A"/>
- <SMMaxA id="121" name="A"/>
- <SMMaxAA id="101" name="AA"/>
- <SMMaxAA id="102" name="AA"/>
- <SMMaxAAA id="123" name="AAA"/>
- <SMMaxAB id="99" name="AB"/>
- <SMMaxB id="115" name="B"/>
- <SMMaxB id="116" name="B"/>
- <SMMaxBB id="130" name="BB"/>
- <SMMaxBB id="131" name="BB"/>
-
<News Id="1" Headline="Healf Care News (NONE)"/>
<News Id="2" Headline="Ferrai for sale (CARS - BUYERS)"/>
<News Id="3" Headline="Brazil World Cup Champion ! (SPORTS)"/>
@@ -162,12 +151,12 @@
<Paper Id="10" Headline="NONE" Issuedate="today" Author="NONE"/>
<Paper Id="11" Headline="SALES" Issuedate="yesterday" Author="SALES MAN"/>
- <Category Id="1" Name="Cars" />
- <Category Id="2" Name="Sports" />
-
<Topic Id="10" Name="Buyers" />
<Topic Id="11" Name="Sellers" />
+ <Category Id="1" Name="Cars" />
+ <Category Id="2" Name="Sports" />
+
<Area Id="20" Name="Human"/>
<Area Id="21" Name="NotHuman"/>
@@ -176,4 +165,15 @@
<ContentQualifier ContentId="3" QualifierId="2"/>
<ContentQualifier ContentId="10" QualifierId="20"/>
<ContentQualifier ContentId="11" QualifierId="11"/>
+
+ <SMMaxA id="120" name="A"/>
+ <SMMaxA id="121" name="A"/>
+ <SMMaxAA id="101" name="AA"/>
+ <SMMaxAA id="102" name="AA"/>
+ <SMMaxAB id="99" name="AB"/>
+ <SMMaxAAA id="123" name="AAA"/>
+ <SMMaxB id="115" name="B"/>
+ <SMMaxB id="116" name="B"/>
+ <SMMaxBB id="130" name="BB"/>
+ <SMMaxBB id="131" name="BB"/>
</dataset>
1.12 +778 -71 db-ojb/src/schema/ojbtest-data.dtd
Index: ojbtest-data.dtd
===================================================================
RCS file: /home/cvs/db-ojb/src/schema/ojbtest-data.dtd,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ojbtest-data.dtd 23 May 2003 20:52:01 -0000 1.11
+++ ojbtest-data.dtd 1 Feb 2004 22:11:44 -0000 1.12
@@ -19,28 +19,119 @@
MdtestMaster*,
MdtestDetailFkinpk*,
MdtestDetailFknopk*,
+ PointTable*,
GraphNode*,
GraphEdge*,
- Point*,
+ Testclassa*,
+ Testclassb*,
+ Relatedtocontract*,
+ Contract*,
+ Version*,
+ Effectiveness*,
+ Multimappedtable*,
+ ExtentTestA*,
+ ExtentTestB*,
+ ExtentTestC*,
+ ExtentTestD*,
+ Table1*,
+ Table2*,
+ BidirA*,
+ BidirB*,
+ Mammal*,
+ Reptile*,
+ Zoo*,
+ Fish*,
+ Salad*,
+ Gourmet*,
+ GourmetFood*,
+ Guidtest*,
ConversionReferrer*,
ConversionReferred*,
+ Site*,
+ OdmgDlist*,
+ RollbackOne*,
+ RollbackTwo*,
+ News*,
+ Paper*,
+ Topic*,
+ Category*,
+ Area*,
+ ContentQualifier*,
+ SMInterfaceExtendA*,
+ SMInterfaceExtendAA*,
+ SMInterfaceExtendAB*,
+ SMInterfaceExtendAAA*,
+ SMInterfaceExtendB*,
+ SMInterfaceExtendBB*,
+ SmSameTab*,
+ SmAutoNaming*,
SMMaxA*,
SMMaxAA*,
- SMMaxAAA*,
SMMaxAB*,
+ SMMaxAAA*,
SMMaxB*,
SMMaxBB*,
- News*,
- Paper*,
- Category*,
- Topic*,
- Area*,
- ContentQualifier*
-)>
+ SmKey*,
+ SmMtTestA*,
+ SmMtTestB*,
+ EjbCategory*,
+ EjbArticle*,
+ EjbPerson*,
+ FieldConversionNode*,
+ ConversionVo*,
+ PerfArticle*,
+ CacheTest*,
+ RefRepository*,
+ RefRepositoryFk*,
+ RefReference*,
+ RefAnimal*,
+ RefWine*,
+ RefRegion*,
+ CollectionGatherer*,
+ CollectionCollectibleA*,
+ CollectionCollectibleBase*,
+ CollectionCollectibleB*,
+ CollectionCollectibleC*,
+ CollectionCollectibleCc*,
+ CollectionCollectibleCcc*,
+ CollectionCollectibleD*,
+ ReadonlyTest*,
+ TableE*,
+ TableF*,
+ TableG*,
+ TableF1*,
+ TableG1*,
+ AbstractCollectionZ*,
+ AbstractCollectionZz*,
+ Xcontainer*,
+ ColBookshelfs*,
+ ColBooks*,
+ ColDvds*,
+ NestedFieldsTab*,
+ NestedFieldsEntry*,
+ TabComponent*,
+ TabGroup*,
+ LockMulti*,
+ LockMultiRef*,
+ CrtEmployee*,
+ CrtMember*,
+ CrtLeader*,
+ CrtProject*,
+ CrtSubProject*,
+ OtmPerson*,
+ OtmAddress*,
+ OtmAddressDesc*)>
<!ATTLIST dataset
name CDATA #REQUIRED
>
+<!ELEMENT ProductGroup EMPTY>
+<!ATTLIST ProductGroup
+ groupId CDATA #REQUIRED
+ groupName CDATA #IMPLIED
+ description CDATA #IMPLIED
+>
+
<!ELEMENT Article EMPTY>
<!ATTLIST Article
articleId CDATA #REQUIRED
@@ -87,13 +178,6 @@
Musicians CDATA #IMPLIED
>
-<!ELEMENT ProductGroup EMPTY>
-<!ATTLIST ProductGroup
- groupId CDATA #REQUIRED
- groupName CDATA #IMPLIED
- description CDATA #IMPLIED
->
-
<!ELEMENT OrderPosition EMPTY>
<!ATTLIST OrderPosition
Id CDATA #REQUIRED
@@ -121,6 +205,8 @@
Id CDATA #REQUIRED
ClassName CDATA #IMPLIED
Value CDATA #IMPLIED
+ AField CDATA #IMPLIED
+ BField CDATA #IMPLIED
>
<!ELEMENT Product EMPTY>
@@ -145,14 +231,6 @@
Description CDATA #IMPLIED
>
-<!ELEMENT Task EMPTY>
-<!ATTLIST Task
- TaskId CDATA #REQUIRED
- PersonId CDATA #REQUIRED
- ProjectId CDATA #REQUIRED
- Taskname CDATA #IMPLIED
->
-
<!ELEMENT PersonProject EMPTY>
<!ATTLIST PersonProject
PersonId CDATA #REQUIRED
@@ -160,6 +238,14 @@
Rolename CDATA #IMPLIED
>
+<!ELEMENT Task EMPTY>
+<!ATTLIST Task
+ TaskId CDATA #REQUIRED
+ PersonId CDATA #REQUIRED
+ ProjectId CDATA #REQUIRED
+ Taskname CDATA #IMPLIED
+>
+
<!ELEMENT FamilyMember EMPTY>
<!ATTLIST FamilyMember
Id CDATA #REQUIRED
@@ -210,6 +296,13 @@
DetailText CDATA #IMPLIED
>
+<!ELEMENT PointTable EMPTY>
+<!ATTLIST PointTable
+ Id CDATA #REQUIRED
+ X CDATA #REQUIRED
+ Y CDATA #REQUIRED
+>
+
<!ELEMENT GraphNode EMPTY>
<!ATTLIST GraphNode
Id CDATA #REQUIRED
@@ -224,96 +317,710 @@
Sink CDATA #REQUIRED
>
-<!ELEMENT Point EMPTY>
-<!ATTLIST Point
+<!ELEMENT Testclassa EMPTY>
+<!ATTLIST Testclassa
Id CDATA #REQUIRED
- X CDATA #REQUIRED
- Y CDATA #REQUIRED
+ Value1 CDATA #IMPLIED
+ Value2 CDATA #IMPLIED
+ Value3 CDATA #REQUIRED
+ Boid CDATA #IMPLIED
+>
+
+<!ELEMENT Testclassb EMPTY>
+<!ATTLIST Testclassb
+ Id CDATA #REQUIRED
+ Value1 CDATA #IMPLIED
+ Aoid CDATA #IMPLIED
+>
+
+<!ELEMENT Relatedtocontract EMPTY>
+<!ATTLIST Relatedtocontract
+ Pk CDATA #REQUIRED
+ Relatedvalue1 CDATA #IMPLIED
+ Relatedvalue2 CDATA #IMPLIED
+ Relatedvalue3 CDATA #IMPLIED
+>
+
+<!ELEMENT Contract EMPTY>
+<!ATTLIST Contract
+ Pk CDATA #REQUIRED
+ FkToRelated CDATA #IMPLIED
+ ContractValue1 CDATA #IMPLIED
+ ContractValue2 CDATA #IMPLIED
+ ContractValue3 CDATA #IMPLIED
+ ContractValue4 CDATA #IMPLIED
+>
+
+<!ELEMENT Version EMPTY>
+<!ATTLIST Version
+ Pk CDATA #REQUIRED
+ FkToContract CDATA #REQUIRED
+ VersionValue1 CDATA #IMPLIED
+ VersionValue2 CDATA #IMPLIED
+ VersionValue3 CDATA #IMPLIED
+>
+
+<!ELEMENT Effectiveness EMPTY>
+<!ATTLIST Effectiveness
+ Pk CDATA #REQUIRED
+ FkToVersion CDATA #REQUIRED
+ EffValue1 CDATA #IMPLIED
+ EffValue2 CDATA #IMPLIED
+ EffValue3 CDATA #IMPLIED
+>
+
+<!ELEMENT Multimappedtable EMPTY>
+<!ATTLIST Multimappedtable
+ Id CDATA #REQUIRED
+ Value1 CDATA #IMPLIED
+ Value2 CDATA #IMPLIED
+ Value3 CDATA #IMPLIED
+ Value4 CDATA #IMPLIED
+ Value5 CDATA #IMPLIED
+ Value6 CDATA #IMPLIED
+ Value7 CDATA #IMPLIED
+ Ojbconcreteclass CDATA #REQUIRED
+>
+
+<!ELEMENT ExtentTestA EMPTY>
+<!ATTLIST ExtentTestA
+ ObjId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT ExtentTestB EMPTY>
+<!ATTLIST ExtentTestB
+ ObjId CDATA #REQUIRED
+ Name CDATA #IMPLIED
>
+
+<!ELEMENT ExtentTestC EMPTY>
+<!ATTLIST ExtentTestC
+ ObjId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT ExtentTestD EMPTY>
+<!ATTLIST ExtentTestD
+ ObjId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT Table1 EMPTY>
+<!ATTLIST Table1
+ Pk CDATA #REQUIRED
+ FkToRelated CDATA #IMPLIED
+>
+
+<!ELEMENT Table2 EMPTY>
+<!ATTLIST Table2
+ Pk CDATA #REQUIRED
+>
+
+<!ELEMENT BidirA EMPTY>
+<!ATTLIST BidirA
+ Pk CDATA #REQUIRED
+ FkToB CDATA #IMPLIED
+>
+
+<!ELEMENT BidirB EMPTY>
+<!ATTLIST BidirB
+ Pk CDATA #REQUIRED
+ FkToA CDATA #IMPLIED
+>
+
+<!ELEMENT Mammal EMPTY>
+<!ATTLIST Mammal
+ Animalid CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ Age CDATA #IMPLIED
+ Numlegs CDATA #IMPLIED
+ Zooid CDATA #IMPLIED
+>
+
+<!ELEMENT Reptile EMPTY>
+<!ATTLIST Reptile
+ Animalid CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ Age CDATA #IMPLIED
+ Color CDATA #IMPLIED
+ Zooid CDATA #IMPLIED
+>
+
+<!ELEMENT Zoo EMPTY>
+<!ATTLIST Zoo
+ Zooid CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT Fish EMPTY>
+<!ATTLIST Fish
+ Foodid CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ Calories CDATA #IMPLIED
+ Typeofwater CDATA #IMPLIED
+>
+
+<!ELEMENT Salad EMPTY>
+<!ATTLIST Salad
+ Foodid CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ Calories CDATA #IMPLIED
+ Color CDATA #IMPLIED
+>
+
+<!ELEMENT Gourmet EMPTY>
+<!ATTLIST Gourmet
+ Gourmetid CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT GourmetFood EMPTY>
+<!ATTLIST GourmetFood
+ GourmetId CDATA #REQUIRED
+ FoodId CDATA #REQUIRED
+>
+
+<!ELEMENT Guidtest EMPTY>
+<!ATTLIST Guidtest
+ Guid CDATA #REQUIRED
+ Guidvalue CDATA #IMPLIED
+>
+
<!ELEMENT ConversionReferrer EMPTY>
<!ATTLIST ConversionReferrer
- Pk1 CDATA #REQUIRED
- Ref1 CDATA #REQUIRED
- TestId CDATA #REQUIRED
+ Pk1 CDATA #REQUIRED
+ Ref1 CDATA #IMPLIED
+ TestId CDATA #IMPLIED
>
<!ELEMENT ConversionReferred EMPTY>
<!ATTLIST ConversionReferred
- Pk1 CDATA #REQUIRED
- TestId CDATA #REQUIRED
+ Pk1 CDATA #REQUIRED
+ TestId CDATA #IMPLIED
+>
+
+<!ELEMENT Site EMPTY>
+<!ATTLIST Site
+ Id CDATA #REQUIRED
+ Name CDATA #REQUIRED
+ Siteyear CDATA #IMPLIED
+ Semester CDATA #IMPLIED
+>
+
+<!ELEMENT OdmgDlist EMPTY>
+<!ATTLIST OdmgDlist
+ Id CDATA #REQUIRED
+ Name CDATA #REQUIRED
+ RndName CDATA #REQUIRED
+>
+
+<!ELEMENT RollbackOne EMPTY>
+<!ATTLIST RollbackOne
+ ObjId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ Description CDATA #IMPLIED
+>
+
+<!ELEMENT RollbackTwo EMPTY>
+<!ATTLIST RollbackTwo
+ ObjId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ Description CDATA #IMPLIED
+>
+
+<!ELEMENT News EMPTY>
+<!ATTLIST News
+ Id CDATA #REQUIRED
+ Headline CDATA #IMPLIED
+>
+
+<!ELEMENT Paper EMPTY>
+<!ATTLIST Paper
+ Id CDATA #REQUIRED
+ Headline CDATA #IMPLIED
+ Issuedate CDATA #IMPLIED
+ Author CDATA #IMPLIED
+>
+
+<!ELEMENT Topic EMPTY>
+<!ATTLIST Topic
+ Id CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT Category EMPTY>
+<!ATTLIST Category
+ Id CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT Area EMPTY>
+<!ATTLIST Area
+ Id CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT ContentQualifier EMPTY>
+<!ATTLIST ContentQualifier
+ ContentId CDATA #REQUIRED
+ QualifierId CDATA #REQUIRED
+>
+
+<!ELEMENT SMInterfaceExtendA EMPTY>
+<!ATTLIST SMInterfaceExtendA
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
+>
+
+<!ELEMENT SMInterfaceExtendAA EMPTY>
+<!ATTLIST SMInterfaceExtendAA
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
+>
+
+<!ELEMENT SMInterfaceExtendAB EMPTY>
+<!ATTLIST SMInterfaceExtendAB
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
+>
+
+<!ELEMENT SMInterfaceExtendAAA EMPTY>
+<!ATTLIST SMInterfaceExtendAAA
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
+>
+
+<!ELEMENT SMInterfaceExtendB EMPTY>
+<!ATTLIST SMInterfaceExtendB
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
+>
+
+<!ELEMENT SMInterfaceExtendBB EMPTY>
+<!ATTLIST SMInterfaceExtendBB
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
>
+<!ELEMENT SmSameTab EMPTY>
+<!ATTLIST SmSameTab
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
+>
+
+<!ELEMENT SmAutoNaming EMPTY>
+<!ATTLIST SmAutoNaming
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
+>
<!ELEMENT SMMaxA EMPTY>
<!ATTLIST SMMaxA
- id CDATA #REQUIRED
- name CDATA #IMPLIED
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
>
<!ELEMENT SMMaxAA EMPTY>
<!ATTLIST SMMaxAA
- id CDATA #REQUIRED
- name CDATA #IMPLIED
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
>
<!ELEMENT SMMaxAB EMPTY>
<!ATTLIST SMMaxAB
- id CDATA #REQUIRED
- name CDATA #IMPLIED
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
>
<!ELEMENT SMMaxAAA EMPTY>
<!ATTLIST SMMaxAAA
- id CDATA #REQUIRED
- name CDATA #IMPLIED
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
>
<!ELEMENT SMMaxB EMPTY>
<!ATTLIST SMMaxB
- id CDATA #REQUIRED
- name CDATA #IMPLIED
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
>
<!ELEMENT SMMaxBB EMPTY>
<!ATTLIST SMMaxBB
- id CDATA #REQUIRED
- name CDATA #IMPLIED
+ id CDATA #REQUIRED
+ name CDATA #IMPLIED
>
-<!ELEMENT News EMPTY>
-<!ATTLIST News
- Id CDATA #REQUIRED
- Headline CDATA #IMPLIED
+<!ELEMENT SmKey EMPTY>
+<!ATTLIST SmKey
+ IntKey CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ StringKey CDATA #REQUIRED
+ LongKey CDATA #REQUIRED
+ IntegerKey CDATA #REQUIRED
>
-<!ELEMENT Paper EMPTY>
-<!ATTLIST Paper
- Id CDATA #REQUIRED
- Headline CDATA #IMPLIED
- Issuedate CDATA #IMPLIED
- Author CDATA #IMPLIED
+<!ELEMENT SmMtTestA EMPTY>
+<!ATTLIST SmMtTestA
+ ObjId CDATA #REQUIRED
+ Name CDATA #IMPLIED
>
-<!ELEMENT Category EMPTY>
-<!ATTLIST Category
- Id CDATA #REQUIRED
- Name CDATA #IMPLIED
+<!ELEMENT SmMtTestB EMPTY>
+<!ATTLIST SmMtTestB
+ ObjId CDATA #REQUIRED
+ Name CDATA #IMPLIED
>
-<!ELEMENT Topic EMPTY>
-<!ATTLIST Topic
- Id CDATA #REQUIRED
- Name CDATA #IMPLIED
+<!ELEMENT EjbCategory EMPTY>
+<!ATTLIST EjbCategory
+ CategoryId CDATA #REQUIRED
+ CategoryName CDATA #IMPLIED
+ Description CDATA #IMPLIED
>
-<!ELEMENT Area EMPTY>
-<!ATTLIST Area
- Id CDATA #REQUIRED
- Name CDATA #IMPLIED
+<!ELEMENT EjbArticle EMPTY>
+<!ATTLIST EjbArticle
+ ArticleId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ Price CDATA #IMPLIED
+ Description CDATA #IMPLIED
+ CategoryId CDATA #IMPLIED
>
-<!ELEMENT ContentQualifier EMPTY>
-<!ATTLIST ContentQualifier
- ContentId CDATA #REQUIRED
- QualifierId CDATA #REQUIRED
+<!ELEMENT EjbPerson EMPTY>
+<!ATTLIST EjbPerson
+ PersonId CDATA #REQUIRED
+ FirstName CDATA #IMPLIED
+ LastName CDATA #IMPLIED
+ Grade CDATA #IMPLIED
+>
+
+<!ELEMENT FieldConversionNode EMPTY>
+<!ATTLIST FieldConversionNode
+ NodeId CDATA #REQUIRED
+ NodeState CDATA #REQUIRED
+ ParentUid CDATA #IMPLIED
+>
+
+<!ELEMENT ConversionVo EMPTY>
+<!ATTLIST ConversionVo
+ PkWithAuto CDATA #REQUIRED
+ PkWithoutAuto CDATA #REQUIRED
+ NormalWithAuto CDATA #IMPLIED
+ NormalWithoutAuto CDATA #IMPLIED
+>
+
+<!ELEMENT PerfArticle EMPTY>
+<!ATTLIST PerfArticle
+ ArticleId CDATA #REQUIRED
+ ArticleName CDATA #IMPLIED
+ MinimumStock CDATA #IMPLIED
+ Price CDATA #IMPLIED
+ Unit CDATA #IMPLIED
+ Stock CDATA #IMPLIED
+ SupplierId CDATA #IMPLIED
+ ProductGroupId CDATA #IMPLIED
+>
+
+<!ELEMENT CacheTest EMPTY>
+<!ATTLIST CacheTest
+ ObjId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT RefRepository EMPTY>
+<!ATTLIST RefRepository
+ RepId CDATA #REQUIRED
+ RefFk CDATA #IMPLIED
+ RefaFk CDATA #IMPLIED
+ RefbFk CDATA #IMPLIED
+ AnimalFk CDATA #IMPLIED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT RefRepositoryFk EMPTY>
+<!ATTLIST RefRepositoryFk
+ RepId CDATA #REQUIRED
+ RefFk CDATA #REQUIRED
+ RefaFk CDATA #REQUIRED
+ RefbFk CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT RefReference EMPTY>
+<!ATTLIST RefReference
+ RefId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ OjbConcreteClass CDATA #IMPLIED
+ RefNameA CDATA #IMPLIED
+ RefNameB CDATA #IMPLIED
+>
+
+<!ELEMENT RefAnimal EMPTY>
+<!ATTLIST RefAnimal
+ AId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ ClassName CDATA #IMPLIED
+ Length CDATA #IMPLIED
+>
+
+<!ELEMENT RefWine EMPTY>
+<!ATTLIST RefWine
+ ObjId CDATA #REQUIRED
+ RegionName CDATA #REQUIRED
+ RegionCountry CDATA #REQUIRED
+ Vintage CDATA #IMPLIED
+ Grape CDATA #IMPLIED
>
+
+<!ELEMENT RefRegion EMPTY>
+<!ATTLIST RefRegion
+ Name CDATA #REQUIRED
+ Country CDATA #REQUIRED
+ Description CDATA #IMPLIED
+>
+
+<!ELEMENT CollectionGatherer EMPTY>
+<!ATTLIST CollectionGatherer
+ GatId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT CollectionCollectibleA EMPTY>
+<!ATTLIST CollectionCollectibleA
+ ColId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ GatId CDATA #IMPLIED
+>
+
+<!ELEMENT CollectionCollectibleBase EMPTY>
+<!ATTLIST CollectionCollectibleBase
+ ColId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ GatId CDATA #IMPLIED
+>
+
+<!ELEMENT CollectionCollectibleB EMPTY>
+<!ATTLIST CollectionCollectibleB
+ ColId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ GatId CDATA #IMPLIED
+>
+
+<!ELEMENT CollectionCollectibleC EMPTY>
+<!ATTLIST CollectionCollectibleC
+ ColId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ GatId CDATA #IMPLIED
+ ExtentName CDATA #IMPLIED
+>
+
+<!ELEMENT CollectionCollectibleCc EMPTY>
+<!ATTLIST CollectionCollectibleCc
+ ColId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ GatId CDATA #IMPLIED
+ ExtentName CDATA #IMPLIED
+>
+
+<!ELEMENT CollectionCollectibleCcc EMPTY>
+<!ATTLIST CollectionCollectibleCcc
+ ColId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ GatId CDATA #IMPLIED
+ ExtentName CDATA #IMPLIED
+>
+
+<!ELEMENT CollectionCollectibleD EMPTY>
+<!ATTLIST CollectionCollectibleD
+ ColId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ OjbConcreteClass CDATA #IMPLIED
+ GatId CDATA #IMPLIED
+>
+
+<!ELEMENT ReadonlyTest EMPTY>
+<!ATTLIST ReadonlyTest
+ ObjId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ RoString CDATA #IMPLIED
+ RoLong CDATA #IMPLIED
+>
+
+<!ELEMENT TableE EMPTY>
+<!ATTLIST TableE
+ Id CDATA #REQUIRED
+ Somesupervalue CDATA #IMPLIED
+>
+
+<!ELEMENT TableF EMPTY>
+<!ATTLIST TableF
+ Id CDATA #REQUIRED
+ EId CDATA #REQUIRED
+ Somevalue CDATA #IMPLIED
+>
+
+<!ELEMENT TableG EMPTY>
+<!ATTLIST TableG
+ Id CDATA #REQUIRED
+ FId CDATA #REQUIRED
+ Somesubvalue CDATA #IMPLIED
+>
+
+<!ELEMENT TableF1 EMPTY>
+<!ATTLIST TableF1
+ Id CDATA #REQUIRED
+ Somevalue CDATA #IMPLIED
+>
+
+<!ELEMENT TableG1 EMPTY>
+<!ATTLIST TableG1
+ Id CDATA #REQUIRED
+ Somesubvalue CDATA #IMPLIED
+>
+
+<!ELEMENT AbstractCollectionZ EMPTY>
+<!ATTLIST AbstractCollectionZ
+ ObjId CDATA #REQUIRED
+ ContainerId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ Somevalue CDATA #IMPLIED
+>
+
+<!ELEMENT AbstractCollectionZz EMPTY>
+<!ATTLIST AbstractCollectionZz
+ ObjId CDATA #REQUIRED
+ ContainerId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ ZzName CDATA #IMPLIED
+ Somevalue CDATA #IMPLIED
+>
+
+<!ELEMENT Xcontainer EMPTY>
+<!ATTLIST Xcontainer
+ ObjId CDATA #REQUIRED
+>
+
+<!ELEMENT ColBookshelfs EMPTY>
+<!ATTLIST ColBookshelfs
+ Pk CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT ColBooks EMPTY>
+<!ATTLIST ColBooks
+ Pk CDATA #REQUIRED
+ BookshelfFk CDATA #REQUIRED
+>
+
+<!ELEMENT ColDvds EMPTY>
+<!ATTLIST ColDvds
+ Pk CDATA #REQUIRED
+ BookshelfFk CDATA #REQUIRED
+>
+
+<!ELEMENT NestedFieldsTab EMPTY>
+<!ATTLIST NestedFieldsTab
+ ObjId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ NestedValue CDATA #IMPLIED
+ NestedDescription CDATA #IMPLIED
+>
+
+<!ELEMENT NestedFieldsEntry EMPTY>
+<!ATTLIST NestedFieldsEntry
+ ObjId CDATA #REQUIRED
+ FkId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT TabComponent EMPTY>
+<!ATTLIST TabComponent
+ PkId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ ParentId CDATA #IMPLIED
+ ChildId CDATA #IMPLIED
+ GroupId CDATA #IMPLIED
+>
+
+<!ELEMENT TabGroup EMPTY>
+<!ATTLIST TabGroup
+ PkId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT LockMulti EMPTY>
+<!ATTLIST LockMulti
+ OjbId CDATA #REQUIRED
+ Version CDATA #IMPLIED
+ RefId CDATA #IMPLIED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT LockMultiRef EMPTY>
+<!ATTLIST LockMultiRef
+ OjbId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+ Version CDATA #IMPLIED
+>
+
+<!ELEMENT CrtEmployee EMPTY>
+<!ATTLIST CrtEmployee
+ EmployeeId CDATA #REQUIRED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT CrtMember EMPTY>
+<!ATTLIST CrtMember
+ RoleId CDATA #REQUIRED
+ EmployeeId CDATA #IMPLIED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT CrtLeader EMPTY>
+<!ATTLIST CrtLeader
+ RoleId CDATA #REQUIRED
+ EmployeeId CDATA #IMPLIED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT CrtProject EMPTY>
+<!ATTLIST CrtProject
+ ProjectId CDATA #REQUIRED
+ EngineerId CDATA #IMPLIED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT CrtSubProject EMPTY>
+<!ATTLIST CrtSubProject
+ SubId CDATA #REQUIRED
+ ProjectId CDATA #IMPLIED
+ TutorId CDATA #IMPLIED
+ Name CDATA #IMPLIED
+>
+
+<!ELEMENT OtmPerson EMPTY>
+<!ATTLIST OtmPerson
+ id CDATA #REQUIRED
+ firstname CDATA #IMPLIED
+ lastname CDATA #IMPLIED
+ mainAddressId CDATA #IMPLIED
+>
+
+<!ELEMENT OtmAddress EMPTY>
+<!ATTLIST OtmAddress
+ id CDATA #REQUIRED
+ country CDATA #IMPLIED
+ city CDATA #IMPLIED
+ street CDATA #IMPLIED
+>
+
+<!ELEMENT OtmAddressDesc EMPTY>
+<!ATTLIST OtmAddressDesc
+ id CDATA #REQUIRED
+ desc CDATA #IMPLIED
+ personId CDATA #REQUIRED
+ addressId CDATA #REQUIRED
+>
+
1.5 +539 -628 db-ojb/build-torque.xml
Index: build-torque.xml
===================================================================
RCS file: /home/cvs/db-ojb/build-torque.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-torque.xml 28 Jul 2002 21:08:22 -0000 1.4
+++ build-torque.xml 1 Feb 2004 22:11:44 -0000 1.5
@@ -1,18 +1,111 @@
<project name="Torque" default="main" basedir=".">
+ <!--
+ Note - You should not have to edit this file.
- <property name="torque.home" value="."/>
+ Instead, if calling build-torque.xml directly, edit the build.properties
+ that is in the same directory. If calling build-torque.xml via another
+ build file, you can also use the build.properties in the same directory,
+ or set the property torque.contextProperties to the file
+ to use in place of build.properties (e.g. project.properties).
+ -->
+
+ <!--
+ For us to load the default.properties from the classpath, we need to bootstrap.
+ To know the right lib.dir for the torque-classpath, we need to manually
+ figure out torque.lib.dir, but to do that, we need to manually figure
+ out torque.contextProperties and load that so that any old configurations
+ still work propertly. Then we can go on and do the rest of the mappings via
+ old.properties.
+ -->
<property name="build.properties" value="build.properties"/>
- <property file="${build.properties}"/>
+ <property name="torque.contextProperties" value="${build.properties}"/>
+ <property file="${torque.contextProperties}"/>
<property name="lib.dir" value="lib"/>
- <property name="idTableXMLFile" value=""/>
+ <property name="torque.lib.dir" value="${lib.dir}"/>
+ <property name="torque.jar" value="torque-3.0.1.jar"/>
- <!-- Build classpath -->
+ <!--
+ Build the classpath. Specifically point to each file we're including to avoid
+ version conflicts in the case of the torque.lib.dir being something like lib.repo.
+ However, we still need to pull in the user's database driver and since we don't
+ know which jar that will be, after we've got all of our specific, version-safe jars,
+ do a general inclusion of the torque.lib.dir to catch any drivers.
+ -->
<path id="torque-classpath">
- <fileset dir="${lib.dir}">
+ <fileset dir="${torque.lib.dir}">
+ <include name="**/commons-beanutils-1.4.1.jar"/>
+ <include name="**/commons-collections-2.0.jar"/>
+ <include name="**/commons-configuration-1.0-dev.jar"/>
+ <include name="**/commons-dbcp-1.0-dev-20020806.jar"/>
+ <include name="**/commons-lang-1.0.jar"/>
+ <include name="**/commons-logging-1.0.2.jar"/>
+ <include name="**/commons-pool-1.0.jar"/>
+ <include name="**/jcs-1.0-dev.jar"/>
+ <include name="**/jdbc-2.0.jar"/>
+ <include name="**/jndi-1.2.1.jar"/>
+ <include name="**/log4j-1.2.6.jar"/>
+ <include name="**/stratum-1.0-b3.jar"/>
+ <include name="**/tomcat-naming-1.0.jar"/>
+ <include name="**/${torque.jar}"/>
+ <include name="**/velocity-1.3.jar"/>
+ <include name="**/village-2.0-dev-20021111.jar"/>
+ <include name="**/xercesImpl-2.0.2.jar"/>
+ <include name="**/xmlParserAPIs-2.0.2.jar"/>
<include name="**/*.jar"/>
</fileset>
</path>
+ <!--
+ The default.properties file will map old properties to the new ones along
+ with setting the corret defaults.
+ -->
+ <property resource="org/apache/torque/default.properties">
+ <classpath>
+ <path refid="torque-classpath"/>
+ </classpath>
+ </property>
+
+ <!--
+ Do forward declarations of all of our tasks to
+ centralize them and clean up the targets.
+ -->
+ <taskdef
+ name="torque-data-model"
+ classpathref="torque-classpath"
+ classname="org.apache.torque.task.TorqueDataModelTask"/>
+ <taskdef
+ name="torque-data-dump"
+ classpathref="torque-classpath"
+ classname="org.apache.torque.task.TorqueDataDumpTask"/>
+ <taskdef
+ name="torque-data-sql"
+ classpathref="torque-classpath"
+ classname="org.apache.torque.task.TorqueDataSQLTask"/>
+ <taskdef
+ name="torque-doc"
+ classpathref="torque-classpath"
+ classname="org.apache.torque.task.TorqueDocumentationTask"/>
+ <taskdef
+ name="torque-jdbc-transform"
+ classpathref="torque-classpath"
+ classname="org.apache.torque.task.TorqueJDBCTransformTask"/>
+ <taskdef
+ name="torque-package-to-path"
+ classpathref="torque-classpath"
+ classname="org.apache.torque.task.PackageAsPathTask"/>
+ <taskdef
+ name="torque-sql"
+ classpathref="torque-classpath"
+ classname="org.apache.torque.task.TorqueSQLTask"/>
+ <taskdef
+ name="torque-sql-exec"
+ classpathref="torque-classpath"
+ classname="org.apache.torque.task.TorqueSQLExec"/>
+ <taskdef
+ name="torque-sql-transform"
+ classpathref="torque-classpath"
+ classname="org.apache.torque.task.TorqueSQLTransformTask"/>
+
<!-- ================================================================ -->
<!-- M A I N T A R G E T -->
<!-- ================================================================ -->
@@ -26,89 +119,140 @@
name="main"
description="==> generates sql + om classes">
- <antcall target="project-sql"/>
- <antcall target="project-om"/>
+ <antcall target="sql"/>
+ <antcall target="om"/>
</target>
- <target
- name="main-classpath"
- description="==> generates sql + om classes">
+ <!-- ================================================================ -->
+ <!-- C H E C K U S E C L A S S P A T H -->
+ <!-- ================================================================ -->
+ <!-- Temporary hack around the propertiesUtil bug. Should -->
+ <!-- be fixed soon. -->
+ <!-- ================================================================ -->
- <antcall target="project-sql-classpath"/>
- <antcall target="project-om-classpath"/>
+ <target name="check-use-classpath">
+ <condition property="torque.internal.useClasspath">
+ <equals arg1="${torque.useClasspath}" arg2="true"/>
+ </condition>
+ </target>
+
+ <!-- ================================================================ -->
+ <!-- C H E C K R U N O N L Y O N S C H E M A C H A N G E -->
+ <!-- ================================================================ -->
+ <!-- Maps the torque.runOnlyOnSchemaChange to -->
+ <!-- torque.internal.runOnlyOnSchemaChange -->
+ <!-- ================================================================ -->
+
+ <target name="check-run-only-on-schema-change">
+ <condition property="torque.internal.runOnlyOnSchemaChange">
+ <equals arg1="${torque.runOnlyOnSchemaChange}" arg2="true"/>
+ </condition>
</target>
<!-- ================================================================ -->
<!-- G E N E R A T E P R O J E C T S Q L -->
<!-- ================================================================ -->
- <!-- Generate the SQL for your project, these are in addition -->
+ <!-- Generate the SQL for your project, These are in addition -->
<!-- to the base Turbine tables! The tables you require for your -->
<!-- project should be specified in project-schema.xml. -->
<!-- ================================================================ -->
<target
- name="project-sql"
+ name="sql-check"
+ depends="check-run-only-on-schema-change"
+ if="torque.internal.runOnlyOnSchemaChange">
+ <uptodate
+ property="torque.internal.sql.uptodate"
+ targetfile="${torque.sql.dir}/${torque.project}-schema.sql">
+ <srcfiles dir="${torque.schema.dir}" includes="**/*-schema.xml" />
+ </uptodate>
+ </target>
+
+ <target
+ name="sql"
+ depends="check-use-classpath, sql-check"
+ unless="torque.internal.sql.uptodate"
description="==> generates the SQL for your project">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
- <echo message="| Generating SQL for OJB Testsuite! |"/>
+ <echo message="| Generating SQL for YOUR Torque project! |"/>
+ <echo message="| Woo hoo! |"/>
<echo message="| |"/>
<echo message="+------------------------------------------+"/>
- <taskdef
- name="torque-sql"
- classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
+ <antcall target="sql-classpath"/>
+ <antcall target="sql-template"/>
+ </target>
+ <target name="sql-classpath" if="torque.internal.useClasspath">
<torque-sql
- contextProperties="${build.properties}"
- controlTemplate="${SQLControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}/sql"
- templatePath="${templatePath}"
basePathToDbProps="sql/base/"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputFile="report.${project}.sql.generation"
- targetDatabase="${database}"
- idTableXMLFile="${idTableXMLFile}">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
+ contextProperties="${torque.contextProperties}"
+ controlTemplate="${torque.template.sql}"
+ idTableXMLFile="${torque.idTableXMLFile}"
+ outputDirectory="${torque.sql.dir}"
+ outputFile="report.${torque.project}.sql.generation"
+ sqldbmap="${torque.sql.dir}/sqldb.map"
+ targetDatabase="${torque.database}"
+ useClasspath="${torque.useClasspath}">
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.sql.includes}"
+ excludes="${torque.schema.sql.excludes}"
+ />
+ </torque-sql>
+ </target>
+
+ <target name="sql-template" unless="torque.internal.useClasspath">
+ <torque-sql
+ basePathToDbProps="sql/base/"
+ contextProperties="${torque.contextProperties}"
+ controlTemplate="${torque.template.sql}"
+ idTableXMLFile="${torque.idTableXMLFile}"
+ outputDirectory="${torque.sql.dir}"
+ outputFile="report.${torque.project}.sql.generation"
+ sqldbmap="${torque.sql.dir}/sqldb.map"
+ targetDatabase="${torque.database}"
+ templatePath="${torque.templatePath}">
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.sql.includes}"
+ excludes="${torque.schema.sql.excludes}"
+ />
</torque-sql>
</target>
<!-- ================================================================ -->
<!-- G E N E R A T E D O C S -->
<!-- ================================================================ -->
+ <!-- Generates documentation to -->
+ <!-- ${torque.doc.dir}/project-schema.html -->
+ <!-- ================================================================ -->
+
<target
- name="project-doc"
+ name="doc"
description="==> generates documentation for your datamodel">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
- <echo message="| Generating docs for OJB Testsuite! |"/>
+ <echo message="| Generating docs for YOUR datamodel! |"/>
+ <echo message="| Woo hoo! |"/>
<echo message="| |"/>
<echo message="+------------------------------------------+"/>
- <taskdef
- name="torque-doc"
- classname="org.apache.torque.task.TorqueDocumentationTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
<torque-doc
- contextProperties="${build.properties}"
- controlTemplate="${DocControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}/doc"
- outputFormat="${documentationFormat}"
- templatePath="${templatePath}"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputFile="report.${project}.doc.generation">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
+ contextProperties="${torque.contextProperties}"
+ controlTemplate="${torque.template.doc}"
+ outputDirectory="${torque.doc.dir}"
+ outputFile="report.${torque.project}.doc.generation"
+ outputFormat="${torque.doc.format}"
+ sqldbmap="${torque.sql.dir}/sqldb.map"
+ templatePath="${torque.templatePath}"
+ useClasspath="${torque.useClasspath}">
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.doc.includes}"
+ excludes="${torque.schema.doc.excludes}"
+ />
</torque-doc>
</target>
@@ -119,40 +263,43 @@
<!-- that is capable of performing the task. -->
<!-- ================================================================ -->
+ <target name="create-db-check">
+ <condition property="torque.internal.manualCreation">
+ <equals arg1="${torque.database.manualCreation}" arg2="true"/>
+ </condition>
+ </target>
+
<target
- name="project-create-db"
- unless="database.manual.creation"
+ name="create-db"
+ unless="torque.internal.manualCreation"
+ depends="create-db-check"
description="==> generates the target database">
- <taskdef
- name="torque-create-db"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-create-db
- controlTemplate="sql/db-init/Control.vm"
- outputDirectory="${torque.home}/${outputDirectory}/sql"
- targetDatabase="${database}"
- templatePath="${templatePath}"
- outputFile="create-db.sql">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </torque-create-db>
+ <torque-data-model
+ controlTemplate="${torque.template.sqlDbInit}"
+ outputDirectory="${torque.sql.dir}"
+ outputFile="create-db.sql"
+ targetDatabase="${torque.database}"
+ templatePath="${torque.templatePath}"
+ useClasspath="${torque.useClasspath}">
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.create-db.includes}"
+ excludes="${torque.schema.create-db.excludes}"
+ />
+ </torque-data-model>
<echo>
Executing the create-db.sql script ...
</echo>
<sql
- driver="${databaseDriver}"
- url="${createDatabaseUrl}"
- userid="${databaseUser}"
- password="${databasePassword}"
- src="${torque.home}/${outputDirectory}/sql/create-db.sql"
autocommit="true"
- onerror="continue">
+ driver="${torque.database.driver}"
+ onerror="continue"
+ password="${torque.database.password}"
+ src="${torque.sql.dir}/create-db.sql"
+ url="${torque.database.createUrl}"
+ userid="${torque.database.user}">
<classpath refid="torque-classpath"/>
</sql>
</target>
@@ -162,39 +309,20 @@
<!-- ================================================================ -->
<target
- name="project-insert-sql">
-
- <taskdef
- name="torque-insert-sql"
- classname="org.apache.torque.task.TorqueSQLExec">
- <classpath refid="torque-classpath"/>
- </taskdef>
+ name="insert-sql"
+ description="==> inserts the generated sql ">
- <torque-insert-sql
- driver="${databaseDriver}"
- url="${buildDatabaseUrl}"
- userid="${databaseUser}"
- password="${databasePassword}"
+ <torque-sql-exec
autocommit="true"
+ driver="${torque.database.driver}"
onerror="continue"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- srcDir="${torque.home}/${outputDirectory}/sql">
+ password="${torque.database.password}"
+ sqldbmap="${torque.sql.dir}/sqldb.map"
+ srcDir="${torque.sql.dir}"
+ url="${torque.database.buildUrl}"
+ userid="${torque.database.user}">
<classpath refid="torque-classpath"/>
- </torque-insert-sql>
-
- <!--<torque-insert-sql
- driver="${databaseDriver}"
- url="jdbc:hsqldb:${build.test}/OJB_INTERNAL"
- userid="${databaseUser}"
- password="${databasePassword}"
- autocommit="true"
- onerror="continue"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- srcDir="${torque.home}/${outputDirectory}/sql">
- <classpath refid="torque-classpath"/>
- </torque-insert-sql>-->
-
-
+ </torque-sql-exec>
</target>
<!-- ================================================================ -->
@@ -202,7 +330,7 @@
<!-- ================================================================ -->
<target
- name="project-jdbc"
+ name="jdbc"
description="==> jdbc to xml">
<echo message="+-----------------------------------------------+"/>
@@ -211,22 +339,15 @@
<echo message="| Woo hoo! |"/>
<echo message="| |"/>
<echo message="+-----------------------------------------------+"/>
- <echo message=" taking build.properties from: ${build.properties}"/>
- <taskdef
- name="torque-jdbc"
- classname="org.apache.torque.task.TorqueJDBCTransformTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-jdbc
- dbUrl="${databaseUrl}"
- dbDriver="${databaseDriver}"
- dbUser="${databaseUser}"
- dbPassword="${databasePassword}"
- dbSchema="${databaseSchema}"
- outputFile="${torque.home}/${outputDirectory}/schema.xml"
- sameJavaName="${sameJavaName}"
+ <torque-jdbc-transform
+ dbDriver="${torque.database.driver}"
+ dbPassword="${torque.database.password}"
+ dbSchema="${torque.database.schema}"
+ dbUrl="${torque.database.url}"
+ dbUser="${torque.database.user}"
+ outputFile="${torque.schema.dir}/schema.xml"
+ sameJavaName="${torque.sameJavaName}"
/>
</target>
@@ -235,7 +356,7 @@
<!-- ================================================================ -->
<target
- name="project-datasql"
+ name="datasql"
description="==> generates sql from data xml">
<echo message="+-----------------------------------------------+"/>
@@ -244,25 +365,19 @@
<echo message="| Woo hoo! |"/>
<echo message="| |"/>
<echo message="+-----------------------------------------------+"/>
- <echo message=" taking build.properties from: ${build.properties}"/>
-
- <taskdef
- name="torque-datasql"
- classname="org.apache.torque.task.TorqueDataSQLTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
- <torque-datasql
- contextProperties="${build.properties}"
- controlTemplate="${DataSQLControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}"
- templatePath="${templatePath}"
- outputFile="${project}-data.sql"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- dataXmlFile="${torque.home}/${schemaDirectory}/${project}-data.xml"
- dataDTD="${torque.home}/${schemaDirectory}/${project}-data.dtd"
- targetDatabase="${database}"
- sqldbmap="${basedir}/${outputDirectory}/sql/sqldb.map"
+ <torque-data-sql
+ contextProperties="${torque.contextProperties}"
+ controlTemplate="${torque.template.dataSql}"
+ dataDTD="${torque.schema.dir}/${torque.project}-data.dtd"
+ dataXmlFile="${torque.schema.dir}/${torque.project}-data.xml"
+ outputDirectory="${torque.output.dir}"
+ outputFile="${torque.project}-data.sql"
+ sqldbmap="${torque.sql.dir}/sqldb.map"
+ targetDatabase="${torque.database}"
+ templatePath="${torque.templatePath}"
+ useClasspath="${torque.useClasspath}"
+ xmlFile="${torque.schema.dir}/${torque.project}-schema.xml"
/>
</target>
@@ -271,7 +386,8 @@
<!-- ================================================================ -->
<target
- name="id-table-init-sql">
+ name="id-table-init-sql"
+ description="==> generates initialization sql for ID Broker">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
@@ -280,25 +396,20 @@
<echo message="| |"/>
<echo message="+------------------------------------------+"/>
- <taskdef
- name="torque-sql"
- classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
<torque-sql
- contextProperties="${templatePath}/sql/id-table/project.props"
- controlTemplate="${idTableControlTemplate}"
- templatePath="${templatePath}"
+ contextProperties="${torque.contextProperties}"
+ controlTemplate="${torque.template.idTable}"
+ outputDirectory="${torque.sql.dir}"
+ outputFile="report.idtable-init.sql.generation"
+ sqldbmap="${torque.sql.dir}/sqldb.map"
suffix="-idtable-init"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputDirectory="${torque.home}/${outputDirectory}/sql"
- outputFile="${database}-id-table-init.sql"
- targetDatabase="${database}">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- <exclude name="id-table-schema.xml"/>
- </fileset>
+ targetDatabase="${torque.database}"
+ templatePath="${torque.templatePath}"
+ useClasspath="${torque.useClasspath}">
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.init-sql.includes}"
+ excludes="${torque.schema.init-sql.excludes}"
+ />
</torque-sql>
</target>
@@ -307,7 +418,7 @@
<!-- ================================================================ -->
<target
- name="project-datadump"
+ name="datadump"
description="==> dump data from database into xml file">
<echo message="+-----------------------------------------------+"/>
@@ -316,26 +427,20 @@
<echo message="| Woo hoo! |"/>
<echo message="| |"/>
<echo message="+-----------------------------------------------+"/>
- <echo message=" taking build.properties from: ${build.properties}"/>
- <taskdef
- name="torque-datadump"
- classname="org.apache.torque.task.TorqueDataDumpTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-datadump
- contextProperties="${build.properties}"
- controlTemplate="${DataDumpControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}"
- templatePath="${templatePath}"
- outputFile="report.${project}.datadump.generation"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- databaseDriver="${databaseDriver}"
- databaseUrl="${databaseUrl}"
- databaseUser="${databaseUser}"
- databasePassword="${databasePassword}"
- databaseName="${databaseName}"
+ <torque-data-dump
+ contextProperties="${torque.contextProperties}"
+ controlTemplate="${torque.template.dataDump}"
+ databaseDriver="${torque.database.driver}"
+ databaseName="${torque.database.name}"
+ databaseUrl="${torque.database.url}"
+ databaseUser="${torque.database.user}"
+ databasePassword="${torque.database.password}"
+ outputDirectory="${torque.output.dir}"
+ outputFile="report.${torque.project}.datadump.generation"
+ templatePath="${torque.templatePath}"
+ useClasspath="${torque.useClasspath}"
+ xmlFile="${torque.schema.dir}/${torque.project}-schema.xml"
/>
</target>
@@ -346,29 +451,24 @@
<!-- ================================================================ -->
<target
- name="project-datadtd"
+ name="datadtd"
description="==> generates the DATA DTD for your project">
<echo message="+-----------------------------------------------+"/>
<echo message="| |"/>
- <echo message="| Generating Data DTD for YOUR Turbine project! |"/>
+ <echo message="| Generating Data DTD for YOUR Torque project! |"/>
<echo message="| Woo hoo! |"/>
<echo message="| |"/>
<echo message="+-----------------------------------------------+"/>
- <taskdef
- name="torque-datadtd"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-datadtd
- contextProperties="${build.properties}"
- controlTemplate="${DataDTDControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}"
- templatePath="${templatePath}"
- outputFile="report.${project}.datadtd.generation"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
+ <torque-data-model
+ contextProperties="${torque.contextProperties}"
+ controlTemplate="${torque.template.dataDtd}"
+ outputDirectory="${torque.output.dir}"
+ outputFile="report.${torque.project}.datadtd.generation"
+ templatePath="${torque.templatePath}"
+ useClasspath="${torque.useClasspath}"
+ xmlFile="${torque.schema.dir}/${torque.project}-schema.xml"
/>
</target>
@@ -380,341 +480,183 @@
<!-- ================================================================ -->
<target
- name="project-om"
- description="==> generates the Peer-based object model for your project">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating Peer-based Object Model for |"/>
- <echo message="| YOUR Turbine project! Woo hoo! |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="torque-om"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-om
- contextProperties="${build.properties}"
- controlTemplate="${OMControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}/java"
- templatePath="${templatePath}"
- outputFile="report.${project}.om.generation"
- targetPackage="${targetPackage}.om"
- targetDatabase="${database}">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- <exclude name="id-table-schema.xml"/>
- </fileset>
- </torque-om>
+ name="om-check"
+ depends="check-run-only-on-schema-change"
+ if="torque.internal.runOnlyOnSchemaChange">
+ <uptodate
+ property="torque.internal.om.uptodate"
+ targetfile="${torque.java.dir}/report.${torque.project}.om.generation">
+ <srcfiles dir="${torque.schema.dir}" includes="**/*-schema.xml" />
+ </uptodate>
</target>
- <!-- ================================================================ -->
- <!-- G E N E R A T E P R O J E C T S Q L -->
- <!-- ================================================================ -->
- <!-- Generate the SQL for your project, these are in addition -->
- <!-- to the base Turbine tables! The tables you require for your -->
- <!-- project should be specified in project-schema.xml. -->
- <!-- ================================================================ -->
-
<target
- name="project-sql-classpath"
- description="==> generates the SQL for your project">
+ name="om"
+ depends="check-use-classpath, om-check"
+ unless="torque.internal.om.uptodate"
+ description="==> generates the Peer-based object model for your project">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
- <echo message="| Generating SQL for OJB Testsuite! |"/>
- <echo message="| enJoy! |"/>
+ <echo message="| Generating Peer-based Object Model for |"/>
+ <echo message="| YOUR Torque project! Woo hoo! |"/>
<echo message="| |"/>
<echo message="+------------------------------------------+"/>
- <taskdef
- name="torque-sql"
- classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-sql
- contextProperties="${build.properties}"
- controlTemplate="${SQLControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}/sql"
- useClasspath="true"
- basePathToDbProps="sql/base/"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputFile="report.${project}.sql.generation"
- targetDatabase="${database}"
- idTableXMLFile="${idTableXMLFile}">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </torque-sql>
+ <antcall target="om-classpath"/>
+ <antcall target="om-template"/>
+ <!-- antcall target="zip-base-om"/ -->
</target>
- <!-- ================================================================ -->
- <!-- Generate SQL from XML data file -->
- <!-- ================================================================ -->
-
- <target
- name="project-datasql-classpath"
- description="==> generates sql from data xml">
-
- <echo message="+-----------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating SQL from data XML ! |"/>
- <echo message="| enJoy! |"/>
- <echo message="| |"/>
- <echo message="+-----------------------------------------------+"/>
- <echo message=" taking build.properties from: ${build.properties}"/>
-
- <taskdef
- name="torque-datasql"
- classname="org.apache.torque.task.TorqueDataSQLTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-datasql
- contextProperties="${build.properties}"
- controlTemplate="${DataSQLControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}/sql"
- useClasspath="true"
- outputFile="${project}-data.sql"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- dataXmlFile="${torque.home}/${schemaDirectory}/${project}-data.xml"
- dataDTD="${torque.home}/${schemaDirectory}/${project}-data.dtd"
- targetDatabase="${database}"
- sqldbmap="${basedir}/${outputDirectory}/sql/sqldb.map"
- />
+ <target name="om-classpath" if="torque.internal.useClasspath">
+ <torque-data-model
+ contextProperties="${torque.contextProperties}"
+ controlTemplate="${torque.template.om}"
+ outputDirectory="${torque.java.dir}"
+ outputFile="report.${torque.project}.om.generation"
+ targetDatabase="${torque.database}"
+ targetPackage="${torque.targetPackage}"
+ useClasspath="${torque.useClasspath}">
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.om.includes}"
+ excludes="${torque.schema.om.excludes}"
+ />
+ </torque-data-model>
</target>
- <!-- ================================================================ -->
- <!-- G E N E R A T E P R O J E C T D A T A D T D -->
- <!-- ================================================================ -->
- <!-- Generate the DATA DTD for your project -->
- <!-- ================================================================ -->
-
- <target
- name="project-datadtd-classpath"
- description="==> generates the DATA DTD for your project">
-
- <echo message="+-----------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating Data DTD for YOUR Turbine project! |"/>
- <echo message="| enJoy! |"/>
- <echo message="| |"/>
- <echo message="+-----------------------------------------------+"/>
-
- <taskdef
- name="torque-datadtd"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-datadtd
- contextProperties="${build.properties}"
- controlTemplate="${DataDTDControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}"
- useClasspath="true"
- outputFile="report.${project}.datadtd.generation"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- />
+ <target name="om-template" unless="torque.internal.useClasspath">
+ <torque-data-model
+ contextProperties="${torque.contextProperties}"
+ controlTemplate="${torque.template.om}"
+ outputDirectory="${torque.java.dir}"
+ outputFile="report.${torque.project}.om.generation"
+ targetDatabase="${torque.database}"
+ targetPackage="${torque.targetPackage}"
+ templatePath="${torque.templatePath}">
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.om.includes}"
+ excludes="${torque.schema.om.excludes}"
+ />
+ </torque-data-model>
</target>
- <!-- ================================================================ -->
- <!-- Dump data from database into xml file -->
- <!-- ================================================================ -->
-
- <target
- name="project-datadump-classpath"
- description="==> dump data from database into xml file">
-
- <echo message="+-----------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Dumping the data from database into XML |"/>
- <echo message="| enJoy! |"/>
- <echo message="| |"/>
- <echo message="+-----------------------------------------------+"/>
- <echo message=" taking build.properties from: ${build.properties}"/>
-
- <taskdef
- name="torque-datadump"
- classname="org.apache.torque.task.TorqueDataDumpTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-datadump
- contextProperties="${build.properties}"
- controlTemplate="${DataDumpControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}"
- useClasspath="true"
- outputFile="report.${project}.datadump.generation"
- xmlFile="${torque.home}/${schemaDirectory}/${project}-schema.xml"
- databaseDriver="${databaseDriver}"
- databaseUrl="${databaseUrl}"
- databaseUser="${databaseUser}"
- databasePassword="${databasePassword}"
- databaseName="${databaseName}"
- />
- </target>
-
- <!-- ================================================================ -->
- <!-- G E N E R A T E P R O J E C T P E E R B A S E D O M -->
- <!-- ================================================================ -->
- <!-- Generate the Peer-based object model for your project. -->
- <!-- These are in addition to the base Turbine OM! -->
- <!-- ================================================================ -->
-
- <target
- name="project-om-classpath"
- description="==> generates the Peer-based object model for your project">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating Peer-based Object Model for |"/>
- <echo message="| YOUR Turbine project! enJoy! |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="torque-om"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-om
- contextProperties="${build.properties}"
- controlTemplate="${OMControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}/java"
- useClasspath="true"
- outputFile="report.${project}.om.generation"
- targetPackage="${targetPackage}.om"
- targetDatabase="${database}">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- <exclude name="id-table-schema.xml"/>
- </fileset>
- </torque-om>
- </target>
<!-- ================================================================ -->
- <!-- C R E A T E T A R G E T D A T A B A S E -->
+ <!-- G E N E R A T E O M Z I P F I L E -->
<!-- ================================================================ -->
- <!-- Create the target database by executing a generated script -->
- <!-- that is capable of performing the task. -->
+ <!-- Moves the files out of your source tree and into a zip file. -->
<!-- ================================================================ -->
- <target
- name="project-create-db-classpath"
- unless="database.manual.creation"
- description="==> generates the target database">
-
- <taskdef
- name="torque-create-db"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <echo>
- driver="${databaseDriver}"
- url="${createDatabaseUrl}"
- userid="${databaseUser}"
- password="${databasePassword}"
- </echo>
-
- <torque-create-db
- controlTemplate="sql/db-init/Control.vm"
- outputDirectory="${torque.home}/${outputDirectory}/sql"
- targetDatabase="${database}"
- useClasspath="true"
- outputFile="create-db.sql">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </torque-create-db>
-
- <sql
- driver="${databaseDriver}"
- url="${createDatabaseUrl}"
- userid="${databaseUser}"
- password="${databasePassword}"
- src="${torque.home}/${outputDirectory}/sql/create-db.sql"
- autocommit="true"
- onerror="continue">
- <classpath refid="torque-classpath"/>
- </sql>
-
+ <target name="check-om-zip">
+ <condition property="torque.internal.omzip.src.base">
+ <equals arg1="${torque.omzip.src.base}" arg2="true"/>
+ </condition>
+ <condition property="torque.internal.omzip.src.extension">
+ <equals arg1="${torque.omzip.src.extension}" arg2="true"/>
+ </condition>
+ <condition property="torque.internal.omzip.bin.base">
+ <equals arg1="${torque.omzip.bin.base}" arg2="true"/>
+ </condition>
+ <condition property="torque.internal.omzip.bin.extension">
+ <equals arg1="${torque.omzip.bin.extension}" arg2="true"/>
+ </condition>
+ <condition property="torque.internal.omzip.deleteFiles">
+ <equals arg1="${torque.omzip.deleteFiles}" arg2="true"/>
+ </condition>
</target>
- <!-- ================================================================ -->
- <!-- G E N E R A T E I D B R O K E R I N I T S Q L -->
- <!-- ================================================================ -->
-
<target
- name="id-table-init-sql-classpath">
+ name="om-zip"
+ depends="check-om-zip"
+ description="==> moves source om files to separate jar and out of the source tree">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
- <echo message="| Generating initialization SQL |"/>
- <echo message="| for ID Broker system! |"/>
+ <echo message="| Zipping the Object Model files for YOUR |"/>
+ <echo message="| Torque project! Woo hoo! |"/>
<echo message="| |"/>
<echo message="+------------------------------------------+"/>
- <taskdef
- name="torque-sql"
- classname="org.apache.torque.task.TorqueSQLTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
+ <!-- Perform the package to path converison. -->
+ <torque-package-to-path
+ name="torque.internal.omzip.packagePath"
+ package="${torque.targetPackage}"
+ />
- <torque-sql
- contextProperties="sql/id-table/project.props"
- controlTemplate="${idTableControlTemplate}"
- useClasspath="true"
- suffix="-idtable-init"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputDirectory="${torque.home}/${outputDirectory}/sql"
- outputFile="${database}-id-table-init.sql"
- targetDatabase="${database}">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- <exclude name="id-table-schema.xml"/>
+ <!-- See if the source files need jar'ed. -->
+ <antcall target="om-zip-worker">
+ <param name="torque.internal.omzip.type" value="src"/>
+ <param name="torque.internal.omzip.pattern" value="base"/>
+ <param name="torque.internal.omzip.files" value="java"/>
+ <param name="torque.internal.omzip.dir" value="${torque.java.dir}"/>
+ </antcall>
+ <antcall target="om-zip-worker">
+ <param name="torque.internal.omzip.type" value="src"/>
+ <param name="torque.internal.omzip.pattern" value="extension"/>
+ <param name="torque.internal.omzip.files" value="java"/>
+ <param name="torque.internal.omzip.dir" value="${torque.java.dir}"/>
+ </antcall>
+ <!-- See if the class files need jar'ed. -->
+ <antcall target="om-zip-worker">
+ <param name="torque.internal.omzip.type" value="bin"/>
+ <param name="torque.internal.omzip.pattern" value="base"/>
+ <param name="torque.internal.omzip.files" value="class"/>
+ <param name="torque.internal.omzip.dir" value="${torque.compile.build.dir}"/>
+ </antcall>
+ <antcall target="om-zip-worker">
+ <param name="torque.internal.omzip.type" value="bin"/>
+ <param name="torque.internal.omzip.pattern" value="extension"/>
+ <param name="torque.internal.omzip.files" value="class"/>
+ <param name="torque.internal.omzip.dir" value="${torque.compile.build.dir}"/>
+ </antcall>
+ </target>
+
+ <target
+ name="om-zip-worker"
+ if="torque.internal.omzip.${torque.internal.omzip.type}.${torque.internal.omzip.pattern}">
+
+ <!-- Base files that typically aren't modified. -->
+ <patternset id="torque.internal.omzip.pattern.base">
+ <include name="${torque.internal.omzip.packagePath}/${torque.basePrefix}*.${torque.internal.omzip.files}"/>
+ <include name="${torque.internal.omzip.packagePath}/map/*MapBuilder.${torque.internal.omzip.files}"/>
+ </patternset>
+ <!-- Extension files that typically are modified. -->
+ <patternset id="torque.internal.omzip.pattern.extension">
+ <include name="${torque.internal.omzip.packagePath}/*.${torque.internal.omzip.files}"/>
+ </patternset>
+
+ <jar
+ jarfile="${torque.omzip.dir}/${torque.project}-om-${torque.internal.omzip.type}.jar"
+ update="true">
+ <fileset dir="${torque.internal.omzip.dir}">
+ <patternset refid="torque.internal.omzip.pattern.${torque.internal.omzip.pattern}"/>
+ </fileset>
+ </jar>
+
+ <antcall target="om-zip-worker-delete"/>
+
+ </target>
+
+ <target
+ name="om-zip-worker-delete"
+ if="torque.internal.omzip.deleteFiles">
+
+ <!-- Base files that typically aren't modified. -->
+ <patternset id="torque.internal.omzip.pattern.base">
+ <include name="${torque.internal.omzip.packagePath}/${torque.basePrefix}*.*"/>
+ <include name="${torque.internal.omzip.packagePath}/map/*MapBuilder.*"/>
+ </patternset>
+ <!-- Extension files that typically are modified. -->
+ <patternset id="torque.internal.omzip.pattern.extension">
+ <include name="${torque.internal.omzip.packagePath}/*.*"/>
+ </patternset>
+
+ <delete>
+ <fileset dir="${torque.internal.omzip.dir}">
+ <patternset refid="torque.internal.omzip.pattern.${torque.internal.omzip.pattern}"/>
</fileset>
- </torque-sql>
- </target>
-
- <!-- ================================================================ -->
- <!-- G E N E R A T E D O C S -->
- <!-- ================================================================ -->
+ </delete>
- <target
- name="project-doc-classpath"
- description="==> generates documentation for your datamodel">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating docs for YOUR datamodel! |"/>
- <echo message="| enJoy! |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="torque-doc"
- classname="org.apache.torque.task.TorqueDocumentationTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <torque-doc
- contextProperties="${build.properties}"
- controlTemplate="${DocControlTemplate}"
- outputDirectory="${torque.home}/${outputDirectory}/doc"
- outputFormat="${documentationFormat}"
- useClasspath="true"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputFile="report.${project}.doc.generation">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </torque-doc>
</target>
<!-- =================================================================== -->
@@ -725,24 +667,14 @@
name="compile"
description="==> compiles the OM classes">
- <!--
- This should be moved to the top of the file, and
- the values should come from the build.properties file.
- -->
-
- <property name="src.dir" value="${outputDirectory}/java"/>
- <property name="build.dest" value="bin/classes"/>
- <property name="debug" value="on"/>
- <property name="deprecation" value="off"/>
- <property name="optimize" value="off"/>
-
- <mkdir dir="${build.dest}"/>
-
- <javac srcdir="${src.dir}"
- destdir="${build.dest}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}">
+ <mkdir dir="${torque.compile.build.dir}"/>
+
+ <javac
+ debug="${torque.compile.debug}"
+ deprecation="${torque.compile.deprecation}"
+ destdir="${torque.compile.build.dir}"
+ optimize="${torque.compile.optimize}"
+ srcdir="${torque.compile.src.dir}">
<classpath refid="torque-classpath"/>
</javac>
</target>
@@ -758,18 +690,12 @@
<!-- =================================================================== -->
<target
- name="project-sql2xml"
+ name="sql2xml"
description="==> creates an xml schema from an sql schema">
- <taskdef
- name="sql-xml"
- classname="org.apache.torque.task.TorqueSQLTransformTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <sql-xml
- inputFile="schema/schema.sql"
- outputFile="schema/schema.xml"
+ <torque-sql-transform
+ inputFile="${torque.schema.dir}/schema.sql"
+ outputFile="${torque.schema.dir}/schema.xml"
/>
</target>
@@ -781,28 +707,27 @@
name="javadocs"
description="==> generates the API documentation">
- <mkdir dir="${torque.home}/${outputDirectory}/javadoc"/>
+ <mkdir dir="${torque.javadoc.dir}"/>
<javadoc
- sourcepath="${torque.home}/${outputDirectory}"
- packagenames="${targetPackage}.*"
- destdir="${outputDirectory}/javadoc"
author="true"
+ destdir="${torque.javadoc.dir}"
+ packagenames="${torque.targetPackage}.*"
private="true"
- version="true"
- use="true">
+ sourcepath="${torque.java.dir}"
+ use="true"
+ version="true">
<classpath refid="torque-classpath"/>
</javadoc>
</target>
<!-- =================================================================== -->
- <!-- =================================================================== -->
<!-- O J B S T U F F -->
<!-- =================================================================== -->
- <!-- =================================================================== -->
<target
- name="project-ojb-repository">
+ name="ojb-repository"
+ description="==> generates the repository for ojb (experimental)">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
@@ -810,59 +735,26 @@
<echo message="| |"/>
<echo message="+------------------------------------------+"/>
- <taskdef
- name="ojb-repository"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <ojb-repository
- contextProperties="${build.properties}"
- controlTemplate="ojb/repository/Control.vm"
- targetPackage="${targetPackage}.om"
- targetDatabase="${database}"
- outputDirectory="${torque.home}/${outputDirectory}/ojb"
- templatePath="${templatePath}"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputFile="report.${project}.ojb.generation">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </ojb-repository>
+ <torque-data-model
+ contextProperties="${torque.contextProperties}"
+ controlTemplate="${torque.template.ojb}"
+ targetDatabase="${torque.database}"
+ targetPackage="${torque.targetPackage}"
+ outputDirectory="${torque.ojb.dir}"
+ outputFile="report.${torque.project}.ojb.generation"
+ sqldbmap="${torque.sql.dir}/sqldb.map"
+ templatePath="${torque.templatePath}"
+ useClasspath="${torque.useClasspath}">
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.ojb.includes}"
+ excludes="${torque.schema.ojb.excludes}"
+ />
+ </torque-data-model>
</target>
<target
- name="project-ojb-repository-classpath">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating OJB repository |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="ojb-repository"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <ojb-repository
- contextProperties="${build.properties}"
- controlTemplate="ojb/repository/Control.vm"
- targetPackage="${targetPackage}.om"
- targetDatabase="${database}"
- outputDirectory="${torque.home}/${outputDirectory}/ojb"
- useClasspath="true"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputFile="report.${project}.ojb.generation">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </ojb-repository>
- </target>
-
- <target
- name="project-ojb-model">
+ name="ojb-model"
+ description="==> generates an object model for ojb (experimental)">
<echo message="+------------------------------------------+"/>
<echo message="| |"/>
@@ -870,55 +762,74 @@
<echo message="| |"/>
<echo message="+------------------------------------------+"/>
- <taskdef
- name="ojb-model"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <ojb-model
- contextProperties="${build.properties}"
- controlTemplate="ojb/model/Control.vm"
- targetPackage="${targetPackage}.om"
- targetDatabase="${database}"
- outputDirectory="${torque.home}/${outputDirectory}/ojb"
- templatePath="${templatePath}"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputFile="report.${project}.ojb.generation">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </ojb-model>
+ <torque-data-model
+ contextProperties="${torque.contextProperties}"
+ controlTemplate="${torque.template.ojbModel}"
+ targetDatabase="${torque.database}"
+ targetPackage="${torque.targetPackage}"
+ outputDirectory="${torque.ojb.dir}"
+ outputFile="report.${torque.project}.ojb.generation"
+ sqldbmap="${torque.sql.dir}/sqldb.map"
+ templatePath="${torque.templatePath}"
+ useClasspath="${torque.useClasspath}">
+ <fileset dir="${torque.schema.dir}"
+ includes="${torque.schema.ojb.includes}"
+ excludes="${torque.schema.ojb.excludes}"
+ />
+ </torque-data-model>
+ </target>
+
+ <!--
+ Deprecated targets with the project- prefix.
+ -->
+ <target name="project-sql">
+ <echo message="The 'project-sql' target is deprecated. Please use the 'sql' target instead."/>
+ <antcall target="sql"/>
+ </target>
+ <target name="project-om">
+ <echo message="The 'project-om' target is deprecated. Please use the 'om' target instead."/>
+ <antcall target="om"/>
+ </target>
+ <target name="project-doc">
+ <echo message="The 'project-doc' target is deprecated. Please use the 'doc' target instead."/>
+ <antcall target="doc"/>
+ </target>
+ <target name="project-create-db">
+ <echo message="The 'project-create-db' target is deprecated. Please use the 'create-db' target instead."/>
+ <antcall target="create-db"/>
+ </target>
+ <target name="project-insert-sql">
+ <echo message="The 'project-insert-sql' target is deprecated. Please use the 'insert-sql' target instead."/>
+ <antcall target="insert-sql"/>
+ </target>
+ <target name="project-jdbc">
+ <echo message="The 'project-jdbc' target is deprecated. Please use the 'jdbc' target instead."/>
+ <antcall target="jdbc"/>
+ </target>
+ <target name="project-datasql">
+ <echo message="The 'project-datasql' target is deprecated. Please use the 'datasql' target instead."/>
+ <antcall target="datasql"/>
+ </target>
+ <target name="project-datadump">
+ <echo message="The 'project-datadump' target is deprecated. Please use the 'datadump' target instead."/>
+ <antcall target="datadump"/>
+ </target>
+ <target name="project-datadtd">
+ <echo message="The 'project-datadtd' target is deprecated. Please use the 'datadtd' target instead."/>
+ <antcall target="datadtd"/>
+ </target>
+ <target name="project-sql2xml">
+ <echo message="The 'project-sql2xml' target is deprecated. Please use the 'sql2xml' target instead."/>
+ <antcall target="sql2xml"/>
+ </target>
+ <target name="project-ojb-repository">
+ <echo message="The 'project-ojb-repository' target is deprecated. Please use the 'ojb-repository' target instead."/>
+ <antcall target="ojb-repository"/>
+ </target>
+ <target name="project-ojb-model">
+ <echo message="The 'project-obj-model' target is deprecated. Please use the 'ojb-model' target instead."/>
+ <antcall target="ojb-model"/>
</target>
- <target
- name="project-ojb-model-classpath">
-
- <echo message="+------------------------------------------+"/>
- <echo message="| |"/>
- <echo message="| Generating OJB model |"/>
- <echo message="| |"/>
- <echo message="+------------------------------------------+"/>
-
- <taskdef
- name="ojb-model"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="torque-classpath"/>
- </taskdef>
-
- <ojb-model
- contextProperties="${build.properties}"
- controlTemplate="ojb/model/Control.vm"
- targetPackage="${targetPackage}.om"
- targetDatabase="${database}"
- outputDirectory="${torque.home}/${outputDirectory}/ojb"
- useClasspath="true"
- sqldbmap="${torque.home}/${outputDirectory}/sql/sqldb.map"
- outputFile="report.${project}.ojb.generation">
- <fileset dir="${torque.home}/${schemaDirectory}">
- <include name="*-schema.xml"/>
- </fileset>
- </ojb-model>
- </target>
</project>
1.112 +12 -5 db-ojb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/db-ojb/build.xml,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- build.xml 28 Jan 2004 23:29:32 -0000 1.111
+++ build.xml 1 Feb 2004 22:11:44 -0000 1.112
@@ -320,27 +320,34 @@
description="prepare testdb using torque"
depends="prepare, prepare-repository">
+ <copy todir="${build.test}">
+ <fileset dir="${src.dir}/schema" includes="*.xml,*.dtd"/>
+ <filterset>
+ <filter token="DATABASE_DEFAULT" value="${project}" />
+ </filterset>
+
+ </copy>
<antcall target="getJSQLDriver"/>
<!-- create sql scripts -->
<ant dir="."
antfile="${torque.buildFile}"
- target="project-sql-classpath"/>
+ target="sql"/>
<!-- create db -->
<ant dir="."
antfile="${torque.buildFile}"
- target="project-create-db-classpath"/>
+ target="create-db"/>
<!-- create data sql -->
<ant dir="."
antfile="${torque.buildFile}"
- target="project-datasql-classpath"/>
+ target="datasql"/>
<!-- create tables -->
<ant dir="."
antfile="${torque.buildFile}"
- target="project-insert-sql"/>
+ target="insert-sql"/>
</target>
1.44 +10 -9 db-ojb/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/db-ojb/build.properties,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- build.properties 6 Dec 2003 19:07:09 -0000 1.43
+++ build.properties 1 Feb 2004 22:11:44 -0000 1.44
@@ -51,14 +51,6 @@
j2ee.jars=j2ee.jar
jdo.jars=jdo.jar:jdori.jar
-
-# These properties are used by torque to create the test db
-torque.buildFile = build-torque.xml
-schemaDirectory = src/schema
-outputDirectory = target/src
-SQLControlTemplate = sql/base/Control.vm
-project = ojbtest
-
# These properties tell ant what the project's directory structure is.
source=src
src.dir=src
@@ -84,6 +76,15 @@
build.test = ${build.dir}/test
junit.dir = ${build.dir}/test/ojb
junit.fork=true
+
+# These properties are used by torque to create the test db
+torque.buildFile = build-torque.xml
+torque.schema.dir = ${build.test}
+torque.output.dir = ${build.test}/sql
+torque.sql.dir = ${torque.output.dir}
+torque.useClasspath = true
+torque.project = ojbtest
+
# Default compilation properties.
# build.compiler=modern
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org