User: starksm
Date: 01/07/12 10:38:26
Modified: src/resources/org/jboss/metadata jaws_2_4.dtd
Log:
Remove the duplicate datasource ELEMENT
Revision Changes Path
1.4 +74 -58 jboss/src/resources/org/jboss/metadata/jaws_2_4.dtd
Index: jaws_2_4.dtd
===================================================================
RCS file: /cvsroot/jboss/jboss/src/resources/org/jboss/metadata/jaws_2_4.dtd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jaws_2_4.dtd 2001/07/08 12:22:50 1.3
+++ jaws_2_4.dtd 2001/07/12 17:38:26 1.4
@@ -1,46 +1,56 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
<!--
This is the XML DTD for the JAWS deployment descriptor.
<!DOCTYPE jaws PUBLIC
"-//JBoss//DTD JAWS 2.4//EN"
"http://www.jboss.org/j2ee/dtd/jaws_2_4.dtd";>
--->
-
+-->
<!-- The jaws element is always the root (document) node of the jaws.xml
deployment descriptor or the standardjaws.xml defaults document. All elements
are declared as optional - if not given in jaws.xml, defaults will be read
- from standardjaws.xml -->
-<!ELEMENT jaws
(datasource?,type-mapping?,debug?,default-entity?,enterprise-beans?,type-mappings?)>
-
+ from standardjaws.xml -->
+<!ELEMENT jaws (datasource? , type-mapping? , debug? , default-entity? ,
enterprise-beans? , type-mappings?)>
+
<!-- the datasource element is used to indicate to JAWS which datasource
should be used for persistence of the CMP entities in this ejb-jar. It
should be the datasource named as it appears in jboss' global naming
context. The default is java:/DefaultDS
Beans are also allowed to specify datasources at bean level and will override this
datasource if specified.
- -->
-<!ELEMENT datasource (#PCDATA)>
+Used in: jaws, entity
+ -->
+<!ELEMENT datasource (#PCDATA)>
+
<!-- the type-mapping element is used to indicate to JAWS which set of mappings
from java types to jdbc and SQL types to be used for CMP beans in this jar.
type-mappings are defined withing the type-mappings element with a type-mapping
- element that carries a separate meaning: This DTD wil not parse! -->
-<!ELEMENT type-mapping (#PCDATA)>
-
-<!ELEMENT debug (#PCDATA)>
-
-<!ELEMENT default-entity (create-table, remove-table, tuned-updates, read-only,
pk-constraint?, select-for-update?, time-out)>
-<!ELEMENT create-table (#PCDATA)>
-<!ELEMENT remove-table (#PCDATA)>
-<!ELEMENT tuned-updates (#PCDATA)>
-<!ELEMENT read-only (#PCDATA)>
-<!ELEMENT pk-constraint (#PCDATA)>
-<!ELEMENT select-for-update (#PCDATA)>
-<!ELEMENT time-out (#PCDATA)>
-
+ element that carries a separate meaning: This DTD wil not parse! -->
+<!ELEMENT type-mapping (#PCDATA)>
+
+<!ELEMENT debug (#PCDATA)>
+
+<!ELEMENT default-entity (create-table , remove-table , tuned-updates , read-only ,
pk-constraint? , select-for-update? , time-out)>
+
+<!ELEMENT create-table (#PCDATA)>
+
+<!ELEMENT remove-table (#PCDATA)>
+
+<!ELEMENT tuned-updates (#PCDATA)>
+
+<!ELEMENT read-only (#PCDATA)>
+
+<!ELEMENT pk-constraint (#PCDATA)>
+
+<!ELEMENT select-for-update (#PCDATA)>
+
+<!ELEMENT time-out (#PCDATA)>
+
<!-- the enterpris-beans tag contains overridden attribute mappings for any
- CMP bean in this ejb-jar that requires non-default column mapping behavior -->
-<!ELEMENT enterprise-beans (entity*)>
-
+ CMP bean in this ejb-jar that requires non-default column mapping behavior -->
+<!ELEMENT enterprise-beans (entity*)>
+
<!-- the entity element defines a non-default column mapping for a CMP entity
bean in this ejb-jar. This includes query specifications for any finders that
either do not correspond to a single cmp-field or that require a specific
@@ -57,20 +67,19 @@
locking the row.
pk-constraint: If create-table is on, create it with a primary key.
time-out: For read-only only, re-load entity after time-out
--->
-<!ELEMENT entity (ejb-name,datasource?,cmp-field*,finder*,read-ahead?,read-only?,
-
table-name?,tuned-updates?,create-table?,remove-table?,select-for-update?,time-out?,pk-constraint?)>
-
+-->
+<!ELEMENT entity (ejb-name , datasource? , cmp-field* , finder* , read-ahead? ,
read-only? , table-name? , tuned-updates? , create-table? , remove-table? ,
select-for-update? , time-out? , pk-constraint?)>
+
<!-- ejb-name within an entity element must contain the ejb-name as specified
- in ejb-jar.xml. -->
-<!ELEMENT ejb-name (#PCDATA)>
-<!-- The datasource at bean level. If specified the bean will use this datasource
instead of the global one.
-Else the global one is used -->
-<!ELEMENT datasource (#PCDATA)>
-<!ELEMENT cmp-field (field-name, column-name)>
-<!ELEMENT field-name (#PCDATA)>
-<!ELEMENT column-name (#PCDATA)>
-
+ in ejb-jar.xml. -->
+<!ELEMENT ejb-name (#PCDATA)>
+
+<!ELEMENT cmp-field (field-name , column-name)>
+
+<!ELEMENT field-name (#PCDATA)>
+
+<!ELEMENT column-name (#PCDATA)>
+
<!-- the finder element overrides JAWS default behavior for a finder, or
specifies JAWS behavior for finders requiring multi-column where clauses or
a specific ordering. it must contain name and query elements and my contain
@@ -78,29 +87,36 @@
After JBoss version 2.3, it may contain a read-ahead element indicating whether
or not all data for the entities selected should be loaded immediatly. Note
that JAWS/JBoss cannot guarentee serializable transactions with the read-ahead
- option!-->
-<!ELEMENT finder (name,query,order?,read-ahead?)>
-
+ option!-->
+<!ELEMENT finder (name , query , order? , read-ahead?)>
+
<!-- the name within a finder element must contain the name of the finder
- method from the bean's home interface -->
-<!ELEMENT name (#PCDATA)>
-
+ method from the bean's home interface -->
+<!ELEMENT name (#PCDATA)>
+
<!-- the query element must contain the where clause that will select the
proper rows to be returned by the finder. If this query begins with an
- inner join clause, it may specify multiple tables. -->
-<!ELEMENT query (#PCDATA)>
-
+ inner join clause, it may specify multiple tables. -->
+<!ELEMENT query (#PCDATA)>
+
<!-- the order element should contain a SQL order by clause (without the
initial 'order by' verb!) that should be used to order the results of the
- query for the finder -->
-<!ELEMENT order (#PCDATA)>
-<!ELEMENT read-ahead (#PCDATA)>
-
-<!ELEMENT table-name (#PCDATA)>
-
-<!ELEMENT type-mappings (type-mapping-definition*)>
-<!ELEMENT type-mapping-definition (name, mapping*)>
-<!ELEMENT mapping (java-type, jdbc-type, sql-type)>
-<!ELEMENT java-type (#PCDATA)>
-<!ELEMENT jdbc-type (#PCDATA)>
-<!ELEMENT sql-type (#PCDATA)>
\ No newline at end of file
+ query for the finder -->
+<!ELEMENT order (#PCDATA)>
+
+<!ELEMENT read-ahead (#PCDATA)>
+
+<!ELEMENT table-name (#PCDATA)>
+
+<!ELEMENT type-mappings (type-mapping-definition*)>
+
+<!ELEMENT type-mapping-definition (name , mapping*)>
+
+<!ELEMENT mapping (java-type , jdbc-type , sql-type)>
+
+<!ELEMENT java-type (#PCDATA)>
+
+<!ELEMENT jdbc-type (#PCDATA)>
+
+<!ELEMENT sql-type (#PCDATA)>
+
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
